[xbt] Install a custom exception handler

[simgrid.git] / src / xbt / xbt_main.c

diff --git a/src/xbt/xbt_main.c b/src/xbt/xbt_main.c
index ec1bddf..13ec9e3 100644 (file)
--- a/src/xbt/xbt_main.c
+++ b/src/xbt/xbt_main.c
@@ -22,7 +22,7 @@
 
 #include "simgrid/sg_config.h"
 
-#include "src/portable.h"
+#include "src/internal_config.h"
 #include <stdio.h>
 #ifdef _WIN32
 #include <signal.h> /* To silence MSVC on abort() */
@@ -35,7 +35,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(module, xbt, "module handling");
 
 XBT_LOG_NEW_CATEGORY(smpi, "All SMPI categories"); /* lives here even if that's a bit odd to solve linking issues: this is used in xbt_log_file_appender to detect whether SMPI is used (and thus whether we should unbench the writing to disk) */
 
-
 char *xbt_binary_name = NULL;   /* Name of the system process containing us (mandatory to retrieve neat backtraces) */
 xbt_dynar_t xbt_cmdline = NULL; /* all we got in argv */
 
@@ -63,9 +62,7 @@ static void xbt_postexit(void);
 #include <windows.h>
 
 #ifndef __GNUC__
-/* Should not be necessary but for some reason,
- * DllMain is called twice at attachment and
- * at detachment.*/
+/* 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 */
@@ -140,6 +137,8 @@ static void xbt_postexit(void)
 /** @brief Initialize the xbt mechanisms. */
 void xbt_init(int *argc, char **argv)
 {
+  xbt_set_terminate();
+
   if (xbt_initialized++) {
     XBT_DEBUG("XBT was initialized %d times.", xbt_initialized);
     return;
@@ -147,22 +146,12 @@ void xbt_init(int *argc, char **argv)
 
   xbt_binary_name = xbt_strdup(argv[0]);
   xbt_cmdline = xbt_dynar_new(sizeof(char*),NULL);
-  int i;
-  for (i=0;i<*argc;i++) {
+  for (int i=0;i<*argc;i++)
     xbt_dynar_push(xbt_cmdline,&(argv[i]));
-  }
   
   xbt_log_init(argc, argv);
 }
 
-/** @brief Finalize the xbt mechanisms.
- *  @warning this function is deprecated. Just don't call it, there is nothing more to do to finalize xbt*/
-void xbt_exit()
-{
-  XBT_WARN("This function is deprecated, you shouldn't use it");
-}
-
-
 /* 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  */
 void xbt_free_f(void *p)