Commit 0cd414c7 authored by Zachary T Welch's avatar Zachary T Welch
Browse files

time_support: improve use of types

Update timeval_add_time to use long int; implement timeval_add with it.
Update timeval_ms to check gettimeofday return value, return int64_t.
parent b7b4efcd
......@@ -55,20 +55,11 @@ int timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *
/* add two struct timeval values */
int timeval_add(struct timeval *result, struct timeval *x, struct timeval *y)
{
result->tv_sec = x->tv_sec + y->tv_sec;
result->tv_usec = x->tv_usec + y->tv_usec;
while (result->tv_usec > 1000000)
{
result->tv_usec -= 1000000;
result->tv_sec++;
}
return 0;
memcpy(result, x, sizeof(struct timeval));
return timeval_add_time(result, y->tv_sec, y->tv_usec);
}
int timeval_add_time(struct timeval *result, int sec, int usec)
int timeval_add_time(struct timeval *result, long sec, long usec)
{
result->tv_sec += sec;
result->tv_usec += usec;
......@@ -82,6 +73,16 @@ int timeval_add_time(struct timeval *result, int sec, int usec)
return 0;
}
int64_t timeval_ms()
{
struct timeval now;
int retval = gettimeofday(&now, NULL);
if (retval < 0)
return retval;
return (int64_t)now.tv_sec * 1000 + now.tv_usec / 1000;
}
int duration_start(struct duration *duration)
{
return gettimeofday(&duration->start, NULL);
......@@ -107,15 +108,3 @@ float duration_kbps(struct duration *duration, size_t count)
{
return count / (1024.0 * duration_elapsed(duration));
}
long long timeval_ms()
{
struct timeval now;
long long t = 0;
gettimeofday(&now, NULL);
t += now.tv_usec/1000;
t += now.tv_sec*1000;
return t;
}
......@@ -39,10 +39,10 @@
int timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *y);
int timeval_add(struct timeval *result, struct timeval *x, struct timeval *y);
int timeval_add_time(struct timeval *result, int sec, int usec);
int timeval_add_time(struct timeval *result, long sec, long usec);
/// @returns gettimeofday() timeval as 64-bit in ms
long long timeval_ms(void);
int64_t timeval_ms(void);
struct duration
{
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment