X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdaemon%2Futils_random.c;h=d490986dab2d746a07780845d78874de55b65941;hb=73e49352aa8c5e5ec47918dba93b508b481fe431;hp=fee08717a7d464c809be8f23685117654d6bdab0;hpb=b286b677bb54a3192a4121c2aa0857a133fd0603;p=collectd.git diff --git a/src/daemon/utils_random.c b/src/daemon/utils_random.c index fee08717..d490986d 100644 --- a/src/daemon/utils_random.c +++ b/src/daemon/utils_random.c @@ -25,18 +25,17 @@ **/ #include "collectd.h" -#include "utils_time.h" + #include "utils_random.h" +#include "utils_time.h" #include - static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; static _Bool have_seed = 0; static unsigned short seed[3]; -static void cdrand_seed (void) -{ +static void cdrand_seed(void) { cdtime_t t; if (have_seed) @@ -44,33 +43,42 @@ static void cdrand_seed (void) t = cdtime(); - seed[0] = (unsigned short) t; - seed[1] = (unsigned short) (t >> 16); - seed[2] = (unsigned short) (t >> 32); + seed[0] = (unsigned short)t; + seed[1] = (unsigned short)(t >> 16); + seed[2] = (unsigned short)(t >> 32); have_seed = 1; } -double cdrand_d (void) -{ +double cdrand_d() { double r; - pthread_mutex_lock (&lock); - cdrand_seed (); - r = erand48 (seed); - pthread_mutex_unlock (&lock); + pthread_mutex_lock(&lock); + cdrand_seed(); + r = erand48(seed); + pthread_mutex_unlock(&lock); return (r); } -long cdrand_range (long min, long max) -{ +uint32_t cdrand_u() { + long r; + + pthread_mutex_lock(&lock); + cdrand_seed(); + r = jrand48(seed); + pthread_mutex_unlock(&lock); + + return (uint32_t)r; +} + +long cdrand_range(long min, long max) { long range; long r; range = 1 + max - min; - r = (long) (0.5 + (cdrand_d () * range)); + r = (long)(0.5 + (cdrand_d() * range)); r += min; return (r);