A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Accept the fact that NS3 timings may vary with the version
[simgrid.git]
/
src
/
surf
/
random_mgr.c
diff --git
a/src/surf/random_mgr.c
b/src/surf/random_mgr.c
index
8bad98f
..
39fe6e2
100644
(file)
--- a/
src/surf/random_mgr.c
+++ b/
src/surf/random_mgr.c
@@
-1,12
+1,14
@@
-/* Copyright (c) 2007
, 2008, 2009, 2010
. The SimGrid Team.
+/* Copyright (c) 2007
-2014
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
-
* under the terms of the license (GNU LGPL) which comes with this package. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
#include "surf/random_mgr.h"
#include "xbt/sysdep.h"
#include "surf/random_mgr.h"
#include "xbt/sysdep.h"
-#include "gras_config.h" /*_XBT_WIN32*/
+#include "src/internal_config.h" /*_XBT_WIN32*/
+#include <math.h>
+#include <stdlib.h>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(random, surf, "Random part of surf");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(random, surf, "Random part of surf");
@@
-54,7
+56,7
@@
union ieee754_double {
} ieee_nan;
};
} ieee_nan;
};
-#define IEEE754_DOUBLE_BIAS
0x3ff /* Added to exponent. */
+#define IEEE754_DOUBLE_BIAS 0x3ff /* Added to exponent. */
double drand48(void);
double drand48(void);
@@
-120,6
+122,10
@@
int _drand48_iterate(unsigned short int xsubi[3],
return 0;
}
return 0;
}
+double _drand48(void);
+void _srand(unsigned int seed);
+int _rand(void);
+int _rand_r(unsigned int *pseed);
double _drand48(void)
{
double _drand48(void)
{
@@
-200,8
+206,8
@@
static double custom_random(e_random_generator_t generator, long int *seed)
case RAND:
return (double) rand_r((unsigned int *) seed) / RAND_MAX;
case RNGSTREAM :
case RAND:
return (double) rand_r((unsigned int *) seed) / RAND_MAX;
case RNGSTREAM :
-
XBT_INFO("Seen RNGSTREAM");
-
return 0.0;
+ XBT_INFO("Seen RNGSTREAM");
+ return 0.0;
default:
return drand48();
}
default:
return drand48();
}