X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c4c63e5e576a782073b292ee963a9a4240dac0c8..99a42d5d15b6a07e3005056dcf707d3a41671743:/src/smpi/smpi_global.c

diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c
index d629b686a9..7b47526f7a 100644
--- a/src/smpi/smpi_global.c
+++ b/src/smpi/smpi_global.c
@@ -7,12 +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 "src/mc/mc_replay.h"
+#include "src/msg/msg_private.h"
 
 #include <float.h>              /* DBL_MAX */
 #include <stdint.h>
@@ -79,17 +80,18 @@ 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 */
-    index = proc->segment_index;
+    index = smpi_process_index_of_smx_process(proc);
 
     if(!index_to_process_data){
       index_to_process_data=(int*)xbt_malloc(SIMIX_process_count()*sizeof(int));
     }
 
     if(smpi_privatize_global_variables){
+      /* Now using segment index of the process  */
+      index = proc->segment_index;
       /* Done at the process's creation */
       SMPI_switch_data_segment(index);
     }
@@ -103,8 +105,11 @@ void smpi_process_init(int *argc, char ***argv)
     data->index = index;
     data->instance_id = instance_id;
     data->replaying = 0;
-    xbt_free(simcall_process_get_data(proc));
-    simcall_process_set_data(proc, data);
+    //xbt_free(simcall_process_get_data(proc));
+
+  simdata_process_t simdata = simcall_process_get_data(proc);
+  simdata->data = data;
+
     if (*argc > 3) {
       free((*argv)[1]);
       memmove(&(*argv)[0], &(*argv)[2], sizeof(char *) * (*argc - 2));
@@ -213,7 +218,8 @@ int smpi_global_size(void)
 
 smpi_process_data_t smpi_process_data(void)
 {
-  return SIMIX_process_self_get_data(SIMIX_process_self());
+  simdata_process_t simdata = SIMIX_process_self_get_data(SIMIX_process_self());
+  return simdata->data;
 }
 
 smpi_process_data_t smpi_process_remote_data(int index)
@@ -363,7 +369,7 @@ void smpi_comm_copy_buffer_callback(smx_synchro_t comm,
       && ((char*)buff < smpi_start_data_exe + smpi_size_data_exe )
     ){
        XBT_DEBUG("Privatization : We are copying from a zone inside global memory... Saving data to temp buffer !");
-       smpi_switch_data_segment(((smpi_process_data_t)SIMIX_process_get_data(comm->comm.src_proc))->index);
+       smpi_switch_data_segment(((smpi_process_data_t)(((simdata_process_t)SIMIX_process_get_data(comm->comm.src_proc))->data))->index);
        tmpbuff = (void*)xbt_malloc(buff_size);
        memcpy(tmpbuff, buff, buff_size);
   }
@@ -374,7 +380,7 @@ void smpi_comm_copy_buffer_callback(smx_synchro_t comm,
       && ((char*)comm->comm.dst_buff < smpi_start_data_exe + smpi_size_data_exe )
     ){
        XBT_DEBUG("Privatization : We are copying to a zone inside global memory - Switch data segment");
-       smpi_switch_data_segment(((smpi_process_data_t)SIMIX_process_get_data(comm->comm.dst_proc))->index);
+       smpi_switch_data_segment(((smpi_process_data_t)(((simdata_process_t)SIMIX_process_get_data(comm->comm.dst_proc))->data))->index);
   }
 
 
@@ -404,7 +410,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")) {
@@ -439,20 +445,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