Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

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

diff --git a/src/smpi/smpi_comm.c b/src/smpi/smpi_comm.c
index 19fadf3..4c02837 100644 (file)
--- a/src/smpi/smpi_comm.c
+++ b/src/smpi/smpi_comm.c
@@ -545,7 +545,7 @@ int smpi_comm_attr_delete(MPI_Comm comm, int keyval){
     void * value;
     int flag;
     if(smpi_comm_attr_get(comm, keyval, &value, &flag)==MPI_SUCCESS){
-      int ret = elem->delete_fn(comm, keyval, &value, &flag);
+      int ret = elem->delete_fn(comm, keyval, value, &flag);
       if(ret!=MPI_SUCCESS) return ret;
     }
   }  
@@ -569,8 +569,6 @@ int smpi_comm_attr_get(MPI_Comm comm, int keyval, void* attr_value, int* flag){
     return MPI_SUCCESS;
   }
   TRY {
-  char* tmpkey=xbt_malloc(INTSIZEDCHAR);
-  sprintf(tmpkey, "%d", keyval);
     *(void**)attr_value = xbt_dict_get(comm->attributes, (const char*)tmpkey);
     *flag=1;
   }
@@ -594,7 +592,7 @@ int smpi_comm_attr_put(MPI_Comm comm, int keyval, void* attr_value){
   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);
+    int ret = elem->delete_fn(comm, keyval, value, &flag);
     if(ret!=MPI_SUCCESS) return ret;
   }
   if(comm->attributes==NULL)
@@ -625,11 +623,13 @@ int smpi_comm_keyval_create(MPI_Comm_copy_attr_function* copy_fn, MPI_Comm_delet
 }
 
 int smpi_comm_keyval_free(int* keyval){
-  smpi_comm_key_elem elem = xbt_dict_get_or_null(smpi_comm_keyvals, (const char*)keyval);
-  if(!elem)
-    return MPI_ERR_ARG;
   char* tmpkey=xbt_malloc(INTSIZEDCHAR);
   sprintf(tmpkey, "%d", *keyval);
+  smpi_comm_key_elem elem = xbt_dict_get_or_null(smpi_comm_keyvals, (const char*)tmpkey);
+  if(!elem){
+    xbt_free(tmpkey);
+    return MPI_ERR_ARG;
+  }
   xbt_dict_remove(smpi_comm_keyvals, (const char*)tmpkey);
   xbt_free(elem);
   xbt_free(tmpkey);