X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a846b9415542cdaa8ba5d0f7efeadecb56ba7c2c..74a527bf6a03467a14add202f92745a50d876ed7:/src/surf/random_mgr.c diff --git a/src/surf/random_mgr.c b/src/surf/random_mgr.c index f6783d2e65..6fb652d53f 100644 --- a/src/surf/random_mgr.c +++ b/src/surf/random_mgr.c @@ -8,6 +8,8 @@ #include "xbt/sysdep.h" #include "gras_config.h" /*_XBT_WIN32*/ +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(random, surf, "Random part of surf"); + #ifdef _XBT_WIN32 static unsigned int _seed = 2147483647; @@ -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;