- Fix to timeval_add for remaining second in microseconds.

diff --git a/daemon/stats.c b/daemon/stats.c
index 504b0efccc4a4ade3b0d54e5a6e9332e293bd051..a01fb6d342caa4456e7a3ce3f95622bfbfb27e5a 100644 (file)
--- a/daemon/stats.c
+++ b/daemon/stats.c
@@ -77,7 +77,7 @@ stats_timeval_add(long long* d_sec, long long* d_usec, long long add_sec, long l
 #ifndef S_SPLINT_S
        (*d_sec) += add_sec;
        (*d_usec) += add_usec;
-       if((*d_usec) > 1000000) {
+       if((*d_usec) >= 1000000) {
                (*d_usec) -= 1000000;
                (*d_sec)++;
        }

diff --git a/doc/Changelog b/doc/Changelog
index e6b0de40d7d29dc8eac9e094e542fd37f0b2148d..4348a3d0e43c8fe0dbfa37222adae824d52cf0fa 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -3,6 +3,7 @@
        - Fix #52 #53, fix for example fail program.
        - Fix to return after failed auth zone http chunk write.
        - Fix to remove unused test for task_probe existance.
+       - Fix to timeval_add for remaining second in microseconds.
 
 29 July 2019: Wouter
        - Add verbose log message when auth zone file is written, at level 4.

diff --git a/services/mesh.c b/services/mesh.c
index 0d7118af996c0e2d6adbc1d3baf4f1d1893c64b2..27f919401bbf2a771e70e2caf713867ac1ca6d41 100644 (file)
--- a/services/mesh.c
+++ b/services/mesh.c
@@ -85,7 +85,7 @@ timeval_add(struct timeval* d, const struct timeval* add)
 #ifndef S_SPLINT_S
        d->tv_sec += add->tv_sec;
        d->tv_usec += add->tv_usec;
-       if(d->tv_usec > 1000000 ) {
+       if(d->tv_usec >= 1000000 ) {
                d->tv_usec -= 1000000;
                d->tv_sec++;
        }

diff --git a/testcode/delayer.c b/testcode/delayer.c
index 4abcfc235dcdcf569e76249393b9f0a9e6d9fb45..655e4a1e7f136f43ba123580d9f8cfe8b84898a3 100644 (file)
--- a/testcode/delayer.c
+++ b/testcode/delayer.c
@@ -174,7 +174,7 @@ dl_tv_add(struct timeval* t1, const struct timeval* t2)
 #ifndef S_SPLINT_S
        t1->tv_sec += t2->tv_sec;
        t1->tv_usec += t2->tv_usec;
-       while(t1->tv_usec > 1000000) {
+       while(t1->tv_usec >= 1000000) {
                t1->tv_usec -= 1000000;
                t1->tv_sec++;
        }

diff --git a/testcode/fake_event.c b/testcode/fake_event.c
index 713e247592b7c587b52a03543386212618624fa6..d6e904a4d3cb9f6733fa279f5635991caad8501c 100644 (file)
--- a/testcode/fake_event.c
+++ b/testcode/fake_event.c
@@ -100,7 +100,7 @@ timeval_add(struct timeval* d, const struct timeval* add)
 #ifndef S_SPLINT_S
        d->tv_sec += add->tv_sec;
        d->tv_usec += add->tv_usec;
-       if(d->tv_usec > 1000000) {
+       if(d->tv_usec >= 1000000) {
                d->tv_usec -= 1000000;
                d->tv_sec++;
        }

diff --git a/testcode/perf.c b/testcode/perf.c
index d6d2b05298e8254aac7cb435e97a41a2c3ea4cd8..5b170ca57379d60a7fe9377624a99648af752a58 100644 (file)
--- a/testcode/perf.c
+++ b/testcode/perf.c
@@ -177,7 +177,7 @@ perf_tv_add(struct timeval* t1, struct timeval* t2)
 #ifndef S_SPLINT_S
        t1->tv_sec += t2->tv_sec;
        t1->tv_usec += t2->tv_usec;
-       while(t1->tv_usec > 1000000) {
+       while(t1->tv_usec >= 1000000) {
                t1->tv_usec -= 1000000;
                t1->tv_sec++;
        }

diff --git a/util/mini_event.c b/util/mini_event.c
index faadf1a23c8df57c47ce37006f4352dddc2c16b9..661d88d2e6f60faace77e909318ccd69df91a5e6 100644 (file)
--- a/util/mini_event.c
+++ b/util/mini_event.c
@@ -313,7 +313,7 @@ int event_add(struct event* ev, struct timeval* tv)
                struct timeval *now = ev->ev_base->time_tv;
                ev->ev_timeout.tv_sec = tv->tv_sec + now->tv_sec;
                ev->ev_timeout.tv_usec = tv->tv_usec + now->tv_usec;
-               while(ev->ev_timeout.tv_usec > 1000000) {
+               while(ev->ev_timeout.tv_usec >= 1000000) {
                        ev->ev_timeout.tv_usec -= 1000000;
                        ev->ev_timeout.tv_sec++;
                }

diff --git a/util/winsock_event.c b/util/winsock_event.c
index 63d98796d19ff02d794ad0319cb30edf977a777a..de6c28ecb08e15878259eb5e5b4f6fc99ab8a4b7 100644 (file)
--- a/util/winsock_event.c
+++ b/util/winsock_event.c
@@ -558,7 +558,7 @@ int event_add(struct event *ev, struct timeval *tv)
                 struct timeval *now = ev->ev_base->time_tv;
                 ev->ev_timeout.tv_sec = tv->tv_sec + now->tv_sec;
                 ev->ev_timeout.tv_usec = tv->tv_usec + now->tv_usec;
-                while(ev->ev_timeout.tv_usec > 1000000) {
+                while(ev->ev_timeout.tv_usec >= 1000000) {
                         ev->ev_timeout.tv_usec -= 1000000;
                         ev->ev_timeout.tv_sec++;
                 }