fix the breakages that were hidden because some tests were disabled

[simgrid.git] / src / surf / random_mgr.c

diff --git a/src/surf/random_mgr.c b/src/surf/random_mgr.c
index 4f48ae9..6fb652d 100644 (file)
--- a/src/surf/random_mgr.c
+++ b/src/surf/random_mgr.c
@@ -6,7 +6,9 @@
 
 #include "surf/random_mgr.h"
 #include "xbt/sysdep.h"
-#include "simgrid_config.h" /*_XBT_WIN32*/
+#include "gras_config.h" /*_XBT_WIN32*/
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(random, surf, "Random part of surf");
 
 #ifdef _XBT_WIN32
 
@@ -198,7 +200,7 @@ static double custom_random(Generator generator, long int *seed)
   case RAND:
     return (double) rand_r((unsigned int *) seed) / RAND_MAX;
   case RNGSTREAM :
-         printf("Seen RNGSTREAM");
+         XBT_INFO("Seen RNGSTREAM");
          return 0.0;
   default:
     return drand48();
@@ -262,12 +264,12 @@ random_data_t random_new(Generator generator, long int seed,
 
   /* Check user stupidities */
   if (max < min)
-    THROW2(arg_error, 0, "random->max < random->min (%f < %f)", max, min);
+    THROWF(arg_error, 0, "random->max < random->min (%f < %f)", max, min);
   if (mean < min)
-    THROW2(arg_error, 0, "random->mean < random->min (%f < %f)", mean,
+    THROWF(arg_error, 0, "random->mean < random->min (%f < %f)", mean,
            min);
   if (mean > max)
-    THROW2(arg_error, 0, "random->mean > random->max (%f > %f)", mean,
+    THROWF(arg_error, 0, "random->mean > random->max (%f > %f)", mean,
            max);
 
   /* normalize the mean and standard deviation before storing */
@@ -275,7 +277,7 @@ random_data_t random_new(Generator generator, long int seed,
   random->std = std / (max - min);
 
   if (random->mean * (1 - random->mean) < random->std * random->std)
-    THROW2(arg_error, 0, "Invalid mean and standard deviation (%f and %f)",
+    THROWF(arg_error, 0, "Invalid mean and standard deviation (%f and %f)",
            random->mean, random->std);
 
   return random;