Even printf does not follow the standard on Windows.

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

diff --git a/src/xbt/xbt_main.c b/src/xbt/xbt_main.c
index 73e2daa..141e329 100644 (file)
--- a/src/xbt/xbt_main.c
+++ b/src/xbt/xbt_main.c
@@ -1,6 +1,6 @@
 /* module handling                                                          */
 
-/* Copyright (c) 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2006-2013. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -9,7 +9,6 @@
 #include "xbt/misc.h"
 #include "simgrid_config.h"     /*HAVE_MMAP _XBT_WIN32 */
 #include "internal_config.h"        /* MMALLOC_WANT_OVERRIDE_LEGACY */
-#include "time.h"               /* to seed the random generator */
 
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
@@ -20,6 +19,10 @@
 
 #include "xbt_modinter.h"       /* prototype of other module's init/exit in XBT */
 
+#include "simgrid/sg_config.h"
+
+#include <stdio.h>
+
 XBT_LOG_NEW_CATEGORY(xbt, "All XBT categories (simgrid toolbox)");
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(module, xbt, "module handling");
 
@@ -27,14 +30,10 @@ XBT_LOG_NEW_CATEGORY(smpi, "All SMPI categories"); /* lives here even if that's
 
 
 char *xbt_binary_name = NULL;   /* Name of the system process containing us (mandatory to retrieve neat backtraces) */
-int xbt_initialized = 0;
+xbt_dynar_t xbt_cmdline = NULL; /* all we got in argv */
 
-int _surf_do_model_check = 0;
-int _surf_mc_checkpoint=0;
-char* _surf_mc_property_file=NULL;
-int _surf_mc_timeout=0;
-int _surf_mc_max_depth=1000;
-int _surf_mc_visited=0;
+int xbt_initialized = 0;
+int _sg_do_clean_atexit = 1;
 
 /* Declare xbt_preinit and xbt_postexit as constructor/destructor of the library.
  * This is crude and rather compiler-specific, unfortunately.
@@ -82,31 +81,39 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason,
 
 #endif
 
-static void xbt_preinit(void)
-{
+static void xbt_preinit(void) {
+  unsigned int seed = 2147483647;
+
 #ifdef MMALLOC_WANT_OVERRIDE_LEGACY
   mmalloc_preinit();
+#endif
+#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);
+#ifndef _WIN32
+  srand48(seed);
+#endif
 
   atexit(xbt_postexit);
 }
 
 static void xbt_postexit(void)
 {
+  if(!_sg_do_clean_atexit) return;
   xbt_backtrace_postexit();
-
   xbt_fifo_postexit();
   xbt_dict_postexit();
-
-  xbt_log_postexit();
   xbt_os_thread_mod_postexit();
-
+  xbt_dynar_free(&xbt_cmdline);
+  xbt_log_postexit();
   free(xbt_binary_name);
 #ifdef MMALLOC_WANT_OVERRIDE_LEGACY
   mmalloc_postexit();
@@ -122,8 +129,12 @@ void xbt_init(int *argc, char **argv)
   }
 
   xbt_binary_name = xbt_strdup(argv[0]);
-  srand((unsigned int) time(NULL));
-
+  xbt_cmdline = xbt_dynar_new(sizeof(char*),NULL);
+  int i;
+  for (i=0;i<*argc;i++) {
+    xbt_dynar_push(xbt_cmdline,&(argv[i]));
+  }
+  
   xbt_log_init(argc, argv);
 }