MPI_Aint lb;
MPI_Aint ub;
int flags;
+ xbt_dict_t attributes;
/* this let us know how to serialize and unserialize*/
void *substruct;
int in_use;
} s_smpi_mpi_key_elem_t;
typedef struct s_smpi_mpi_key_elem *smpi_key_elem;
+typedef struct s_smpi_mpi_type_key_elem {
+ MPI_Type_copy_attr_function* copy_fn;
+ MPI_Type_delete_attr_function* delete_fn;
+} s_smpi_mpi_type_key_elem_t;
+typedef struct s_smpi_mpi_type_key_elem *smpi_type_key_elem;
+
void smpi_process_destroy(void);
void smpi_process_finalize(void);
int smpi_process_finalized(void);
size_t smpi_datatype_size(MPI_Datatype datatype);
MPI_Aint smpi_datatype_lb(MPI_Datatype datatype);
MPI_Aint smpi_datatype_ub(MPI_Datatype datatype);
-MPI_Datatype smpi_datatype_dup(MPI_Datatype datatype);
+int smpi_datatype_dup(MPI_Datatype datatype, MPI_Datatype* new_t);
int smpi_datatype_extent(MPI_Datatype datatype, MPI_Aint * lb,
MPI_Aint * extent);
MPI_Aint smpi_datatype_get_extent(MPI_Datatype datatype);
int smpi_attr_delete(MPI_Comm comm, int keyval);
int smpi_attr_get(MPI_Comm comm, int keyval, void* attr_value, int* flag);
int smpi_attr_put(MPI_Comm comm, int keyval, void* attr_value);
-
-
+int smpi_type_attr_delete(MPI_Datatype type, int keyval);
+int smpi_type_attr_get(MPI_Datatype type, int keyval, void* attr_value, int* flag);
+int smpi_type_attr_put(MPI_Datatype type, int keyval, void* attr_value);
+int smpi_type_keyval_create(MPI_Type_copy_attr_function* copy_fn, MPI_Type_delete_attr_function* delete_fn, int* keyval, void* extra_state);
+int smpi_type_keyval_free(int* keyval);
// utilities
extern double smpi_cpu_threshold;
extern double smpi_running_power;
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_mpi_dt, smpi,
"Logging specific to SMPI (datatype)");
+xbt_dict_t smpi_type_keyvals = NULL;
+int type_keyval_id=0;//avoid collisions
+
#define CREATE_MPI_DATATYPE(name, type) \
static s_smpi_mpi_datatype_t mpi_##name = { \
(char*) # name, \
0, /* lb */ \
sizeof(type), /* ub = lb + size */ \
DT_FLAG_BASIC, /* flags */ \
- NULL /* pointer on extended struct*/ \
+ NULL, /* attributes */ \
+ NULL, /* pointer on extended struct*/ \
}; \
MPI_Datatype name = &mpi_##name;
0, /* lb */ \
0, /* ub = lb + size */ \
DT_FLAG_BASIC, /* flags */ \
+ NULL, /* attributes */ \
NULL /* pointer on extended struct*/ \
}; \
MPI_Datatype name = &mpi_##name;
return datatype->ub;
}
-MPI_Datatype smpi_datatype_dup(MPI_Datatype datatype)
+int smpi_datatype_dup(MPI_Datatype datatype, MPI_Datatype* new_t)
{
- MPI_Datatype new_t= xbt_new(s_smpi_mpi_datatype_t,1);
- memcpy(new_t, datatype, sizeof(s_smpi_mpi_datatype_t));
- if (datatype->has_subtype)
- memcpy(new_t->substruct, datatype->substruct, sizeof(s_smpi_subtype_t));
+ int ret=MPI_SUCCESS;
+ *new_t= xbt_new(s_smpi_mpi_datatype_t,1);
+ memcpy(*new_t, datatype, sizeof(s_smpi_mpi_datatype_t));
+ if (datatype->has_subtype){
+ //FIXME: may copy too much information.
+ (*new_t)->substruct=xbt_malloc(sizeof(s_smpi_mpi_struct_t));
+ memcpy((*new_t)->substruct, datatype->substruct, sizeof(s_smpi_mpi_struct_t));
+ }
if(datatype->name)
- new_t->name = strdup(datatype->name);
- return new_t;
+ (*new_t)->name = strdup(datatype->name);
+ if(datatype->attributes !=NULL){
+ (*new_t)->attributes=xbt_dict_new();
+ xbt_dict_cursor_t cursor = NULL;
+ int *key;
+ int flag;
+ 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);
+ if(elem && elem->copy_fn!=MPI_NULL_COPY_FN){
+ ret = elem->copy_fn(datatype, atoi((const char*)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);
+ }
+ }
+ }
+ return ret;
}
int smpi_datatype_extent(MPI_Datatype datatype, MPI_Aint * lb,
new_t->flags = flags;
new_t->substruct = struct_type;
new_t->in_use=0;
+ new_t->attributes=NULL;
*new_type = new_t;
#ifdef HAVE_MC
}
void smpi_datatype_free(MPI_Datatype* type){
+ if((*type)->attributes !=NULL){
+ xbt_dict_cursor_t cursor = NULL;
+ int* key;
+ 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);
+ if(elem)
+ elem->delete_fn(*type, atoi((const char*)key), &value, &flag);
+ }
+ }
if((*type)->flags & DT_FLAG_PREDEFINED)return;
if(!smpi_process_get_replaying())
op->func(invec, inoutvec, len, datatype);
}
+
+int smpi_type_attr_delete(MPI_Datatype type, int keyval){
+ char* tmpkey=xbt_malloc(sizeof(int));
+ sprintf(tmpkey, "%d", keyval);
+ smpi_type_key_elem elem = xbt_dict_get_or_null(smpi_type_keyvals, (const char*)tmpkey);
+ if(!elem)
+ return MPI_ERR_ARG;
+ if(elem->delete_fn!=MPI_NULL_DELETE_FN){
+ void * value;
+ int flag;
+ if(smpi_type_attr_get(type, keyval, &value, &flag)==MPI_SUCCESS){
+ int ret = elem->delete_fn(type, keyval, &value, &flag);
+ if(ret!=MPI_SUCCESS) return ret;
+ }
+ }
+ if(type->attributes==NULL)
+ return MPI_ERR_ARG;
+
+ xbt_dict_remove(type->attributes, (const char*)tmpkey);
+ return MPI_SUCCESS;
+}
+
+int smpi_type_attr_get(MPI_Datatype type, int keyval, void* attr_value, int* flag){
+ char* tmpkey=xbt_malloc(sizeof(int));
+ sprintf(tmpkey, "%d", keyval);
+ smpi_type_key_elem elem = xbt_dict_get_or_null(smpi_type_keyvals, (const char*)tmpkey);
+ if(!elem)
+ return MPI_ERR_ARG;
+ xbt_ex_t ex;
+ if(type->attributes==NULL){
+ *flag=0;
+ return MPI_SUCCESS;
+ }
+ TRY {
+ char* tmpkey=xbt_malloc(sizeof(int));
+ sprintf(tmpkey, "%d", keyval);
+ *(void**)attr_value = xbt_dict_get(type->attributes, (const char*)tmpkey);
+ *flag=1;
+ }
+ CATCH(ex) {
+ *flag=0;
+ xbt_ex_free(ex);
+ }
+ 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(sizeof(int));
+ sprintf(tmpkey, "%d", keyval);
+ smpi_type_key_elem elem = xbt_dict_get_or_null(smpi_type_keyvals, (const char*)tmpkey);
+ if(!elem )
+ return MPI_ERR_ARG;
+ int flag;
+ 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);
+ if(ret!=MPI_SUCCESS) return ret;
+ }
+ if(type->attributes==NULL)
+ type->attributes=xbt_dict_new();
+
+ xbt_dict_set(type->attributes, (const char*)tmpkey, attr_value, NULL);
+ return MPI_SUCCESS;
+}
+
+int smpi_type_keyval_create(MPI_Type_copy_attr_function* copy_fn, MPI_Type_delete_attr_function* delete_fn, int* keyval, void* extra_state){
+
+ if(!smpi_type_keyvals)
+ smpi_type_keyvals = xbt_dict_new();
+
+ smpi_type_key_elem value = (smpi_type_key_elem) xbt_new0(s_smpi_mpi_type_key_elem_t,1);
+
+ value->copy_fn=copy_fn;
+ value->delete_fn=delete_fn;
+
+ *keyval = type_keyval_id;
+ char* tmpkey=xbt_malloc(sizeof(int));
+ sprintf(tmpkey, "%d", *keyval);
+ xbt_dict_set(smpi_type_keyvals,(const char*)tmpkey,(void*)value, NULL);
+ type_keyval_id++;
+ return MPI_SUCCESS;
+}
+
+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(sizeof(int));
+ sprintf(tmpkey, "%d", *keyval);
+ xbt_dict_remove(smpi_type_keyvals, (const char*)tmpkey);
+ xbt_free(elem);
+ return MPI_SUCCESS;
+}
if (datatype == MPI_DATATYPE_NULL) {
retval = MPI_ERR_TYPE;
} else {
- *newtype = smpi_datatype_dup(datatype);
- retval = MPI_SUCCESS;
+ retval = smpi_datatype_dup(datatype, newtype);
}
return retval;
}
return smpi_attr_put(comm, keyval, attr_value);
}
-
int PMPI_Comm_get_attr (MPI_Comm comm, int comm_keyval, void *attribute_val, int *flag)
{
return PMPI_Attr_get(comm, comm_keyval, attribute_val,flag);
return PMPI_Keyval_free(keyval);
}
+
+int PMPI_Type_get_attr (MPI_Datatype type, int type_keyval, void *attribute_val, int* flag)
+{
+ if (type==MPI_DATATYPE_NULL)
+ return MPI_ERR_TYPE;
+ else
+ return smpi_type_attr_get(type, type_keyval, attribute_val, flag);
+}
+
+int PMPI_Type_set_attr (MPI_Datatype type, int type_keyval, void *attribute_val)
+{
+ if (type==MPI_DATATYPE_NULL)
+ return MPI_ERR_TYPE;
+ else
+ return smpi_type_attr_put(type, type_keyval, attribute_val);
+}
+
+int PMPI_Type_delete_attr (MPI_Datatype type, int type_keyval)
+{
+ if (type==MPI_DATATYPE_NULL)
+ return MPI_ERR_TYPE;
+ else
+ return smpi_type_attr_delete(type, type_keyval);
+}
+
+int PMPI_Type_create_keyval(MPI_Type_copy_attr_function* copy_fn, MPI_Type_delete_attr_function* delete_fn, int* keyval, void* extra_state)
+{
+ return smpi_type_keyval_create(copy_fn, delete_fn, keyval, extra_state);
+}
+
+int PMPI_Type_free_keyval(int* keyval) {
+ return smpi_type_keyval_free(keyval);
+}
+
/* The following calls are not yet implemented and will fail at runtime. */
/* Once implemented, please move them above this notice. */
NOT_YET_IMPLEMENTED
}
-int PMPI_Type_get_attr (MPI_Datatype type, int type_keyval, void *attribute_val, int* flag)
-{
- NOT_YET_IMPLEMENTED
-}
-
-int PMPI_Type_set_attr (MPI_Datatype type, int type_keyval, void *attribute_val)
-{
- NOT_YET_IMPLEMENTED
-}
-
-int PMPI_Type_delete_attr (MPI_Datatype type, int comm_keyval)
-{
- NOT_YET_IMPLEMENTED
-}
-
-int PMPI_Type_create_keyval(MPI_Type_copy_attr_function* copy_fn, MPI_Type_delete_attr_function* delete_fn, int* keyval, void* extra_state)
-{
- NOT_YET_IMPLEMENTED
-}
-
-int PMPI_Type_free_keyval(int* keyval) {
- NOT_YET_IMPLEMENTED
-}
-
int PMPI_Intercomm_create(MPI_Comm local_comm, int local_leader, MPI_Comm peer_comm, int remote_leader, int tag, MPI_Comm* comm_out) {
NOT_YET_IMPLEMENTED
}
include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../include/")
-# add_executable(attr2type attr2type.c)
+ add_executable(attr2type attr2type.c)
add_executable(attrend2 attrend2.c)
add_executable(attrend attrend.c)
add_executable(attrerr attrerr.c)
add_executable(attrerrcomm attrerrcomm.c)
-# add_executable(attrerrtype attrerrtype.c)
+ add_executable(attrerrtype attrerrtype.c)
# add_executable(attric attric.c)
add_executable(attrorder attrorder.c)
add_executable(attrordercomm attrordercomm.c)
-# add_executable(attrordertype attrordertype.c)
+ add_executable(attrordertype attrordertype.c)
add_executable(attrt attrt.c)
add_executable(baseattr2 baseattr2.c)
add_executable(baseattrcomm baseattrcomm.c)
# add_executable(fkeyvaltype fkeyvaltype.c)
# add_executable(keyval_double_free keyval_double_free.c)
-# target_link_libraries(attr2type simgrid mtest_c)
+ target_link_libraries(attr2type simgrid mtest_c)
target_link_libraries(attrend2 simgrid mtest_c)
target_link_libraries(attrend simgrid mtest_c)
target_link_libraries(attrerr simgrid mtest_c)
target_link_libraries(attrerrcomm simgrid mtest_c)
-# target_link_libraries(attrerrtype simgrid mtest_c)
+ target_link_libraries(attrerrtype simgrid mtest_c)
# target_link_libraries(attric simgrid mtest_c)
target_link_libraries(attrorder simgrid mtest_c)
target_link_libraries(attrordercomm simgrid mtest_c)
-# target_link_libraries(attrordertype simgrid mtest_c)
+ target_link_libraries(attrordertype simgrid mtest_c)
target_link_libraries(attrt simgrid mtest_c)
target_link_libraries(baseattr2 simgrid mtest_c)
target_link_libraries(baseattrcomm simgrid mtest_c)