Avoid to put smpi symbols in libsimgrid.

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

diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c
index 43e5c0c..acbd4ce 100644 (file)
--- a/src/smpi/smpi_global.c
+++ b/src/smpi/smpi_global.c
@@ -13,6 +13,7 @@
 #include "mc/mc.h"
 #include "surf/surf.h"
 #include "simix/smx_private.h"
+#include "simgrid/sg_config.h"
 
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_kernel, smpi,
@@ -35,6 +36,10 @@ static int process_count = 0;
 
 MPI_Comm MPI_COMM_WORLD = MPI_COMM_NULL;
 
+MPI_Errhandler* MPI_ERRORS_RETURN = NULL;
+MPI_Errhandler* MPI_ERRORS_ARE_FATAL = NULL;
+MPI_Errhandler* MPI_ERRHANDLER_NULL = NULL;
+
 #define MAILBOX_NAME_MAXLEN (5 + sizeof(int) * 2 + 1)
 
 static char* get_mailbox_name(char* str, int index) {
@@ -89,6 +94,7 @@ void smpi_process_finalize(void)
   }
 }
 
+#ifdef SMPI_F2C
 int smpi_process_argc(void) {
   smpi_process_data_t data = smpi_process_data();
 
@@ -118,11 +124,12 @@ int smpi_global_size(void) {
    char* value = getenv("SMPI_GLOBAL_SIZE");
 
    if(!value) {
-      fprintf(stderr, "Please set env var SMPI_GLOBAL_SIZE to expected number of processes.\n");
-      abort();
+     fprintf(stderr, "Please set env var SMPI_GLOBAL_SIZE to expected number of processes.\n");
+     xbt_abort();
    }
    return atoi(value);
 }
+#endif
 
 smpi_process_data_t smpi_process_data(void)
 {
@@ -213,13 +220,27 @@ void print_request(const char *message, MPI_Request request) {
          request->src, request->dst, request->tag, request->flags);
 }
 
+static void SMPI_comm_copy_buffer_callback(smx_action_t comm, void* buff, size_t buff_size)
+{
+  XBT_DEBUG("Copy the data over");
+  memcpy(comm->comm.dst_buff, buff, buff_size);
+  if (comm->comm.detached) { // if this is a detached send, the source buffer was duplicated by SMPI sender to make the original buffer available to the application ASAP
+    xbt_free(buff);
+    //It seems that the request is used after the call there this should
+    //be free somewhereelse  but where???
+    //xbt_free(comm->comm.src_data);// inside SMPI the request is keep
+    //inside the user data and should be free 
+    comm->comm.src_buff = NULL;
+  }
+}
+
 void smpi_global_init(void)
 {
   int i;
   MPI_Group group;
   char name[MAILBOX_NAME_MAXLEN];
 
-  SIMIX_comm_set_copy_data_callback(&SIMIX_comm_copy_buffer_callback);
+  SIMIX_comm_set_copy_data_callback(&SMPI_comm_copy_buffer_callback);
   process_count = SIMIX_process_count();
   process_data = xbt_new(smpi_process_data_t, process_count);
   for (i = 0; i < process_count; i++) {
@@ -247,6 +268,7 @@ void smpi_global_destroy(void)
   int i;
 
   smpi_bench_destroy();
+  smpi_group_destroy(smpi_comm_group(MPI_COMM_WORLD));
   smpi_comm_destroy(MPI_COMM_WORLD);
   MPI_COMM_WORLD = MPI_COMM_NULL;
   for (i = 0; i < count; i++) {
@@ -267,14 +289,27 @@ 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) {
+  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) {
-   xargc = argc;
-   xargv = argv;
-   return MAIN__();
+   return smpi_main(smpi_simulated_main__,argc,argv);
 }
 
-int MAIN__(void)
+int __attribute__((weak)) MAIN__(){
+  return smpi_main(smpi_simulated_main__,xargc, xargv);
+};
+
+int smpi_main(int (*realmain) (int argc, char *argv[]),int argc, char *argv[])
 {
   srand(SMPI_RAND_SEED);
 
@@ -284,8 +319,13 @@ int MAIN__(void)
   }
 
   /* 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);
@@ -295,22 +335,26 @@ int MAIN__(void)
   XBT_LOG_CONNECT(smpi_mpi);
   XBT_LOG_CONNECT(smpi_mpi_dt);
   XBT_LOG_CONNECT(smpi_pmpi);
+  XBT_LOG_CONNECT(smpi_replay);
 
 #ifdef HAVE_TRACING
-  TRACE_global_init(&xargc, xargv);
+  TRACE_global_init(&argc, argv);
+
+  TRACE_add_start_function(TRACE_smpi_alloc);
+  TRACE_add_end_function(TRACE_smpi_release);
 #endif
 
-  SIMIX_global_init(&xargc, xargv);
+  SIMIX_global_init(&argc, argv);
 
 #ifdef HAVE_TRACING
   TRACE_start();
 #endif
 
   // parse the platform file: get the host list
-  SIMIX_create_environment(xargv[1]);
+  SIMIX_create_environment(argv[1]);
 
-  SIMIX_function_register_default(smpi_simulated_main);
-  SIMIX_launch_application(xargv[2]);
+  SIMIX_function_register_default(realmain);
+  SIMIX_launch_application(argv[2]);
 
   smpi_global_init();
 
@@ -318,12 +362,12 @@ int MAIN__(void)
   fflush(stdout);
   fflush(stderr);
 
-  if (MC_IS_ENABLED)
-    MC_modelcheck();
+  if (MC_is_active())
+    MC_modelcheck_safety();
   else
     SIMIX_run();
 
-  if (xbt_cfg_get_int(_surf_cfg_set, "smpi/display_timing"))
+  if (sg_cfg_get_int("smpi/display_timing"))
     XBT_INFO("Simulation time: %g seconds.", SIMIX_get_clock());
 
   smpi_global_destroy();