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

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

diff --git a/src/smpi/smpi_mpi_dt.c b/src/smpi/smpi_mpi_dt.c
index 860e48c..047cf91 100644 (file)
--- a/src/smpi/smpi_mpi_dt.c
+++ b/src/smpi/smpi_mpi_dt.c
@@ -412,7 +412,7 @@ void smpi_datatype_free(MPI_Datatype* type){
       xbt_dict_foreach((*type)->attributes, cursor, key, value){
         smpi_type_key_elem elem = xbt_dict_get_or_null(smpi_type_keyvals, (const char*)key);
         if(elem &&  elem->delete_fn)
-          elem->delete_fn(*type, atoi((const char*)key), &value, &flag);
+          elem->delete_fn(*type, atoi((const char*)key), value, &flag);
       }
   }
 
@@ -1679,7 +1679,7 @@ int smpi_type_attr_delete(MPI_Datatype type, int keyval){
     void * value;
     int flag;
     if(smpi_type_attr_get(type, keyval, &value, &flag)==MPI_SUCCESS){
-      int ret = elem->delete_fn(type, keyval, &value, &flag);
+      int ret = elem->delete_fn(type, keyval, value, &flag);
       if(ret!=MPI_SUCCESS) return ret;
     }
   }  
@@ -1703,8 +1703,6 @@ int smpi_type_attr_get(MPI_Datatype type, int keyval, void* attr_value, int* fla
     return MPI_SUCCESS;
   }
   TRY {
-  char* tmpkey=xbt_malloc(INTSIZEDCHAR);
-  sprintf(tmpkey, "%d", keyval);
     *(void**)attr_value = xbt_dict_get(type->attributes, (const char*)tmpkey);
     *flag=1;
   }
@@ -1728,7 +1726,7 @@ int smpi_type_attr_put(MPI_Datatype type, int keyval, void* attr_value){
   void* value;
   smpi_type_attr_get(type, keyval, &value, &flag);
   if(flag && elem->delete_fn!=MPI_NULL_DELETE_FN){
-    int ret = elem->delete_fn(type, keyval, &value, &flag);
+    int ret = elem->delete_fn(type, keyval, value, &flag);
     if(ret!=MPI_SUCCESS) return ret;
   }
   if(type->attributes==NULL)
@@ -1759,11 +1757,13 @@ int smpi_type_keyval_create(MPI_Type_copy_attr_function* copy_fn, MPI_Type_delet
 }
 
 int smpi_type_keyval_free(int* keyval){
-  smpi_type_key_elem elem = xbt_dict_get_or_null(smpi_type_keyvals, (const char*)keyval);
-  if(!elem)
-    return MPI_ERR_ARG;
   char* tmpkey=xbt_malloc(INTSIZEDCHAR);
   sprintf(tmpkey, "%d", *keyval);
+  smpi_type_key_elem elem = xbt_dict_get_or_null(smpi_type_keyvals, (const char*)tmpkey);
+  if(!elem){
+    xbt_free(tmpkey);
+    return MPI_ERR_ARG;
+  }
   xbt_dict_remove(smpi_type_keyvals, (const char*)tmpkey);
   xbt_free(elem);
   xbt_free(tmpkey);