X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8a8687d6595e9e5e81a7b658ad1ae4c3f5d86539..f35db13138682b1be530a509d1eeadeafff84ca7:/src/xbt/xbt_main.cpp

diff --git a/src/xbt/xbt_main.cpp b/src/xbt/xbt_main.cpp
index 026641b33b..f04241769a 100644
--- a/src/xbt/xbt_main.cpp
+++ b/src/xbt/xbt_main.cpp
@@ -1,18 +1,18 @@
 /* module handling                                                          */
 
-/* Copyright (c) 2006-2014. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2006-2017. The SimGrid Team. 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. */
 
 #define XBT_LOG_LOCALLY_DEFINE_XBT_CHANNEL /* MSVC don't want it to be declared extern in headers and local here */
 
-
+#include <math.h>
 #include "xbt/misc.h"
 #include "simgrid_config.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
+#include "xbt/log.hpp"
 #include "xbt/dynar.h"
 #include "xbt/config.h"
 
@@ -87,20 +87,14 @@ static void xbt_preinit(void) {
   #error Cannot get page size.
 #endif
 
-  xbt_pagebits = 0;
-  int x = xbt_pagesize;
-  while(x >>= 1) {
-    ++xbt_pagebits;
-  }
+  xbt_pagebits = log2(xbt_pagesize);
 
 #ifdef _TWO_DIGIT_EXPONENT
   /* Even printf behaves differently on Windows... */
   _set_output_format(_TWO_DIGIT_EXPONENT);
 #endif
   xbt_log_preinit();
-  xbt_backtrace_preinit();
   xbt_os_thread_mod_preinit();
-  xbt_fifo_preinit();
   xbt_dict_preinit();
    
   srand(seed);
@@ -114,8 +108,6 @@ static void xbt_postexit(void)
 {
   if(!_sg_do_clean_atexit) return;
   xbt_initialized--;
-  xbt_backtrace_postexit();
-  xbt_fifo_postexit();
   xbt_dict_postexit();
   xbt_os_thread_mod_postexit();
   xbt_dynar_free(&xbt_cmdline);
@@ -129,7 +121,7 @@ static void xbt_postexit(void)
 /** @brief Initialize the xbt mechanisms. */
 void xbt_init(int *argc, char **argv)
 {
-  xbt_set_terminate();
+  simgrid::xbt::installExceptionHandler();
 
   if (xbt_initialized++) {
     XBT_DEBUG("XBT was initialized %d times.", xbt_initialized);