X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdaemon%2Futils_random.c;h=77b500fb8faaf17397811069528560b3ea620572;hb=c3d354c58d56c4b2bb4138a227f3546928bd84f2;hp=b8738458710786faae5a1745dbbd602b8bb2bad6;hpb=218c57128f2e54960133cff3e774b5ef9944068a;p=collectd.git diff --git a/src/daemon/utils_random.c b/src/daemon/utils_random.c index b8738458..77b500fb 100644 --- a/src/daemon/utils_random.c +++ b/src/daemon/utils_random.c @@ -25,6 +25,8 @@ **/ #include "collectd.h" + +#include "utils_random.h" #include "utils_time.h" #include @@ -33,8 +35,7 @@ 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) @@ -42,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(void) { 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(void) { + 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);