Programs compiled with smpicc now silently and successfully exit when SMPI_PRETEND_CC...

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

diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c
index b8938fa..1b98966 100644 (file)
--- a/src/smpi/smpi_global.c
+++ b/src/smpi/smpi_global.c
@@ -58,7 +58,7 @@ void smpi_process_init(int *argc, char ***argv)
     (*argc)--;
     data->argc = argc;
     data->argv = argv;
-    DEBUG2("<%d> New process in the game: %p", index, proc);
+    XBT_DEBUG("<%d> New process in the game: %p", index, proc);
   }
 }
 
@@ -66,7 +66,7 @@ void smpi_process_destroy(void)
 {
   int index = smpi_process_index();
 
-  DEBUG1("<%d> Process left the game", index);
+  XBT_DEBUG("<%d> Process left the game", index);
 }
 
 int smpi_process_argc(void) {
@@ -94,10 +94,6 @@ int smpi_process_getarg(integer* index, char* dst, ftnlen len) {
   return 0;
 }
 
-int smpi_global_rank(void) {
-   return smpi_process_index();
-}
-
 int smpi_global_size(void) {
    char* value = getenv("SMPI_GLOBAL_SIZE");
 
@@ -109,7 +105,7 @@ int smpi_global_size(void) {
 
 smpi_process_data_t smpi_process_data(void)
 {
-  return SIMIX_req_process_get_data(SIMIX_process_self());
+  return SIMIX_process_self_get_data();
 }
 
 smpi_process_data_t smpi_process_remote_data(int index)
@@ -171,7 +167,7 @@ MPI_Comm smpi_process_comm_self(void)
 
 void print_request(const char *message, MPI_Request request)
 {
-  DEBUG8("%s  request %p  [buf = %p, size = %zu, src = %d, dst = %d, tag = %d, flags = %x]",
+  XBT_DEBUG("%s  request %p  [buf = %p, size = %zu, src = %d, dst = %d, tag = %d, flags = %x]",
          message, request, request->buf, request->size,
          request->src, request->dst, request->tag, request->flags);
 }
@@ -227,12 +223,10 @@ 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;
-int fortran = 1;
 
 int __attribute__((weak)) main(int argc, char** argv) {
    xargc = argc;
    xargv = argv;
-   fortran = 0;
    return MAIN__();
 }
 
@@ -258,10 +252,8 @@ int MAIN__(void)
                    xbt_cfgelm_double, &default_threshold, 1, 1, NULL,
                    NULL);
 
-  if(fortran) {
-    /* Force thread contexts with fortran code */
-    extern void SIMIX_ctx_thread_factory_init(smx_context_factory_t *factory);
-    smx_factory_initializer_to_use = SIMIX_ctx_thread_factory_init;
+  if(getenv("SMPI_PRETEND_CC") != NULL) {
+    return 0;
   }
 
 #ifdef HAVE_TRACING
@@ -292,7 +284,7 @@ int MAIN__(void)
     SIMIX_run();
 
   if (xbt_cfg_get_int(_surf_cfg_set, "smpi/display_timing"))
-    INFO1("simulation time %g", SIMIX_get_clock());
+    XBT_INFO("simulation time %g", SIMIX_get_clock());
 
   smpi_global_destroy();