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

* released 1.1.13

Browse Source 
* tv_diff used inverted parameters which led to negative times !
This commit is contained in:
willy tarreau 2005-12-17 13:26:49 +01:00
parent 750a47265a
commit 6e682cecf2
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
haproxy.c
View File

@ -17,7 +17,9 @@
* *
* ChangeLog : * ChangeLog :
* *
* 2002/07/13 : 1.1.12 * 2002/07/15 : 1.1.13
* - tv_diff used inverted parameters which led to negative times !
* 2002/07/13 : 1.1.12
* - fixed stats monitoring, and optimized some tv_* for most common cases. * - fixed stats monitoring, and optimized some tv_* for most common cases.
* - replaced temporary 'newhdr' with 'trash' to reduce stack size * - replaced temporary 'newhdr' with 'trash' to reduce stack size
* - made HTTP errors more HTML-fiendly. * - made HTTP errors more HTML-fiendly.
@ -168,8 +170,8 @@
#include <linux/netfilter_ipv4.h> #include <linux/netfilter_ipv4.h>
#endif #endif
#define HAPROXY_VERSION "1.1.12" #define HAPROXY_VERSION "1.1.13"
#define HAPROXY_DATE "2002/07/13" #define HAPROXY_DATE "2002/07/15"
/* this is for libc5 for example */ /* this is for libc5 for example */
#ifndef TCP_NODELAY #ifndef TCP_NODELAY
@ -976,11 +978,11 @@ unsigned long tv_delta(struct timeval *tv1, struct timeval *tv2) {
static inline unsigned long tv_diff(struct timeval *tv1, struct timeval *tv2) { static inline unsigned long tv_diff(struct timeval *tv1, struct timeval *tv2) {
unsigned long ret; unsigned long ret;
ret = (tv1->tv_sec - tv2->tv_sec) * 1000; ret = (tv2->tv_sec - tv1->tv_sec) * 1000;
if (tv1->tv_usec > tv2->tv_usec) if (tv2->tv_usec > tv1->tv_usec)
ret += (tv1->tv_usec - tv2->tv_usec) / 1000; ret += (tv2->tv_usec - tv1->tv_usec) / 1000;
else else
ret -= (tv2->tv_usec - tv1->tv_usec) / 1000; ret -= (tv1->tv_usec - tv2->tv_usec) / 1000;
return (unsigned long) ret; return (unsigned long) ret;
} }
@ -3519,8 +3521,8 @@ int stats(void) {
int ret; int ret;
if (tv_cmp(&now, &nextevt) > 0) { if (tv_cmp(&now, &nextevt) > 0) {
deltatime = (tv_diff(&now, &lastevt)?:1); deltatime = (tv_diff(&lastevt, &now)?:1);
totaltime = (tv_diff(&now, &starttime)?:1); totaltime = (tv_diff(&starttime, &now)?:1);
if (global.mode & MODE_STATS) { if (global.mode & MODE_STATS) {
if ((lines++ % 16 == 0) && !(global.mode & MODE_LOG)) if ((lines++ % 16 == 0) && !(global.mode & MODE_LOG))