X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdaemon%2Futils_random.c;h=5500aaa028113c62167fbf6434ceee21f23a05e4;hb=9f8dc5668faf5432dcb1430017bd7a1c383c2453;hp=0488f913644a69ff26887a2a85073b0facd7ccf9;hpb=51181b899668ad2c232a152d6e5e787c4eb049cc;p=collectd.git

diff --git a/src/daemon/utils_random.c b/src/daemon/utils_random.c
index 0488f913..5500aaa0 100644
--- a/src/daemon/utils_random.c
+++ b/src/daemon/utils_random.c
@@ -26,18 +26,24 @@
 
 #include "collectd.h"
 
-#include "utils_time.h"
 #include "utils_random.h"
+#include "utils_time.h"
 
 #include <pthread.h>
 
+#ifdef WIN32
+double erand48(unsigned short unused[3]) {
+  return (double)rand() / (double)RAND_MAX;
+}
+
+long int jrand48(unsigned short unused[3]) { return rand(); }
+#endif
 
 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 +51,47 @@ 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);
+
+#ifdef WIN32
+  srand((unsigned)t);
+#endif
 
-  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;
 }