#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"
#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... */
/** @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);