X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Futils%2Futils.cpp;h=4ec36f1145b79b0e02fbc4e217f2e562747dabf7;hb=28ab034a2c3582d07d3423d2d746731f87d3969f;hp=0f1bd28c7e7a3da58d09abc63c5c3270347b7071;hpb=c9e313bc594f40a86eed237dce222c0fc99c957f;p=lttng-tools.git diff --git a/tests/utils/utils.cpp b/tests/utils/utils.cpp index 0f1bd28c7..4ec36f114 100644 --- a/tests/utils/utils.cpp +++ b/tests/utils/utils.cpp @@ -5,8 +5,13 @@ * */ +#include "utils.h" + +#include #include +#include #include + #include #include #include @@ -17,21 +22,14 @@ #include #include -#include -#include - -#include "utils.h" - -static inline -int64_t elapsed_time_ns(struct timespec *t1, struct timespec *t2) +static inline int64_t elapsed_time_ns(struct timespec *t1, struct timespec *t2) { struct timespec delta; LTTNG_ASSERT(t1 && t2); delta.tv_sec = t2->tv_sec - t1->tv_sec; delta.tv_nsec = t2->tv_nsec - t1->tv_nsec; - return ((int64_t) NSEC_PER_SEC * (int64_t) delta.tv_sec) + - (int64_t) delta.tv_nsec; + return ((int64_t) NSEC_PER_SEC * (int64_t) delta.tv_sec) + (int64_t) delta.tv_nsec; } int usleep_safe(useconds_t usec) @@ -101,24 +99,23 @@ int wait_on_file(const char *path) for (;;) { ret = stat(path, &buf); if (ret == -1 && errno == ENOENT) { - ret = poll(NULL, 0, 10); /* 10 ms delay */ + ret = poll(NULL, 0, 10); /* 10 ms delay */ /* Should return 0 everytime */ if (ret) { if (ret < 0) { perror("perror"); } else { - fprintf(stderr, - "poll return value is larger than zero\n"); + fprintf(stderr, "poll return value is larger than zero\n"); } return -1; } - continue; /* retry */ + continue; /* retry */ } if (ret) { perror("stat"); return -1; } - break; /* found */ + break; /* found */ } return 0;