From 3f740d769f956cbaa52d518358e9a65ecce196d7 Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Fri, 7 Nov 2014 11:46:13 +0100 Subject: [PATCH] Simplify use of dict for smpi attr handling. Switch from char keys to direct int keys, as in MPI, because we can, actually (with dict_ext functions) --- src/smpi/smpi_comm.c | 44 ++++++++++++----------------------------- src/smpi/smpi_mpi_dt.c | 45 +++++++++++++----------------------------- 2 files changed, 27 insertions(+), 62 deletions(-) diff --git a/src/smpi/smpi_comm.c b/src/smpi/smpi_comm.c index 4c0283725b..7518c1582d 100644 --- a/src/smpi/smpi_comm.c +++ b/src/smpi/smpi_comm.c @@ -17,8 +17,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_comm, smpi, "Logging specific to SMPI (comm)"); -//number of bytes to hold an int converted in char* -#define INTSIZEDCHAR (sizeof(int)*CHAR_BIT-1)/3 + 3 xbt_dict_t smpi_comm_keyvals = NULL; int comm_keyval_id=MPI_TAG_UB+1;//avoid collisions @@ -123,16 +121,16 @@ int smpi_comm_dup(MPI_Comm comm, MPI_Comm* newcomm){ void* value_in; void* value_out; xbt_dict_foreach(comm->attributes, cursor, key, value_in){ - smpi_comm_key_elem elem = xbt_dict_get_or_null(smpi_comm_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){ - ret = elem->copy_fn(comm, atoi((const char*)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); } } } @@ -337,7 +335,7 @@ void smpi_comm_unuse(MPI_Comm comm){ 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, atoi((const char*)key), value, &flag); + elem->delete_fn(comm, *key, value, &flag); } } xbt_free(comm); @@ -536,9 +534,7 @@ void smpi_comm_init_smp(MPI_Comm comm){ } int smpi_comm_attr_delete(MPI_Comm comm, int keyval){ - 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); + 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){ @@ -552,15 +548,12 @@ int smpi_comm_attr_delete(MPI_Comm comm, int keyval){ if(comm->attributes==NULL) return MPI_ERR_ARG; - xbt_dict_remove(comm->attributes, (const char*)tmpkey); - xbt_free(tmpkey); + 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){ - 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); + 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; @@ -569,23 +562,20 @@ int smpi_comm_attr_get(MPI_Comm comm, int keyval, void* attr_value, int* flag){ return MPI_SUCCESS; } TRY { - *(void**)attr_value = xbt_dict_get(comm->attributes, (const char*)tmpkey); + *(void**)attr_value = xbt_dict_get_ext(comm->attributes, (const char*)&keyval, sizeof(int)); *flag=1; } CATCH(ex) { *flag=0; xbt_ex_free(ex); } - xbt_free(tmpkey); 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(); - 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); + 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; @@ -598,8 +588,7 @@ int smpi_comm_attr_put(MPI_Comm comm, int keyval, void* attr_value){ if(comm->attributes==NULL) comm->attributes=xbt_dict_new(); - xbt_dict_set(comm->attributes, (const char*)tmpkey, attr_value, NULL); - xbt_free(tmpkey); + xbt_dict_set_ext(comm->attributes, (const char*)&keyval, sizeof(int), attr_value, NULL); return MPI_SUCCESS; } @@ -614,25 +603,18 @@ int smpi_comm_keyval_create(MPI_Comm_copy_attr_function* copy_fn, MPI_Comm_delet value->delete_fn=delete_fn; *keyval = comm_keyval_id; - char* tmpkey=xbt_malloc(INTSIZEDCHAR); - sprintf(tmpkey, "%d", *keyval); - xbt_dict_set(smpi_comm_keyvals,(const char*)tmpkey,(void*)value, NULL); + xbt_dict_set_ext(smpi_comm_keyvals, (const char*)keyval, sizeof(int),(void*)value, NULL); comm_keyval_id++; - xbt_free(tmpkey); return MPI_SUCCESS; } int smpi_comm_keyval_free(int* keyval){ - 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); + smpi_comm_key_elem elem = xbt_dict_get_or_null_ext(smpi_comm_keyvals, (const char*)keyval, sizeof(int)); if(!elem){ - xbt_free(tmpkey); return MPI_ERR_ARG; } - xbt_dict_remove(smpi_comm_keyvals, (const char*)tmpkey); + xbt_dict_remove_ext(smpi_comm_keyvals, (const char*)keyval, sizeof(int)); xbt_free(elem); - xbt_free(tmpkey); return MPI_SUCCESS; } diff --git a/src/smpi/smpi_mpi_dt.c b/src/smpi/smpi_mpi_dt.c index 54eecc2710..4692a2bd19 100644 --- a/src/smpi/smpi_mpi_dt.c +++ b/src/smpi/smpi_mpi_dt.c @@ -20,7 +20,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_mpi_dt, smpi, "Logging specific to SMPI (datatype)"); -#define INTSIZEDCHAR (sizeof(int)*CHAR_BIT-1)/3 + 3 xbt_dict_t smpi_type_keyvals = NULL; int type_keyval_id=0;//avoid collisions @@ -195,15 +194,15 @@ int smpi_datatype_dup(MPI_Datatype datatype, MPI_Datatype* new_t) void* value_in; void* value_out; xbt_dict_foreach(datatype->attributes, cursor, key, value_in){ - smpi_type_key_elem elem = xbt_dict_get_or_null(smpi_type_keyvals, (const char*)key); + smpi_type_key_elem elem = xbt_dict_get_or_null_ext(smpi_type_keyvals, (const char*)key, sizeof(int)); if(elem && elem->copy_fn!=MPI_NULL_COPY_FN){ - ret = elem->copy_fn(datatype, atoi((const char*)key), NULL, value_in, &value_out, &flag ); + ret = elem->copy_fn(datatype, *key, NULL, value_in, &value_out, &flag ); if(ret!=MPI_SUCCESS){ *new_t=MPI_DATATYPE_NULL; return ret; } if(flag) - xbt_dict_set((*new_t)->attributes, (const char*)key,value_out, NULL); + xbt_dict_set_ext((*new_t)->attributes, (const char*)key, sizeof(int),value_out, NULL); } } } @@ -411,9 +410,9 @@ void smpi_datatype_free(MPI_Datatype* type){ void * value; int flag; xbt_dict_foreach((*type)->attributes, cursor, key, value){ - smpi_type_key_elem elem = xbt_dict_get_or_null(smpi_type_keyvals, (const char*)key); + smpi_type_key_elem elem = xbt_dict_get_or_null_ext(smpi_type_keyvals, (const char*)key, sizeof(int)); if(elem && elem->delete_fn) - elem->delete_fn(*type, atoi((const char*)key), value, &flag); + elem->delete_fn(*type,*key, value, &flag); } } @@ -1671,9 +1670,7 @@ void smpi_op_apply(MPI_Op op, void *invec, void *inoutvec, int *len, } int smpi_type_attr_delete(MPI_Datatype type, int keyval){ - 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); + smpi_type_key_elem elem = xbt_dict_get_or_null_ext(smpi_type_keyvals, (const char*)&keyval, sizeof(int)); if(!elem) return MPI_ERR_ARG; if(elem->delete_fn!=MPI_NULL_DELETE_FN){ @@ -1687,15 +1684,12 @@ int smpi_type_attr_delete(MPI_Datatype type, int keyval){ if(type->attributes==NULL) return MPI_ERR_ARG; - xbt_dict_remove(type->attributes, (const char*)tmpkey); - xbt_free(tmpkey); + xbt_dict_remove_ext(type->attributes, (const char*)&keyval, sizeof(int)); return MPI_SUCCESS; } int smpi_type_attr_get(MPI_Datatype type, int keyval, void* attr_value, int* flag){ - 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); + smpi_type_key_elem elem = xbt_dict_get_or_null_ext(smpi_type_keyvals, (const char*)&keyval, sizeof(int)); if(!elem) return MPI_ERR_ARG; xbt_ex_t ex; @@ -1704,23 +1698,20 @@ int smpi_type_attr_get(MPI_Datatype type, int keyval, void* attr_value, int* fla return MPI_SUCCESS; } TRY { - *(void**)attr_value = xbt_dict_get(type->attributes, (const char*)tmpkey); + *(void**)attr_value = xbt_dict_get_ext(type->attributes, (const char*)&keyval, sizeof(int)); *flag=1; } CATCH(ex) { *flag=0; xbt_ex_free(ex); } - xbt_free(tmpkey); return MPI_SUCCESS; } int smpi_type_attr_put(MPI_Datatype type, int keyval, void* attr_value){ if(!smpi_type_keyvals) smpi_type_keyvals = xbt_dict_new(); - 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); + smpi_type_key_elem elem = xbt_dict_get_or_null_ext(smpi_type_keyvals, (const char*)&keyval, sizeof(int)); if(!elem ) return MPI_ERR_ARG; int flag; @@ -1733,8 +1724,7 @@ int smpi_type_attr_put(MPI_Datatype type, int keyval, void* attr_value){ if(type->attributes==NULL) type->attributes=xbt_dict_new(); - xbt_dict_set(type->attributes, (const char*)tmpkey, attr_value, NULL); - xbt_free(tmpkey); + xbt_dict_set_ext(type->attributes, (const char*)&keyval, sizeof(int), attr_value, NULL); return MPI_SUCCESS; } @@ -1749,25 +1739,18 @@ int smpi_type_keyval_create(MPI_Type_copy_attr_function* copy_fn, MPI_Type_delet value->delete_fn=delete_fn; *keyval = type_keyval_id; - char* tmpkey=xbt_malloc(INTSIZEDCHAR); - sprintf(tmpkey, "%d", *keyval); - xbt_dict_set(smpi_type_keyvals,(const char*)tmpkey,(void*)value, NULL); + xbt_dict_set_ext(smpi_type_keyvals,(const char*)keyval, sizeof(int),(void*)value, NULL); type_keyval_id++; - xbt_free(tmpkey); return MPI_SUCCESS; } int smpi_type_keyval_free(int* keyval){ - 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); + smpi_type_key_elem elem = xbt_dict_get_or_null_ext(smpi_type_keyvals, (const char*)keyval, sizeof(int)); if(!elem){ - xbt_free(tmpkey); return MPI_ERR_ARG; } - xbt_dict_remove(smpi_type_keyvals, (const char*)tmpkey); + xbt_dict_remove_ext(smpi_type_keyvals, (const char*)keyval, sizeof(int)); xbt_free(elem); - xbt_free(tmpkey); return MPI_SUCCESS; } -- 2.20.1