Merging changes done by Steven, Samuel and Luka, regarding simulation of StarPU-MPI

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

diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c
index dd252f8..295ddfb 100644 (file)
--- a/src/smpi/smpi_global.c
+++ b/src/smpi/smpi_global.c
@@ -7,13 +7,13 @@
 #include "private.h"
 #include "smpi_mpi_dt_private.h"
 #include "mc/mc.h"
-#include "mc/mc_record.h"
+#include "src/mc/mc_record.h"
 #include "xbt/replay.h"
 #include "surf/surf.h"
-#include "simix/smx_private.h"
+#include "src/simix/smx_private.h"
 #include "simgrid/sg_config.h"
-#include "mc/mc_replay.h"
-#include "msg/msg_private.h"
+#include "src/mc/mc_replay.h"
+#include "src/msg/msg_private.h"
 
 #include <float.h>              /* DBL_MAX */
 #include <stdint.h>
@@ -80,7 +80,7 @@ void smpi_process_init(int *argc, char ***argv)
   if (argc && argv) {
     proc = SIMIX_process_self();
     //FIXME: dirty cleanup method to avoid using msg cleanup functions on these processes when using MSG+SMPI
-    proc->context->cleanup_func=SIMIX_process_cleanup;
+    SIMIX_process_set_cleanup_function(proc, SIMIX_process_cleanup);
     char* instance_id = (*argv)[1];
     int rank = atoi((*argv)[2]);
     /* Now using segment index of the process */
@@ -409,7 +409,7 @@ void smpi_comm_null_copy_buffer_callback(smx_synchro_t comm,
 static void smpi_check_options(){
   //check correctness of MPI parameters
 
-   xbt_assert(sg_cfg_get_int("smpi/async_small_thres") <=
+   xbt_assert(sg_cfg_get_int("smpi/async_small_thresh") <=
               sg_cfg_get_int("smpi/send_is_detached_thres"));
 
    if (sg_cfg_is_default_value("smpi/running_power")) {
@@ -444,20 +444,20 @@ void smpi_global_init(void)
   for (i = 0; i < process_count; i++) {
     process_data[i] = xbt_new(s_smpi_process_data_t, 1);
     //process_data[i]->index = i;
-    process_data[i]->argc = NULL;
-    process_data[i]->argv = NULL;
+    process_data[i]->argc    = NULL;
+    process_data[i]->argv    = NULL;
     process_data[i]->mailbox = simcall_rdv_create(get_mailbox_name(name, i));
     process_data[i]->mailbox_small =
         simcall_rdv_create(get_mailbox_name_small(name, i));
-    process_data[i]->mailboxes_mutex=xbt_mutex_init();
-    process_data[i]->timer = xbt_os_timer_new();
+    process_data[i]->mailboxes_mutex = xbt_mutex_init();
+    process_data[i]->timer           = xbt_os_timer_new();
     if (MC_is_active())
       MC_ignore_heap(process_data[i]->timer, xbt_os_timer_size());
-    process_data[i]->comm_self = MPI_COMM_NULL;
-    process_data[i]->comm_intra = MPI_COMM_NULL;
-    process_data[i]->comm_world = NULL;
-    process_data[i]->state = SMPI_UNINITIALIZED;
-    process_data[i]->sampling = 0;
+    process_data[i]->comm_self            = MPI_COMM_NULL;
+    process_data[i]->comm_intra           = MPI_COMM_NULL;
+    process_data[i]->comm_world           = NULL;
+    process_data[i]->state                = SMPI_UNINITIALIZED;
+    process_data[i]->sampling             = 0;
     process_data[i]->finalization_barrier = NULL;
   }
   //if the process was launched through smpirun script