X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f4a4ef73baa450859c84d1d46168d456f7b76b8f..6270ece7967b322385bbff766ee5f882ba1ef2a2:/src/smpi/smpi_comm.c

diff --git a/src/smpi/smpi_comm.c b/src/smpi/smpi_comm.c
index 7ed1a3253c..9f38c44267 100644
--- a/src/smpi/smpi_comm.c
+++ b/src/smpi/smpi_comm.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2014. The SimGrid Team.
+/* Copyright (c) 2010-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -10,16 +10,15 @@
 #include "xbt/dict.h"
 #include "smpi_mpi_dt_private.h"
 #include "limits.h"
-#include "simix/smx_private.h"
+#include "src/simix/smx_private.h"
 #include "colls/colls.h"
 #include "xbt/ex.h"
 
-
-extern xbt_dict_t smpi_keyvals;
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_comm, smpi,
                                 "Logging specific to SMPI (comm)");
 
-
+xbt_dict_t smpi_comm_keyvals = NULL;
+int comm_keyval_id = 0;//avoid collisions
 
 /* Support for cartesian topology was added, but there are 2 other types of
  * topology, graph et dist graph. In order to support them, we have to add a
@@ -89,29 +88,53 @@ void smpi_comm_destroy(MPI_Comm comm)
   smpi_comm_unuse(comm);
 }
 
-MPI_Comm smpi_comm_dup(MPI_Comm comm){
+int smpi_comm_dup(MPI_Comm comm, MPI_Comm* newcomm){
   if(smpi_privatize_global_variables){ //we need to switch here, as the called function may silently touch global variables
      smpi_switch_data_segment(smpi_process_index());
    }
-  MPI_Comm newcomm = smpi_comm_new(smpi_comm_group(comm), smpi_comm_topo(comm));
-
+  (*newcomm) = smpi_comm_new(smpi_comm_group(comm), smpi_comm_topo(comm));
+  int ret = MPI_SUCCESS;
+  //todo: faire en sorte que ça fonctionne avec un communicator dupliqué (refaire un init_smp ?)
+  
+ /* MPI_Comm tmp=smpi_comm_get_intra_comm(comm);
+  if( tmp != MPI_COMM_NULL)
+    smpi_comm_set_intra_comm((*newcomm), smpi_comm_dup(tmp));
+  tmp=smpi_comm_get_leaders_comm(comm);
+  if( tmp != MPI_COMM_NULL)
+    smpi_comm_set_leaders_comm((*newcomm), smpi_comm_dup(tmp));
+  if(comm->non_uniform_map !=NULL){
+    (*newcomm)->non_uniform_map= 
+      xbt_malloc(smpi_comm_size(comm->leaders_comm)*sizeof(int));
+    memcpy((*newcomm)->non_uniform_map,
+      comm->non_uniform_map,smpi_comm_size(comm->leaders_comm)*sizeof(int) );
+  }
+  if(comm->leaders_map !=NULL){
+    (*newcomm)->leaders_map=xbt_malloc(smpi_comm_size(comm)*sizeof(int));
+    memcpy((*newcomm)->leaders_map, 
+      comm->leaders_map,smpi_comm_size(comm)*sizeof(int) );
+  }*/
   if(comm->attributes !=NULL){
-      newcomm->attributes=xbt_dict_new();
+      (*newcomm)->attributes=xbt_dict_new();
       xbt_dict_cursor_t cursor = NULL;
       int *key;
       int flag;
       void* value_in;
       void* value_out;
       xbt_dict_foreach(comm->attributes, cursor, key, value_in){
-        smpi_key_elem elem = xbt_dict_get_or_null(smpi_keyvals, (const char*)key);
+        smpi_comm_key_elem elem = xbt_dict_get_or_null_ext(smpi_comm_keyvals, (const char*)key, sizeof(int));
         if(elem && elem->copy_fn!=MPI_NULL_COPY_FN){
-          elem->copy_fn(comm, *key, NULL, value_in, &value_out, &flag );
+          ret = elem->copy_fn(comm, *key, NULL, value_in, &value_out, &flag );
+          if(ret!=MPI_SUCCESS){
+            smpi_comm_destroy(*newcomm);
+            *newcomm=MPI_COMM_NULL;
+            return ret;
+          }
           if(flag)
-            xbt_dict_set(newcomm->attributes, (const char*)key,value_out, NULL);
+            xbt_dict_set_ext((*newcomm)->attributes, (const char*)key, sizeof(int),value_out, NULL);
         }
       }
     }
-  return newcomm;
+  return ret;
 }
 
 
