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
[mc] Fix mm_fake_malloc() implementation
[simgrid.git]
/
src
/
xbt
/
xbt_main.c
diff --git
a/src/xbt/xbt_main.c
b/src/xbt/xbt_main.c
index
615ad8d
..
d07d4a3
100644
(file)
--- a/
src/xbt/xbt_main.c
+++ b/
src/xbt/xbt_main.c
@@
-39,6
+39,7
@@
int xbt_initialized = 0;
int _sg_do_clean_atexit = 1;
int xbt_pagesize;
int _sg_do_clean_atexit = 1;
int xbt_pagesize;
+int xbt_pagebits = 0;
/* Declare xbt_preinit and xbt_postexit as constructor/destructor of the library.
* This is crude and rather compiler-specific, unfortunately.
/* Declare xbt_preinit and xbt_postexit as constructor/destructor of the library.
* This is crude and rather compiler-specific, unfortunately.
@@
-95,9
+96,13
@@
static void xbt_preinit(void) {
GetSystemInfo(&si);
xbt_pagesize = si.dwPageSize;
#endif
GetSystemInfo(&si);
xbt_pagesize = si.dwPageSize;
#endif
-#ifdef MMALLOC_WANT_OVERRIDE_LEGACY
- mmalloc_preinit();
-#endif
+
+ xbt_pagebits = 0;
+ int x = xbt_pagesize;
+ while(x >>= 1) {
+ ++xbt_pagebits;
+ }
+
#ifdef _TWO_DIGIT_EXPONENT
/* Even printf behaves differently on Windows... */
_set_output_format(_TWO_DIGIT_EXPONENT);
#ifdef _TWO_DIGIT_EXPONENT
/* Even printf behaves differently on Windows... */
_set_output_format(_TWO_DIGIT_EXPONENT);
@@
-112,7
+117,6
@@
static void xbt_preinit(void) {
#ifndef _WIN32
srand48(seed);
#endif
#ifndef _WIN32
srand48(seed);
#endif
-
atexit(xbt_postexit);
}
atexit(xbt_postexit);
}