remove unwanted !

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

diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c
index ecf585d..03d06e1 100644 (file)
--- a/src/smpi/smpi_global.c
+++ b/src/smpi/smpi_global.c
@@ -78,7 +78,7 @@ void smpi_process_init(int *argc, char ***argv)
     proc->context->cleanup_func=SIMIX_process_cleanup;
     char* instance_id = (*argv)[1];
     int rank = atoi((*argv)[2]);
-    index =  SIMIX_process_get_PID(proc) -1;
+    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));
@@ -95,8 +95,7 @@ void smpi_process_init(int *argc, char ***argv)
     simcall_process_set_data(proc, data);
     if (*argc > 3) {
       free((*argv)[1]);
-      free((*argv)[2]);
-      memmove(&(*argv)[1], &(*argv)[3], sizeof(char *) * (*argc - 3));
+      memmove(&(*argv)[0], &(*argv)[2], sizeof(char *) * (*argc - 2));
       (*argv)[(*argc) - 1] = NULL;
       (*argv)[(*argc) - 2] = NULL;
     }
@@ -109,7 +108,7 @@ void smpi_process_init(int *argc, char ***argv)
     XBT_DEBUG("<%d> New process in the game: %p", index, proc);
 
     if(smpi_privatize_global_variables){
-      switch_data_segment(index);
+      smpi_switch_data_segment(index);
     }
 
   }
@@ -121,7 +120,7 @@ void smpi_process_destroy(void)
 {
   int index = smpi_process_index();
   if(smpi_privatize_global_variables){
-    switch_data_segment(index);
+    smpi_switch_data_segment(index);
   }
   process_data[index_to_process_data[index]]->state = SMPI_FINALIZED;
   XBT_DEBUG("<%d> Process left the game", index);
@@ -170,7 +169,7 @@ int smpi_process_initialized(void)
 void smpi_process_mark_as_initialized(void)
 {
   int index = smpi_process_index();
-  if ((index != MPI_UNDEFINED) && (!process_data[index_to_process_data[index]]->state != SMPI_FINALIZED))
+  if ((index != MPI_UNDEFINED) && (process_data[index_to_process_data[index]]->state != SMPI_FINALIZED))
     process_data[index_to_process_data[index]]->state = SMPI_INITIALIZED;
 }
 
@@ -221,11 +220,6 @@ int smpi_process_index(void)
   return data ? data->index : MPI_UNDEFINED;
 }
 
-int smpi_process_index_of_smx_process(smx_process_t process) {
-  smpi_process_data_t data = (smpi_process_data_t) SIMIX_process_get_data(process);
-  return data ? data->index : MPI_UNDEFINED;
-}
-
 MPI_Comm smpi_process_comm_world(void)
 {
   smpi_process_data_t data = smpi_process_data();
@@ -315,7 +309,7 @@ int smpi_process_get_sampling(void)
 
 void print_request(const char *message, MPI_Request request)
 {
-  XBT_DEBUG
+  XBT_VERB
       ("%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);
@@ -333,7 +327,7 @@ void smpi_comm_copy_buffer_callback(smx_action_t comm,
       && ((char*)buff < start_data_exe + size_data_exe )
     ){
        XBT_DEBUG("Privatization : We are copying from a zone inside global memory... Saving data to temp buffer !");
-       switch_data_segment(((smpi_process_data_t)SIMIX_process_get_data(comm->comm.src_proc))->index);
+       smpi_switch_data_segment(((smpi_process_data_t)SIMIX_process_get_data(comm->comm.src_proc))->index);
        tmpbuff = (void*)xbt_malloc(buff_size);
        memcpy(tmpbuff, buff, buff_size);
   }
@@ -344,7 +338,7 @@ void smpi_comm_copy_buffer_callback(smx_action_t comm,
       && ((char*)comm->comm.dst_buff < start_data_exe + size_data_exe )
     ){
        XBT_DEBUG("Privatization : We are copying to a zone inside global memory - Switch data segment");
-       switch_data_segment(((smpi_process_data_t)SIMIX_process_get_data(comm->comm.dst_proc))->index);
+       smpi_switch_data_segment(((smpi_process_data_t)SIMIX_process_get_data(comm->comm.dst_proc))->index);
   }