From: Augustin Degomme <degomme@idpann.imag.fr>
Date: Wed, 28 Nov 2012 10:35:49 +0000 (+0100)
Subject: add yet another stunt with smpi_simulated_main to provide support for f90
X-Git-Tag: v3_9_rc1~86^2~233
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/439ff233e2bd6371039af0bd43b5016626f63a9c

add yet another stunt with smpi_simulated_main to provide support for f90
---

diff --git a/include/smpi/smpi.h b/include/smpi/smpi.h
index 950d924ebb..aa601ecddf 100644
--- a/include/smpi/smpi.h
+++ b/include/smpi/smpi.h
@@ -511,6 +511,7 @@ XBT_PUBLIC(void*) smpi_shared_set_call(const char* func, const char* input, void
 XBT_PUBLIC(int) __attribute__((weak)) smpi_simulated_main__(int argc, char** argv);
 XBT_PUBLIC(int) __attribute__((weak)) MAIN__(void);
 XBT_PUBLIC(int) smpi_main(int (*realmain) (int argc, char *argv[]),int argc, char *argv[]);
+XBT_PUBLIC(void) __attribute__((weak)) user_main__(void);
 
 XBT_PUBLIC(int) smpi_process_index(void);
 
diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c
index e1b9909b7b..07b04a1f74 100644
--- a/src/smpi/smpi_global.c
+++ b/src/smpi/smpi_global.c
@@ -288,10 +288,16 @@ 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;
+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) {
-  xbt_die("Should not be in this smpi_simulated_main");
-  return 1;
+  smpi_process_init(&argc, &argv);
+  user_main__();
+  //xbt_die("Should not be in this smpi_simulated_main");
+  return 0;
 }
 
 int __attribute__((weak)) main(int argc, char** argv) {