@@ -307,12 +330,12 @@ void smpi_comm_unuse(MPI_Comm comm){
     if(comm->attributes !=NULL){
       xbt_dict_cursor_t cursor = NULL;
       int* key;
-      smpi_key_elem elem;
       void * value;
       int flag;
-      xbt_dict_foreach(comm->attributes, cursor, key, elem){
-        if(smpi_attr_get(comm, *key, &value, &flag)==MPI_SUCCESS)
-          elem->delete_fn(comm, *key, &value, &flag);
+      xbt_dict_foreach(comm->attributes, cursor, key, value){
+        smpi_comm_key_elem elem = xbt_dict_get_or_null(smpi_comm_keyvals, (const char*)key);
+        if(elem &&  elem->delete_fn)
+          elem->delete_fn(comm, *key, value, &flag);
       }
     }
     xbt_free(comm);
@@ -363,7 +386,7 @@ void smpi_comm_init_smp(MPI_Comm comm){
 
   int i =0;
   int min_index=INT_MAX;//the minimum index will be the leader
-  msg_process_t process = NULL;
+  smx_process_t process = NULL;
   xbt_swag_foreach(process, process_list) {
     //is_in_comm=0;
     int index = SIMIX_process_get_PID(process) -1;
@@ -510,37 +533,87 @@ void smpi_comm_init_smp(MPI_Comm comm){
     smpi_process_set_replaying(1); 
 }
 
-
 int smpi_comm_attr_delete(MPI_Comm comm, int keyval){
+  smpi_comm_key_elem elem = xbt_dict_get_or_null_ext(smpi_comm_keyvals, (const char*)&keyval, sizeof(int));
+  if(!elem)
+    return MPI_ERR_ARG;
+  if(elem->delete_fn!=MPI_NULL_DELETE_FN){
+    void * value;
+    int flag;
+    if(smpi_comm_attr_get(comm, keyval, &value, &flag)==MPI_SUCCESS){
+      int ret = elem->delete_fn(comm, keyval, value, &flag);
+      if(ret!=MPI_SUCCESS) return ret;
+    }
+  }  
   if(comm->attributes==NULL)
     return MPI_ERR_ARG;
-    
-  xbt_dict_remove(comm->attributes, (const char*)&keyval);
+
+  xbt_dict_remove_ext(comm->attributes, (const char*)&keyval, sizeof(int));
   return MPI_SUCCESS;
 }
+
 int smpi_comm_attr_get(MPI_Comm comm, int keyval, void* attr_value, int* flag){
+  smpi_comm_key_elem elem = xbt_dict_get_or_null_ext(smpi_comm_keyvals, (const char*)&keyval, sizeof(int));
+  if(!elem)
+    return MPI_ERR_ARG;
   xbt_ex_t ex;
   if(comm->attributes==NULL){
     *flag=0;
     return MPI_SUCCESS;
   }
   TRY {
-    *(void**)attr_value = xbt_dict_get(comm->attributes, (const char*)&keyval);
+    *(void**)attr_value = xbt_dict_get_ext(comm->attributes,  (const char*)&keyval, sizeof(int));
     *flag=1;
   }
   CATCH(ex) {
     *flag=0;
     xbt_ex_free(ex);
   }
-  
   return MPI_SUCCESS;
 }
 
 int smpi_comm_attr_put(MPI_Comm comm, int keyval, void* attr_value){
+  if(!smpi_comm_keyvals)
+  smpi_comm_keyvals = xbt_dict_new();
+  smpi_comm_key_elem elem = xbt_dict_get_or_null_ext(smpi_comm_keyvals,  (const char*)&keyval, sizeof(int));
+  if(!elem )
+    return MPI_ERR_ARG;
+  int flag;
+  void* value;
+  smpi_comm_attr_get(comm, keyval, &value, &flag);
+  if(flag && elem->delete_fn!=MPI_NULL_DELETE_FN){
+    int ret = elem->delete_fn(comm, keyval, value, &flag);
+    if(ret!=MPI_SUCCESS) return ret;
+  }
   if(comm->attributes==NULL)
     comm->attributes=xbt_dict_new();
 
-  xbt_dict_set(comm->attributes, (const char*)&keyval, attr_value, NULL);
+  xbt_dict_set_ext(comm->attributes,  (const char*)&keyval, sizeof(int), attr_value, NULL);
+  return MPI_SUCCESS;
+}
+
+int smpi_comm_keyval_create(MPI_Comm_copy_attr_function* copy_fn, MPI_Comm_delete_attr_function* delete_fn, int* keyval, void* extra_state){
+
+  if(!smpi_comm_keyvals)
+  smpi_comm_keyvals = xbt_dict_new();
+  
+  smpi_comm_key_elem value = (smpi_comm_key_elem) xbt_new0(s_smpi_mpi_comm_key_elem_t,1);
+  
+  value->copy_fn=copy_fn;
+  value->delete_fn=delete_fn;
+  
+  *keyval = comm_keyval_id;
+  xbt_dict_set_ext(smpi_comm_keyvals, (const char*)keyval, sizeof(int),(void*)value, NULL);
+  comm_keyval_id++;
   return MPI_SUCCESS;
 }
 
+int smpi_comm_keyval_free(int* keyval){
+  smpi_comm_key_elem elem = xbt_dict_get_or_null_ext(smpi_comm_keyvals,  (const char*)keyval, sizeof(int));
+  if(!elem){
+    return MPI_ERR_ARG;
+  }
+  xbt_dict_remove_ext(smpi_comm_keyvals,  (const char*)keyval, sizeof(int));
+  xbt_free(elem);
+  return MPI_SUCCESS;
+}