X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fc35d943e1d39d2511d0aa870be417d2bc714d6b..719a77db362a51309e90a75253788223936b276c:/src/xbt/xbt_main.c diff --git a/src/xbt/xbt_main.c b/src/xbt/xbt_main.c index 4616949b7c..c355f497ab 100644 --- 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 xbt_pagebits = 0; /* Declare xbt_preinit and xbt_postexit as constructor/destructor of the library. * This is crude and rather compiler-specific, unfortunately. @@ -95,6 +96,13 @@ static void xbt_preinit(void) { GetSystemInfo(&si); xbt_pagesize = si.dwPageSize; #endif + + xbt_pagebits = 0; + int x = xbt_pagesize; + while(x >>= 1) { + ++xbt_pagebits; + } + #ifdef MMALLOC_WANT_OVERRIDE_LEGACY mmalloc_preinit(); #endif @@ -112,7 +120,6 @@ static void xbt_preinit(void) { #ifndef _WIN32 srand48(seed); #endif - atexit(xbt_postexit); } @@ -159,13 +166,13 @@ void xbt_exit() /* these two functions belong to xbt/sysdep.h, which have no corresponding .c file */ /** @brief like free, but you can be sure that it is a function */ -XBT_PUBLIC(void) xbt_free_f(void *p) +void xbt_free_f(void *p) { free(p); } /** @brief should be given a pointer to pointer, and frees the second one */ -XBT_PUBLIC(void) xbt_free_ref(void *d) +void xbt_free_ref(void *d) { free(*(void **) d); }