XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_mpi_dt, smpi, "Logging specific to SMPI (datatype)");
-xbt_dict_t smpi_type_keyvals = NULL;
+xbt_dict_t smpi_type_keyvals = nullptr;
int type_keyval_id=0;//avoid collisions
#define CREATE_MPI_DATATYPE(name, type) \
0, /* lb */ \
sizeof(type), /* ub = lb + size */ \
DT_FLAG_BASIC, /* flags */ \
- NULL, /* attributes */ \
- NULL, /* pointer on extended struct*/ \
+ nullptr, /* attributes */ \
+ nullptr, /* pointer on extended struct*/ \
0 /* in_use counter */ \
}; \
const MPI_Datatype name = &mpi_##name;
0, /* lb */ \
0, /* ub = lb + size */ \
DT_FLAG_BASIC, /* flags */ \
- NULL, /* attributes */ \
- NULL, /* pointer on extended struct*/ \
+ nullptr, /* attributes */ \
+ nullptr, /* pointer on extended struct*/ \
0 /* in_use counter */ \
}; \
const MPI_Datatype name = &mpi_##name;
}
if(datatype->name)
(*new_t)->name = xbt_strdup(datatype->name);
- if(datatype->attributes !=NULL){
+ if(datatype->attributes !=nullptr){
(*new_t)->attributes=xbt_dict_new();
- xbt_dict_cursor_t cursor = NULL;
+ xbt_dict_cursor_t cursor = nullptr;
int *key;
int flag;
void* value_in;
xbt_dict_foreach(datatype->attributes, cursor, key, value_in){
smpi_type_key_elem elem =
static_cast<smpi_type_key_elem>(xbt_dict_get_or_null_ext(smpi_type_keyvals, reinterpret_cast<const char*>(key), sizeof(int)));
- if(elem != NULL && elem->copy_fn!=MPI_NULL_COPY_FN){
- ret = elem->copy_fn(datatype, *key, NULL, value_in, &value_out, &flag );
+ if(elem != nullptr && elem->copy_fn!=MPI_NULL_COPY_FN){
+ ret = elem->copy_fn(datatype, *key, nullptr, value_in, &value_out, &flag );
if(ret!=MPI_SUCCESS){
smpi_datatype_unuse(*new_t);
*new_t=MPI_DATATYPE_NULL;
return ret;
}
if(flag)
- xbt_dict_set_ext((*new_t)->attributes, reinterpret_cast<const char*>(key), sizeof(int),value_out, NULL);
+ xbt_dict_set_ext((*new_t)->attributes, reinterpret_cast<const char*>(key), sizeof(int),value_out, nullptr);
}
}
}
}
void smpi_datatype_set_name(MPI_Datatype datatype, char* name){
- if(datatype->name!=NULL && (datatype->flags & DT_FLAG_PREDEFINED) == 0)
+ if(datatype->name!=nullptr && (datatype->flags & DT_FLAG_PREDEFINED) == 0)
xbt_free(datatype->name);
datatype->name = xbt_strdup(name);
}
* Copies noncontiguous data into contiguous memory.
* @param contiguous_vector - output vector
* @param noncontiguous_vector - input vector
- * @param type - pointer contening :
+ * @param type - pointer containing :
* - stride - stride of between noncontiguous data
* - block_length - the width or height of blocked matrix
* - count - the number of rows of matrix
void smpi_datatype_create(MPI_Datatype* new_type, int size,int lb, int ub, int sizeof_substruct, void *struct_type,
int flags){
MPI_Datatype new_t= xbt_new(s_smpi_mpi_datatype_t,1);
- new_t->name = NULL;
+ new_t->name = nullptr;
new_t->size = size;
new_t->sizeof_substruct = size>0? sizeof_substruct:0;
new_t->lb = lb;
new_t->flags = flags;
new_t->substruct = struct_type;
new_t->in_use=1;
- new_t->attributes=NULL;
+ new_t->attributes=nullptr;
*new_type = new_t;
#if HAVE_MC
return;
}
- if((*type)->attributes !=NULL){
- xbt_dict_cursor_t cursor = NULL;
+ if((*type)->attributes !=nullptr){
+ xbt_dict_cursor_t cursor = nullptr;
int* key;
void * value;
int flag;
xbt_dict_foreach((*type)->attributes, cursor, key, value){
smpi_type_key_elem elem =
static_cast<smpi_type_key_elem>(xbt_dict_get_or_null_ext(smpi_type_keyvals, reinterpret_cast<const char*>(key), sizeof(int)));
- if(elem!=NULL && elem->delete_fn)
+ if(elem!=nullptr && elem->delete_fn!=nullptr)
elem->delete_fn(*type,*key, value, &flag);
}
xbt_dict_free(&(*type)->attributes);
}
/* Create a Sub type contiguous to be able to serialize and unserialize it the structure s_smpi_mpi_contiguous_t is
- * erived from s_smpi_subtype which required the functions unserialize and serialize */
+ * derived from s_smpi_subtype which required the functions unserialize and serialize */
s_smpi_mpi_contiguous_t* smpi_datatype_contiguous_create( MPI_Aint lb, int block_count, MPI_Datatype old_type,
int size_oldtype){
if(block_count==0)
- return NULL;
+ return nullptr;
s_smpi_mpi_contiguous_t *new_t= xbt_new(s_smpi_mpi_contiguous_t,1);
new_t->base.serialize = &serialize_contiguous;
new_t->base.unserialize = &unserialize_contiguous;
DT_FLAG_VECTOR);
retval=MPI_SUCCESS;
}else{
- /* in this situation the data are contignous thus it's not required to serialize and unserialize it*/
+ /* in this situation the data are contiguous thus it's not required to serialize and unserialize it*/
smpi_datatype_create(new_type, count * blocklen * smpi_datatype_size(old_type), 0, ((count -1) * stride + blocklen)*
- smpi_datatype_size(old_type), 0, NULL, DT_FLAG_VECTOR|DT_FLAG_CONTIGUOUS);
+ smpi_datatype_size(old_type), 0, nullptr, DT_FLAG_VECTOR|DT_FLAG_CONTIGUOUS);
retval=MPI_SUCCESS;
}
return retval;
retval=MPI_SUCCESS;
}else{
smpi_datatype_create(new_type, count * blocklen * smpi_datatype_size(old_type),0,count * blocklen *
- smpi_datatype_size(old_type), 0, NULL, DT_FLAG_VECTOR|DT_FLAG_CONTIGUOUS);
+ smpi_datatype_size(old_type), 0, nullptr, DT_FLAG_VECTOR|DT_FLAG_CONTIGUOUS);
retval=MPI_SUCCESS;
}
return retval;
int i;
int retval;
int size = 0;
- int contiguous=1;
+ bool contiguous=true;
MPI_Aint lb = 0;
MPI_Aint ub = 0;
if(count>0){
ub = indices[i]*smpi_datatype_get_extent(old_type)+blocklens[i]*smpi_datatype_ub(old_type);
if ( (i< count -1) && (indices[i]+blocklens[i] != indices[i+1]) )
- contiguous=0;
+ contiguous=false;
}
if (old_type->sizeof_substruct != 0)
- contiguous=0;
+ contiguous=false;
if(!contiguous){
s_smpi_mpi_indexed_t* subtype = smpi_datatype_indexed_create( blocklens, indices, count, old_type,
int i;
int retval;
int size = 0;
- int contiguous=1;
+ bool contiguous=true;
MPI_Aint lb = 0;
MPI_Aint ub = 0;
if(count>0){
ub = indices[i]+blocklens[i]*smpi_datatype_ub(old_type);
if ( (i< count -1) && (indices[i]+blocklens[i]*(static_cast<int>(smpi_datatype_size(old_type))) != indices[i+1]) )
- contiguous=0;
+ contiguous=false;
}
if (old_type->sizeof_substruct != 0 || lb!=0)
- contiguous=0;
+ contiguous=false;
if(!contiguous){
s_smpi_mpi_hindexed_t* subtype = smpi_datatype_hindexed_create( blocklens, indices, count, old_type,
{
int i;
size_t size = 0;
- int contiguous=1;
+ bool contiguous=true;
size = 0;
MPI_Aint lb = 0;
MPI_Aint ub = 0;
lb=indices[0] + smpi_datatype_lb(old_types[0]);
ub=indices[0] + blocklens[0]*smpi_datatype_ub(old_types[0]);
}
- int forced_lb=0;
- int forced_ub=0;
+ bool forced_lb=false;
+ bool forced_ub=false;
for(i=0; i< count; i++){
if (blocklens[i]<0)
return MPI_ERR_ARG;
if (old_types[i]->sizeof_substruct != 0)
- contiguous=0;
+ contiguous=false;
size += blocklens[i]*smpi_datatype_size(old_types[i]);
if (old_types[i]==MPI_LB){
lb=indices[i];
- forced_lb=1;
+ forced_lb=true;
}
if (old_types[i]==MPI_UB){
ub=indices[i];
- forced_ub=1;
+ forced_ub=true;
}
if(!forced_lb && indices[i]+smpi_datatype_lb(old_types[i])<lb)
ub = indices[i]+blocklens[i]*smpi_datatype_ub(old_types[i]);
if ( (i< count -1) && (indices[i]+blocklens[i]*static_cast<int>(smpi_datatype_size(old_types[i])) != indices[i+1]) )
- contiguous=0;
+ contiguous=false;
}
- if(contiguous==0){
+ if(!contiguous){
s_smpi_mpi_struct_t* subtype = smpi_datatype_struct_create( blocklens, indices, count, old_types);
smpi_datatype_create(new_type, size, lb, ub,sizeof(s_smpi_mpi_struct_t), subtype, DT_FLAG_DATA);
typedef struct s_smpi_mpi_op {
MPI_User_function *func;
- int is_commute;
+ bool is_commute;
} s_smpi_mpi_op_t;
#define MAX_OP(a, b) (b) = (a) < (b) ? (b) : (a)
CREATE_MPI_OP(MPI_MINLOC, minloc_func);
CREATE_MPI_OP(MPI_REPLACE, replace_func);
-MPI_Op smpi_op_new(MPI_User_function * function, int commute)
+MPI_Op smpi_op_new(MPI_User_function * function, bool commute)
{
MPI_Op op;
op = xbt_new(s_smpi_mpi_op_t, 1);
return op;
}
-int smpi_op_is_commute(MPI_Op op)
+bool smpi_op_is_commute(MPI_Op op)
{
- return (op==MPI_OP_NULL) ? 1 : op-> is_commute;
+ return (op==MPI_OP_NULL) ? true : op-> is_commute;
}
void smpi_op_destroy(MPI_Op op)
int smpi_type_attr_delete(MPI_Datatype type, int keyval){
smpi_type_key_elem elem =
static_cast<smpi_type_key_elem>(xbt_dict_get_or_null_ext(smpi_type_keyvals, reinterpret_cast<const char*>(&keyval), sizeof(int)));
- if(elem==NULL)
+ if(elem==nullptr)
return MPI_ERR_ARG;
if(elem->delete_fn!=MPI_NULL_DELETE_FN){
- void * value;
+ void * value = nullptr;
int flag;
if(smpi_type_attr_get(type, keyval, &value, &flag)==MPI_SUCCESS){
int ret = elem->delete_fn(type, keyval, value, &flag);
return ret;
}
}
- if(type->attributes==NULL)
+ if(type->attributes==nullptr)
return MPI_ERR_ARG;
xbt_dict_remove_ext(type->attributes, reinterpret_cast<const char*>(&keyval), sizeof(int));
int smpi_type_attr_get(MPI_Datatype type, int keyval, void* attr_value, int* flag){
smpi_type_key_elem elem =
static_cast<smpi_type_key_elem>(xbt_dict_get_or_null_ext(smpi_type_keyvals, reinterpret_cast<const char*>(&keyval), sizeof(int)));
- if(!elem)
+ if(elem==nullptr)
return MPI_ERR_ARG;
- xbt_ex_t ex;
- if(type->attributes==NULL){
+ if(type->attributes==nullptr){
*flag=0;
return MPI_SUCCESS;
}
- TRY {
+ try {
*static_cast<void**>(attr_value) = xbt_dict_get_ext(type->attributes, reinterpret_cast<const char*>(&keyval), sizeof(int));
*flag=1;
}
- CATCH(ex) {
+ catch (xbt_ex& 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();
+ if(smpi_type_keyvals==nullptr)
+ smpi_type_keyvals = xbt_dict_new();
smpi_type_key_elem elem =
static_cast<smpi_type_key_elem>(xbt_dict_get_or_null_ext(smpi_type_keyvals, reinterpret_cast<const char*>(&keyval), sizeof(int)));
- if(elem==NULL)
+ if(elem==nullptr)
return MPI_ERR_ARG;
int flag;
- void* value;
+ void* value = nullptr;
smpi_type_attr_get(type, keyval, &value, &flag);
- if(flag && elem->delete_fn!=MPI_NULL_DELETE_FN){
+ if(flag!=0 && 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)
+ if(type->attributes==nullptr)
type->attributes=xbt_dict_new();
- xbt_dict_set_ext(type->attributes, reinterpret_cast<const char*>(&keyval), sizeof(int), attr_value, NULL);
+ xbt_dict_set_ext(type->attributes, reinterpret_cast<const char*>(&keyval), sizeof(int), attr_value, nullptr);
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();
+ if(smpi_type_keyvals==nullptr)
+ 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->delete_fn=delete_fn;
*keyval = type_keyval_id;
- xbt_dict_set_ext(smpi_type_keyvals,reinterpret_cast<const char*>(keyval), sizeof(int),reinterpret_cast<void*>(value), NULL);
+ xbt_dict_set_ext(smpi_type_keyvals,reinterpret_cast<const char*>(keyval), sizeof(int),reinterpret_cast<void*>(value), nullptr);
type_keyval_id++;
return MPI_SUCCESS;
}
int smpi_type_keyval_free(int* keyval){
smpi_type_key_elem elem =
static_cast<smpi_type_key_elem>(xbt_dict_get_or_null_ext(smpi_type_keyvals, reinterpret_cast<const char*>(keyval), sizeof(int)));
- if(!elem){
+ if(elem==0){
return MPI_ERR_ARG;
}
xbt_dict_remove_ext(smpi_type_keyvals, reinterpret_cast<const char*>(keyval), sizeof(int));
