XBT_LOG_EXTERNAL_CATEGORY(strbuff);
XBT_LOG_EXTERNAL_CATEGORY(xbt_cfg);
XBT_LOG_EXTERNAL_CATEGORY(xbt_dict);
-XBT_LOG_EXTERNAL_CATEGORY(xbt_dict_add);
-XBT_LOG_EXTERNAL_CATEGORY(xbt_dict_collapse);
XBT_LOG_EXTERNAL_CATEGORY(xbt_dict_cursor);
XBT_LOG_EXTERNAL_CATEGORY(xbt_dict_elm);
XBT_LOG_EXTERNAL_CATEGORY(xbt_dict_multi);
-XBT_LOG_EXTERNAL_CATEGORY(xbt_dict_remove);
-XBT_LOG_EXTERNAL_CATEGORY(xbt_dict_search);
XBT_LOG_EXTERNAL_CATEGORY(xbt_dyn);
XBT_LOG_EXTERNAL_CATEGORY(xbt_ex);
XBT_LOG_EXTERNAL_CATEGORY(xbt_fifo);
XBT_LOG_EXTERNAL_CATEGORY(xbt_queue);
XBT_LOG_EXTERNAL_CATEGORY(xbt_set);
XBT_LOG_EXTERNAL_CATEGORY(xbt_sync_os);
+XBT_LOG_EXTERNAL_CATEGORY(xbt_parmap);
+XBT_LOG_EXTERNAL_CATEGORY(xbt_parmap_unit);
+int _surf_do_model_check = 0; /* this variable is used accros the libraries, and must be declared in XBT so that it's also defined in GRAS (not only in libsimgrid) */
/* Declare xbt_preinit and xbt_postexit as constructor/destructor of the library.
* This is crude and rather compiler-specific, unfortunately.
static void xbt_preinit(void)
{
-#ifdef HAVE_MMAP
+#ifdef MMALLOC_WANT_OVERIDE_LEGACY
mmalloc_preinit();
#endif
xbt_log_preinit();
XBT_LOG_CONNECT(strbuff, xbt);
XBT_LOG_CONNECT(xbt_cfg, xbt);
XBT_LOG_CONNECT(xbt_dict, xbt);
- XBT_LOG_CONNECT(xbt_dict_add, xbt_dict);
- XBT_LOG_CONNECT(xbt_dict_collapse, xbt_dict);
XBT_LOG_CONNECT(xbt_dict_cursor, xbt_dict);
XBT_LOG_CONNECT(xbt_dict_elm, xbt_dict);
XBT_LOG_CONNECT(xbt_dict_multi, xbt_dict);
- XBT_LOG_CONNECT(xbt_dict_remove, xbt_dict);
- XBT_LOG_CONNECT(xbt_dict_search, xbt_dict);
XBT_LOG_CONNECT(xbt_dyn, xbt);
XBT_LOG_CONNECT(xbt_ex, xbt);
XBT_LOG_CONNECT(xbt_fifo, xbt);
XBT_LOG_CONNECT(xbt_queue, xbt);
XBT_LOG_CONNECT(xbt_set, xbt);
XBT_LOG_CONNECT(xbt_sync_os, xbt);
+ XBT_LOG_CONNECT(xbt_parmap,xbt);
+ XBT_LOG_CONNECT(xbt_parmap_unit,xbt_parmap);
- xbt_fifo_preinit();
- xbt_dict_preinit();
xbt_backtrace_preinit();
xbt_os_thread_mod_preinit();
+ xbt_fifo_preinit();
+ xbt_dict_preinit();
}
static void xbt_postexit(void)
{
- xbt_os_thread_mod_postexit();
xbt_backtrace_postexit();
xbt_fifo_postexit();
xbt_dict_postexit();
xbt_log_postexit();
+ xbt_os_thread_mod_postexit();
free(xbt_binary_name);
-#ifdef HAVE_MMAP
+#ifdef MMALLOC_WANT_OVERIDE_LEGACY
mmalloc_postexit();
#endif
}
xbt_binary_name = xbt_strdup(argv[0]);
srand((unsigned int) time(NULL));
- VERB0("Initialize XBT");
+ XBT_VERB("Initialize XBT");
xbt_log_init(argc, argv);
}
/** @brief Finalize the xbt mechanisms. */
void xbt_exit()
{
- WARN0("This function is deprecated, you shouldn't use it");
+ XBT_WARN("This function is deprecated, you shouldn't use it");
}