mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 15:17:01 +02:00
Code Issues Projects Releases Wiki Activity

* fixed some tv_cmp_ms() computations. Strictly speaking, there was

Browse Source 
a very short window of 1 microsecond every millisecond during which
  two events were not considered as 1 ms apart from each other.
This commit is contained in:
Willy TARREAU 2006-03-01 22:30:20 +01:00
parent a9e75f6eff
commit c9a643998f
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
haproxy.c
View File

@ -1373,18 +1373,18 @@ static inline unsigned long tv_diff(struct timeval *tv1, struct timeval *tv2) {
*/ */
static inline int tv_cmp_ms(struct timeval *tv1, struct timeval *tv2) { static inline int tv_cmp_ms(struct timeval *tv1, struct timeval *tv2) {
if (tv1->tv_sec == tv2->tv_sec) { if (tv1->tv_sec == tv2->tv_sec) {
if (tv2->tv_usec > tv1->tv_usec + 1000) if (tv2->tv_usec >= tv1->tv_usec + 1000)
return -1; return -1;
else if (tv1->tv_usec > tv2->tv_usec + 1000) else if (tv1->tv_usec >= tv2->tv_usec + 1000)
return 1; return 1;
else else
return 0; return 0;
} }
else if ((tv2->tv_sec > tv1->tv_sec + 1) || else if ((tv2->tv_sec > tv1->tv_sec + 1) ||
((tv2->tv_sec == tv1->tv_sec + 1) && (tv2->tv_usec + 1000000 > tv1->tv_usec + 1000))) ((tv2->tv_sec == tv1->tv_sec + 1) && (tv2->tv_usec + 1000000 >= tv1->tv_usec + 1000)))
return -1; return -1;
else if ((tv1->tv_sec > tv2->tv_sec + 1) || else if ((tv1->tv_sec > tv2->tv_sec + 1) ||
((tv1->tv_sec == tv2->tv_sec + 1) && (tv1->tv_usec + 1000000 > tv2->tv_usec + 1000))) ((tv1->tv_sec == tv2->tv_sec + 1) && (tv1->tv_usec + 1000000 >= tv2->tv_usec + 1000)))
return 1; return 1;
else else
return 0; return 0;
@ -1468,18 +1468,18 @@ static inline int tv_cmp2_ms(struct timeval *tv1, struct timeval *tv2) {
return -1; /* tv2 later than tv1 */ return -1; /* tv2 later than tv1 */
if (tv1->tv_sec == tv2->tv_sec) { if (tv1->tv_sec == tv2->tv_sec) {
if (tv1->tv_usec > tv2->tv_usec + 1000) if (tv1->tv_usec >= tv2->tv_usec + 1000)
return 1; return 1;
else if (tv2->tv_usec > tv1->tv_usec + 1000) else if (tv2->tv_usec >= tv1->tv_usec + 1000)
return -1; return -1;
else else
return 0; return 0;
} }
else if ((tv1->tv_sec > tv2->tv_sec + 1) || else if ((tv1->tv_sec > tv2->tv_sec + 1) ||
((tv1->tv_sec == tv2->tv_sec + 1) && (tv1->tv_usec + 1000000 > tv2->tv_usec + 1000))) ((tv1->tv_sec == tv2->tv_sec + 1) && (tv1->tv_usec + 1000000 >= tv2->tv_usec + 1000)))
return 1; return 1;
else if ((tv2->tv_sec > tv1->tv_sec + 1) || else if ((tv2->tv_sec > tv1->tv_sec + 1) ||
((tv2->tv_sec == tv1->tv_sec + 1) && (tv2->tv_usec + 1000000 > tv1->tv_usec + 1000))) ((tv2->tv_sec == tv1->tv_sec + 1) && (tv2->tv_usec + 1000000 >= tv1->tv_usec + 1000)))
return -1; return -1;
else else
return 0; return 0;