X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fdaemon%2Futils_random.c;h=7a9ce7be1e8c44f3d994a7837b4049653a100980;hp=0488f913644a69ff26887a2a85073b0facd7ccf9;hb=d486225f89ea52d8ed2b4242eba2ad94c409f837;hpb=ed985cb9d3d89aec3490b17e0fda3ee97908f935 diff --git a/src/daemon/utils_random.c b/src/daemon/utils_random.c index 0488f913..7a9ce7be 100644 --- a/src/daemon/utils_random.c +++ b/src/daemon/utils_random.c @@ -26,18 +26,16 @@ #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 bool have_seed; static unsigned short seed[3]; -static void cdrand_seed (void) -{ +static void cdrand_seed(void) { cdtime_t t; if (have_seed) @@ -45,34 +43,43 @@ 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; + have_seed = true; } -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; +} + +uint32_t cdrand_u(void) { + long r; + + pthread_mutex_lock(&lock); + cdrand_seed(); + r = jrand48(seed); + pthread_mutex_unlock(&lock); - return (r); + return (uint32_t)r; } -long cdrand_range (long min, long max) -{ +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); + return r; }