#include "xbt/misc.h"
#include "simgrid_config.h" /*HAVE_MMAP _XBT_WIN32 */
+#include "gras_config.h" /* MMALLOC_WANT_OVERRIDE_LEGACY */
#include "time.h" /* to seed the random generator */
#include "xbt/sysdep.h"
XBT_LOG_EXTERNAL_CATEGORY(xbt_sync_os);
XBT_LOG_EXTERNAL_CATEGORY(xbt_parmap);
XBT_LOG_EXTERNAL_CATEGORY(xbt_parmap_unit);
+XBT_LOG_EXTERNAL_CATEGORY(xbt_ddt);
+XBT_LOG_EXTERNAL_CATEGORY(xbt_ddt_cbps);
+XBT_LOG_EXTERNAL_CATEGORY(xbt_ddt_convert);
+XBT_LOG_EXTERNAL_CATEGORY(xbt_ddt_create);
+XBT_LOG_EXTERNAL_CATEGORY(xbt_ddt_exchange);
+XBT_LOG_EXTERNAL_CATEGORY(xbt_ddt_lexer);
+XBT_LOG_EXTERNAL_CATEGORY(xbt_ddt_parse);
+XBT_LOG_EXTERNAL_CATEGORY(xbt_trp);
+XBT_LOG_EXTERNAL_CATEGORY(xbt_trp_meas);
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) */
#ifdef _XBT_WIN32
#include <windows.h>
+#ifndef __GNUC__
/* Dummy prototype to make gcc happy */
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason,
LPVOID lpvReserved);
+/* Should not be necessary but for some reason,
+ * DllMain is called twice at attachment and
+ * at detachment.*/
+static int xbt_dll_process_is_attached = 0;
/* see also http://msdn.microsoft.com/en-us/library/ms682583%28VS.85%29.aspx */
/* and http://www.microsoft.com/whdc/driver/kernel/DLL_bestprac.mspx */
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason,
LPVOID lpvReserved)
{
- if (fdwReason == DLL_PROCESS_ATTACH) {
- xbt_preinit();
- } else if (fdwReason == DLL_PROCESS_DETACH) {
- xbt_postexit();
+ if (fdwReason == DLL_PROCESS_ATTACH
+ && xbt_dll_process_is_attached == 0) {
+ xbt_dll_process_is_attached = 1;
+ xbt_preinit();
+ } else if (fdwReason == DLL_PROCESS_DETACH
+ && xbt_dll_process_is_attached == 1) {
+ xbt_dll_process_is_attached = 0;
+ xbt_postexit();
}
return 1;
}
-
+#endif
#endif
static void xbt_preinit(void)
{
-#ifdef MMALLOC_WANT_OVERIDE_LEGACY
+#ifdef MMALLOC_WANT_OVERRIDE_LEGACY
mmalloc_preinit();
#endif
xbt_log_preinit();
XBT_LOG_CONNECT(xbt_sync_os, xbt);
XBT_LOG_CONNECT(xbt_parmap,xbt);
XBT_LOG_CONNECT(xbt_parmap_unit,xbt_parmap);
-
+ XBT_LOG_CONNECT(xbt_ddt, xbt);
+ XBT_LOG_CONNECT(xbt_ddt_cbps, xbt_ddt);
+ XBT_LOG_CONNECT(xbt_ddt_convert, xbt_ddt);
+ XBT_LOG_CONNECT(xbt_ddt_create, xbt_ddt);
+ XBT_LOG_CONNECT(xbt_ddt_exchange, xbt_ddt);
+ XBT_LOG_CONNECT(xbt_ddt_lexer, xbt_ddt_parse);
+ XBT_LOG_CONNECT(xbt_ddt_parse, xbt_ddt);
+ XBT_LOG_CONNECT(xbt_trp, xbt);
+ XBT_LOG_CONNECT(xbt_trp_meas, xbt_trp);
xbt_backtrace_preinit();
xbt_os_thread_mod_preinit();
xbt_fifo_preinit();
xbt_dict_preinit();
+ xbt_datadesc_preinit();
+ xbt_trp_preinit();
}
static void xbt_postexit(void)
{
+ xbt_trp_postexit();
+ xbt_datadesc_postexit();
+
xbt_backtrace_postexit();
xbt_fifo_postexit();
xbt_os_thread_mod_postexit();
free(xbt_binary_name);
-#ifdef MMALLOC_WANT_OVERIDE_LEGACY
+#ifdef MMALLOC_WANT_OVERRIDE_LEGACY
mmalloc_postexit();
#endif
}