#include "smpi_mpi_dt_private.h"
#include "mc/mc.h"
#include "xbt/replay.h"
+#include <xbt/ex.hpp>
#include "simgrid/modelchecker.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_mpi_dt, smpi, "Logging specific to SMPI (datatype)");
static s_smpi_mpi_datatype_t mpi_##name = { \
(char*) # name, \
sizeof(type), /* size */ \
- 0, /*was 1 sizeof_substruct*/ \
+ 0, /*was 1 sizeof_substruct*/ \
0, /* lb */ \
sizeof(type), /* ub = lb + size */ \
DT_FLAG_BASIC, /* flags */ \
- nullptr, /* attributes */ \
- nullptr, /* pointer on extended struct*/ \
+ nullptr, /* attributes */ \
+ nullptr, /* pointer on extended struct*/ \
0 /* in_use counter */ \
}; \
const MPI_Datatype name = &mpi_##name;
static s_smpi_mpi_datatype_t mpi_##name = { \
(char*) # name, \
0, /* size */ \
- 0, /* was 1 sizeof_substruct*/ \
+ 0, /* was 1 sizeof_substruct*/ \
0, /* lb */ \
0, /* ub = lb + size */ \
DT_FLAG_BASIC, /* flags */ \
- nullptr, /* attributes */ \
- nullptr, /* 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 !=nullptr){
- (*new_t)->attributes=xbt_dict_new();
- xbt_dict_cursor_t cursor = nullptr;
- int *key;
- int flag;
- void* value_in;
- void* value_out;
- 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 != 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;
- xbt_dict_cursor_free(&cursor);
- return ret;
- }
- if(flag)
- xbt_dict_set_ext((*new_t)->attributes, reinterpret_cast<const char*>(key), sizeof(int),value_out, nullptr);
+ (*new_t)->attributes = xbt_dict_new_homogeneous(nullptr);
+ xbt_dict_cursor_t cursor = nullptr;
+ int* key;
+ int flag;
+ void* value_in;
+ void* value_out;
+ 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 != 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;
+ xbt_dict_cursor_free(&cursor);
+ return ret;
}
+ if (flag)
+ xbt_dict_set_ext((*new_t)->attributes, reinterpret_cast<const char*>(key), sizeof(int), value_out, nullptr);
+ }
}
}
return ret;
* 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
#endif
}
-void smpi_datatype_unuse(MPI_Datatype type){
+void smpi_datatype_unuse(MPI_Datatype type)
+{
+ if (type == MPI_DATATYPE_NULL)
+ return;
+
if (type->in_use > 0)
type->in_use--;
static_cast<s_smpi_subtype_t *>((type)->substruct)->subtype_free(&type);
}
- if(type != MPI_DATATYPE_NULL && type->in_use == 0){
+ if (type->in_use == 0)
smpi_datatype_free(&type);
- }
+
#if HAVE_MC
if(MC_is_active())
MC_ignore(&(type->in_use), sizeof(type->in_use));
}
/* 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)
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, nullptr, DT_FLAG_VECTOR|DT_FLAG_CONTIGUOUS);
retval=MPI_SUCCESS;
new_t->base.subtype_use = &use_hindexed;
new_t->block_lengths= xbt_new(int, block_count);
new_t->block_indices= xbt_new(MPI_Aint, block_count);
- int i;
- for(i=0;i<block_count;i++){
+ for(int i=0;i<block_count;i++){
new_t->block_lengths[i]=block_lengths[i];
new_t->block_indices[i]=block_indices[i];
}
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);
static_cast<smpi_type_key_elem>(xbt_dict_get_or_null_ext(smpi_type_keyvals, reinterpret_cast<const char*>(&keyval), sizeof(int)));
if(elem==nullptr)
return MPI_ERR_ARG;
- xbt_ex_t ex;
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==nullptr)
- smpi_type_keyvals = xbt_dict_new();
+ smpi_type_keyvals = xbt_dict_new_homogeneous(nullptr);
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==nullptr)
return MPI_ERR_ARG;
int flag;
- void* value;
+ void* value = nullptr;
smpi_type_attr_get(type, keyval, &value, &flag);
if(flag!=0 && elem->delete_fn!=MPI_NULL_DELETE_FN){
int ret = elem->delete_fn(type, keyval, value, &flag);
return ret;
}
if(type->attributes==nullptr)
- type->attributes=xbt_dict_new();
+ type->attributes = xbt_dict_new_homogeneous(nullptr);
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==nullptr)
- smpi_type_keyvals = xbt_dict_new();
+ smpi_type_keyvals = xbt_dict_new_homogeneous(nullptr);
smpi_type_key_elem value = (smpi_type_key_elem) xbt_new0(s_smpi_mpi_type_key_elem_t,1);
