TheCloud/f3
1
0
Fork 0
mirror of https://github.com/AltraMayor/f3.git synced 2025-09-18 11:37:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

libflow: replace usleep() with clock_nanosleep()

Browse Source 
POSIX.1-2008 removed usleep() and POSIX.1-2001 introduced
clock_nanosleep().
This commit is contained in:
Michel Machado 2020-06-19 12:12:18 -04:00
parent e2a59bc08d
commit a759140bc5
1 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libflow.c
View File

@ -6,7 +6,7 @@
#include <float.h>
#include <assert.h>
#include <math.h>
#include <unistd.h>
#include <time.h>
#include <sys/time.h>
#include "libflow.h"
@ -205,6 +205,37 @@ static inline int flush_chunk(const struct flow *fw, int fd)
return 0;
}
static void msleep(double wait_ms)
{
struct timespec req;
int ret;
assert(!clock_gettime(CLOCK_MONOTONIC, &req));
/* Add @wait_ms to @req. */
if (wait_ms > 1000) {
time_t sec = wait_ms / 1000;
wait_ms -= sec * 1000;
assert(wait_ms > 0);
req.tv_sec += sec;
}
req.tv_nsec += wait_ms * 1000000;
/* Round @req up. */
if (req.tv_nsec >= 1000000000) {
ldiv_t result = ldiv(req.tv_nsec, 1000000000);
req.tv_sec += result.quot;
req.tv_nsec = result.rem;
}
do {
ret = clock_nanosleep(CLOCK_MONOTONIC, TIMER_ABSTIME,
&req, NULL);
} while (ret == EINTR);
assert(ret == 0);
}
/* XXX Avoid duplicate this function, which was copied from libutils.h. */
static inline uint64_t diff_timeval_us(const struct timeval *t1,
const struct timeval *t2)
@ -257,7 +288,7 @@ int measure(int fd, struct flow *fw, ssize_t written)
if (wait_ms > 0) {
/* Slow down. */
assert(!usleep(wait_ms * 1000));
msleep(wait_ms);
/* Adjust measurements. */
delay += wait_ms;