From a3d45b39608418e261f34b3b3286b80e4878d25c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 16 Nov 2005 01:15:46 +0000 Subject: * when calculating a random jitter time for time events, use the same jitter in every 10s timespans. This should increase the probability that multiple responses can be merged into a single packet, and thus decreases network traffic. * add _workstation._tcp services in RUNNING state, not earlier * an important bugfix which fixes the entry group state automatons * remove obsolete debug messages * minor other cleanups git-svn-id: file:///home/lennart/svn/public/avahi/trunk@980 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-common/timeval.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) (limited to 'avahi-common') diff --git a/avahi-common/timeval.c b/avahi-common/timeval.c index e5732cd..2d0d693 100644 --- a/avahi-common/timeval.c +++ b/avahi-common/timeval.c @@ -23,6 +23,7 @@ #include #endif +#include #include #include @@ -84,7 +85,6 @@ AvahiUsec avahi_age(const struct timeval *a) { return avahi_timeval_diff(&now, a); } - struct timeval *avahi_elapse_time(struct timeval *tv, unsigned msec, unsigned jitter) { assert(tv); @@ -93,8 +93,32 @@ struct timeval *avahi_elapse_time(struct timeval *tv, unsigned msec, unsigned ji if (msec) avahi_timeval_add(tv, (AvahiUsec) msec*1000); - if (jitter) - avahi_timeval_add(tv, (AvahiUsec) (jitter*1000.0*rand()/(RAND_MAX+1.0))); + if (jitter) { + static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; + static int last_rand; + static time_t timestamp = 0; + + time_t now; + int r; + + now = time(NULL); + + pthread_mutex_lock(&mutex); + if (now >= timestamp + 10) { + timestamp = now; + last_rand = rand(); + } + + r = last_rand; + + pthread_mutex_unlock(&mutex); + + /* We use the same jitter for 10 seconds. That way our + * time events elapse in bursts which has the advantage that + * packet data can be aggegrated better */ + + avahi_timeval_add(tv, (AvahiUsec) (jitter*1000.0*r/(RAND_MAX+1.0))); + } return tv; } -- cgit