various fixes to hopefully compile under win32

[simgrid.git] / src / smpi / smpi_global.c

diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c
index 572cdda..22f52d7 100644 (file)
--- a/src/smpi/smpi_global.c
+++ b/src/smpi/smpi_global.c
@@ -289,11 +289,12 @@ void smpi_global_destroy(void)
 /* With smpiff, the following weak symbols are replaced by those in libf2c */
 int __attribute__((weak)) xargc;
 char** __attribute__((weak)) xargv;
+
+#ifndef WIN32
 void __attribute__((weak)) user_main__(){
   xbt_die("Should not be in this smpi_simulated_main");
   return;
 }
-
 int __attribute__((weak)) smpi_simulated_main__(int argc, char** argv) {
   smpi_process_init(&argc, &argv);
   user_main__();
@@ -308,6 +309,7 @@ int __attribute__((weak)) main(int argc, char** argv) {
 int __attribute__((weak)) MAIN__(){
   return smpi_main(smpi_simulated_main__,xargc, xargv);
 };
+#endif
 
 int smpi_main(int (*realmain) (int argc, char *argv[]),int argc, char *argv[])
 {
@@ -319,8 +321,13 @@ int smpi_main(int (*realmain) (int argc, char *argv[]),int argc, char *argv[])
   }
 
   /* Connect log categories.  See xbt/log.c */
-  XBT_LOG_CONNECT(smpi);  /* Keep this line as soon as possible in this function: xbt_log_appender_file.c depends on it
-                             DO NOT connect this in XBT or so, or it will be useless to xbt_log_appender_file.c */
+  XBT_LOG_CONNECT(smpi);  /* Keep this line as soon as possible in this
+                             function: xbt_log_appender_file.c depends on it
+                             DO NOT connect this in XBT or so, or it will be
+                             useless to xbt_log_appender_file.c */
+#ifdef HAVE_TRACING
+  XBT_LOG_CONNECT(instr_smpi);
+#endif
   XBT_LOG_CONNECT(smpi_base);
   XBT_LOG_CONNECT(smpi_bench);
   XBT_LOG_CONNECT(smpi_coll);
@@ -334,6 +341,9 @@ int smpi_main(int (*realmain) (int argc, char *argv[]),int argc, char *argv[])
 
 #ifdef HAVE_TRACING
   TRACE_global_init(&argc, argv);
+
+  TRACE_add_start_function(TRACE_smpi_alloc);
+  TRACE_add_end_function(TRACE_smpi_release);
 #endif
 
   SIMIX_global_init(&argc, argv);