-/* smpi_mpi_dt.c -- MPI primitives to handle datatypes */
-/* FIXME: a very incomplete implementation */
-
+/* smpi_mpi_dt.c -- MPI primitives to handle datatypes */
/* Copyright (c) 2009-2015. The SimGrid Team.
* All rights reserved. */
#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)");
-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) \
static s_smpi_mpi_datatype_t mpi_##name = { \
(char*) # name, \
sizeof(type), /* size */ \
- 0, /*was 1 has_subtype*/ \
+ 0, /*was 1 sizeof_substruct*/ \
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;
static s_smpi_mpi_datatype_t mpi_##name = { \
(char*) # name, \
0, /* size */ \
- 0, /* was 1 has_subtype*/ \
+ 0, /* was 1 sizeof_substruct*/ \
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;
CREATE_MPI_DATATYPE(MPI_PTR, void*);
/** Check if the datatype is usable for communications */
-int is_datatype_valid(MPI_Datatype datatype) {
- return datatype != MPI_DATATYPE_NULL && (datatype->flags & DT_FLAG_COMMITED);
+bool is_datatype_valid(MPI_Datatype datatype) {
+ return datatype != MPI_DATATYPE_NULL && ((datatype->flags & DT_FLAG_COMMITED) != 0);
}
size_t smpi_datatype_size(MPI_Datatype datatype)
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_new(s_smpi_mpi_struct_t,1);
- memcpy((*new_t)->substruct, datatype->substruct, sizeof(s_smpi_mpi_struct_t));
+ (*new_t)->in_use=1;
+ (*new_t)->flags &= ~DT_FLAG_PREDEFINED;
+ if (datatype->sizeof_substruct){
+ (*new_t)->substruct=xbt_malloc(datatype->sizeof_substruct);
+ memcpy((*new_t)->substruct, datatype->substruct, datatype->sizeof_substruct);
}
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;
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, (const char*)key, sizeof(int)));
- if(elem && elem->copy_fn!=MPI_NULL_COPY_FN){
- ret = elem->copy_fn(datatype, *key, NULL, value_in, &value_out, &flag );
+ 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, (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_get_name(MPI_Datatype datatype, char* name, int* length){
*length = strlen(datatype->name);
- strcpy(name, datatype->name);
+ strncpy(name, datatype->name, *length+1);
}
void smpi_datatype_set_name(MPI_Datatype datatype, char* name){
- datatype->name = xbt_strdup(name);;
+ if(datatype->name!=nullptr && (datatype->flags & DT_FLAG_PREDEFINED) == 0)
+ xbt_free(datatype->name);
+ datatype->name = xbt_strdup(name);
}
int smpi_datatype_copy(void *sendbuf, int sendcount, MPI_Datatype sendtype,
recvcount *= smpi_datatype_size(recvtype);
count = sendcount < recvcount ? sendcount : recvcount;
- if(sendtype->has_subtype == 0 && recvtype->has_subtype == 0) {
- if(!smpi_process_get_replaying()) memcpy(recvbuf, sendbuf, count);
+ if(sendtype->sizeof_substruct == 0 && recvtype->sizeof_substruct == 0) {
+ if(!smpi_process_get_replaying())
+ memcpy(recvbuf, sendbuf, count);
}
- else if (sendtype->has_subtype == 0)
+ else if (sendtype->sizeof_substruct == 0)
{
s_smpi_subtype_t *subtype = static_cast<s_smpi_subtype_t*>(recvtype->substruct);
subtype->unserialize( sendbuf, recvbuf, recvcount/smpi_datatype_size(recvtype), subtype, MPI_REPLACE);
}
- else if (recvtype->has_subtype == 0)
+ else if (recvtype->sizeof_substruct == 0)
{
s_smpi_subtype_t *subtype = static_cast<s_smpi_subtype_t*>(sendtype->substruct);
subtype->serialize(sendbuf, recvbuf, sendcount/smpi_datatype_size(sendtype), subtype);
subtype = static_cast<s_smpi_subtype_t*>(recvtype->substruct);
subtype->unserialize( buf_tmp, recvbuf,count/smpi_datatype_size(recvtype), subtype, MPI_REPLACE);
- free(buf_tmp);
+ xbt_free(buf_tmp);
}
}
* 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 serialize_vector( const void *noncontiguous_vector, void *contiguous_vector, int count, void *type)
{
- s_smpi_mpi_vector_t* type_c = (s_smpi_mpi_vector_t*)type;
+ s_smpi_mpi_vector_t* type_c = reinterpret_cast<s_smpi_mpi_vector_t*>(type);
int i;
- char* contiguous_vector_char = (char*)contiguous_vector;
- char* noncontiguous_vector_char = (char*)noncontiguous_vector;
+ char* contiguous_vector_char = static_cast<char*>(contiguous_vector);
+ const char* noncontiguous_vector_char = static_cast<const char*>(noncontiguous_vector);
for (i = 0; i < type_c->block_count * count; i++) {
- if (type_c->old_type->has_subtype == 0)
+ if (type_c->old_type->sizeof_substruct == 0)
memcpy(contiguous_vector_char, noncontiguous_vector_char, type_c->block_length * type_c->size_oldtype);
else
- ((s_smpi_subtype_t*)type_c->old_type->substruct)->serialize( noncontiguous_vector_char,
+ static_cast<s_smpi_subtype_t*>(type_c->old_type->substruct)->serialize( noncontiguous_vector_char,
contiguous_vector_char,
type_c->block_length, type_c->old_type->substruct);
*/
void unserialize_vector( const void *contiguous_vector, void *noncontiguous_vector, int count, void *type, MPI_Op op)
{
- s_smpi_mpi_vector_t* type_c = (s_smpi_mpi_vector_t*)type;
+ s_smpi_mpi_vector_t* type_c = reinterpret_cast<s_smpi_mpi_vector_t*>(type);
int i;
- char* contiguous_vector_char = (char*)contiguous_vector;
- char* noncontiguous_vector_char = (char*)noncontiguous_vector;
+ const char* contiguous_vector_char = static_cast<const char*>(contiguous_vector);
+ char* noncontiguous_vector_char = static_cast<char*>(noncontiguous_vector);
for (i = 0; i < type_c->block_count * count; i++) {
- if (type_c->old_type->has_subtype == 0)
+ if (type_c->old_type->sizeof_substruct == 0)
smpi_op_apply(op, contiguous_vector_char, noncontiguous_vector_char, &type_c->block_length,
&type_c->old_type);
- /* memcpy(noncontiguous_vector_char,
- contiguous_vector_char, type_c->block_length * type_c->size_oldtype);*/
else
- ((s_smpi_subtype_t*)type_c->old_type->substruct)->unserialize(contiguous_vector_char, noncontiguous_vector_char,
+ static_cast<s_smpi_subtype_t*>(type_c->old_type->substruct)->unserialize(contiguous_vector_char, noncontiguous_vector_char,
type_c->block_length,type_c->old_type->substruct,
op);
contiguous_vector_char += type_c->block_length*type_c->size_oldtype;
new_t->base.serialize = &serialize_vector;
new_t->base.unserialize = &unserialize_vector;
new_t->base.subtype_free = &free_vector;
+ new_t->base.subtype_use = &use_vector;
new_t->block_stride = block_stride;
new_t->block_length = block_length;
new_t->block_count = block_count;
return new_t;
}
-void smpi_datatype_create(MPI_Datatype* new_type, int size,int lb, int ub, int has_subtype, void *struct_type,
+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->has_subtype = size>0? has_subtype:0;
+ new_t->sizeof_substruct = size>0? sizeof_substruct:0;
new_t->lb = lb;
new_t->ub = ub;
new_t->flags = flags;
new_t->substruct = struct_type;
- new_t->in_use=0;
- new_t->attributes=NULL;
+ new_t->in_use=1;
+ new_t->attributes=nullptr;
*new_type = new_t;
-#ifdef HAVE_MC
+#if HAVE_MC
if(MC_is_active())
MC_ignore(&(new_t->in_use), sizeof(new_t->in_use));
#endif
void smpi_datatype_free(MPI_Datatype* type){
xbt_assert((*type)->in_use >= 0);
- if((*type)->attributes !=NULL){
- xbt_dict_cursor_t cursor = NULL;
+
+ if((*type)->flags & DT_FLAG_PREDEFINED)
+ return;
+
+ //if still used, mark for deletion
+ if((*type)->in_use!=0){
+ (*type)->flags |=DT_FLAG_DESTROYED;
+ return;
+ }
+
+ 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, (const char*)key, sizeof(int)));
- if(elem && elem->delete_fn)
+ 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->delete_fn!=nullptr)
elem->delete_fn(*type,*key, value, &flag);
}
+ xbt_dict_free(&(*type)->attributes);
}
- if((*type)->flags & DT_FLAG_PREDEFINED)return;
-
- //if still used, mark for deletion
- if((*type)->in_use!=0){
- (*type)->flags |=DT_FLAG_DESTROYED;
- return;
- }
-
- if ((*type)->has_subtype == 1){
- ((s_smpi_subtype_t *)(*type)->substruct)->subtype_free(type);
+ if ((*type)->sizeof_substruct != 0){
+ //((s_smpi_subtype_t *)(*type)->substruct)->subtype_free(type);
xbt_free((*type)->substruct);
}
- if ((*type)->name != NULL){
- xbt_free((*type)->name);
- }
+ xbt_free((*type)->name);
xbt_free(*type);
*type = MPI_DATATYPE_NULL;
}
void smpi_datatype_use(MPI_Datatype type){
- if(type)type->in_use++;
-#ifdef HAVE_MC
+ if(type != MPI_DATATYPE_NULL)
+ type->in_use++;
+
+ if(type->sizeof_substruct!=0){
+ static_cast<s_smpi_subtype_t *>((type)->substruct)->subtype_use(&type);
+ }
+#if HAVE_MC
if(MC_is_active())
MC_ignore(&(type->in_use), sizeof(type->in_use));
#endif
if (type->in_use > 0)
type->in_use--;
- if(type && type->in_use == 0 && (type->flags & DT_FLAG_DESTROYED))
- smpi_datatype_free(&type);
+ if(type->sizeof_substruct!=0){
+ static_cast<s_smpi_subtype_t *>((type)->substruct)->subtype_free(&type);
+ }
-#ifdef HAVE_MC
+ if(type != MPI_DATATYPE_NULL && type->in_use == 0){
+ smpi_datatype_free(&type);
+ }
+#if HAVE_MC
if(MC_is_active())
MC_ignore(&(type->in_use), sizeof(type->in_use));
#endif
*/
void serialize_contiguous( const void *noncontiguous_hvector, void *contiguous_hvector, int count, void *type)
{
- s_smpi_mpi_contiguous_t* type_c = (s_smpi_mpi_contiguous_t*)type;
- char* contiguous_vector_char = (char*)contiguous_hvector;
- char* noncontiguous_vector_char = (char*)noncontiguous_hvector+type_c->lb;
+ s_smpi_mpi_contiguous_t* type_c = reinterpret_cast<s_smpi_mpi_contiguous_t*>(type);
+ char* contiguous_vector_char = static_cast<char*>(contiguous_hvector);
+ const char* noncontiguous_vector_char = static_cast<const char*>(noncontiguous_hvector)+type_c->lb;
memcpy(contiguous_vector_char, noncontiguous_vector_char, count* type_c->block_count * type_c->size_oldtype);
}
/* Copies contiguous data into noncontiguous memory.
*/
void unserialize_contiguous(const void *contiguous_vector, void *noncontiguous_vector, int count, void *type, MPI_Op op)
{
- s_smpi_mpi_contiguous_t* type_c = (s_smpi_mpi_contiguous_t*)type;
- char* contiguous_vector_char = (char*)contiguous_vector;
- char* noncontiguous_vector_char = (char*)noncontiguous_vector+type_c->lb;
+ s_smpi_mpi_contiguous_t* type_c = reinterpret_cast<s_smpi_mpi_contiguous_t*>(type);
+ const char* contiguous_vector_char = static_cast<const char*>(contiguous_vector);
+ char* noncontiguous_vector_char = static_cast<char*>(noncontiguous_vector)+type_c->lb;
int n= count* type_c->block_count;
smpi_op_apply(op, contiguous_vector_char, noncontiguous_vector_char, &n, &type_c->old_type);
- /*memcpy(noncontiguous_vector_char, contiguous_vector_char, count* type_c->block_count * type_c->size_oldtype);*/
}
void free_contiguous(MPI_Datatype* d){
- smpi_datatype_unuse(((s_smpi_mpi_indexed_t *)(*d)->substruct)->old_type);
+ smpi_datatype_unuse(reinterpret_cast<s_smpi_mpi_contiguous_t*>((*d)->substruct)->old_type);
+}
+
+void use_contiguous(MPI_Datatype* d){
+ smpi_datatype_use(reinterpret_cast<s_smpi_mpi_contiguous_t*>((*d)->substruct)->old_type);
}
/* 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 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;
new_t->base.subtype_free = &free_contiguous;
+ new_t->base.subtype_use = &use_contiguous;
new_t->lb = lb;
new_t->block_count = block_count;
new_t->old_type = old_type;
+ smpi_datatype_use(old_type);
new_t->size_oldtype = size_oldtype;
smpi_datatype_use(old_type);
return new_t;
int smpi_datatype_contiguous(int count, MPI_Datatype old_type, MPI_Datatype* new_type, MPI_Aint lb)
{
int retval;
- if(old_type->has_subtype){
+ if(old_type->sizeof_substruct){
//handle this case as a hvector with stride equals to the extent of the datatype
return smpi_datatype_hvector(count, 1, smpi_datatype_get_extent(old_type), old_type, new_type);
}
s_smpi_mpi_contiguous_t* subtype = smpi_datatype_contiguous_create( lb, count, old_type,smpi_datatype_size(old_type));
smpi_datatype_create(new_type, count * smpi_datatype_size(old_type),lb,lb + count * smpi_datatype_size(old_type),
- 1,subtype, DT_FLAG_CONTIGUOUS);
+ sizeof(s_smpi_mpi_contiguous_t),subtype, DT_FLAG_CONTIGUOUS);
retval=MPI_SUCCESS;
return retval;
}
int smpi_datatype_vector(int count, int blocklen, int stride, MPI_Datatype old_type, MPI_Datatype* new_type)
{
int retval;
- if (blocklen<0) return MPI_ERR_ARG;
+ if (blocklen<0)
+ return MPI_ERR_ARG;
MPI_Aint lb = 0;
MPI_Aint ub = 0;
if(count>0){
lb=smpi_datatype_lb(old_type);
ub=((count-1)*stride+blocklen-1)*smpi_datatype_get_extent(old_type)+smpi_datatype_ub(old_type);
}
- if(old_type->has_subtype || stride != blocklen){
+ if(old_type->sizeof_substruct != 0 || stride != blocklen){
s_smpi_mpi_vector_t* subtype = smpi_datatype_vector_create(stride, blocklen, count, old_type,
smpi_datatype_size(old_type));
- smpi_datatype_create(new_type, count * (blocklen) * smpi_datatype_size(old_type), lb, ub, 1, subtype,
+ smpi_datatype_create(new_type, count * (blocklen) * smpi_datatype_size(old_type), lb, ub, sizeof(s_smpi_mpi_vector_t), subtype,
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;
}
void free_vector(MPI_Datatype* d){
- smpi_datatype_unuse(((s_smpi_mpi_indexed_t *)(*d)->substruct)->old_type);
+ smpi_datatype_unuse(reinterpret_cast<s_smpi_mpi_indexed_t*>((*d)->substruct)->old_type);
+}
+
+void use_vector(MPI_Datatype* d){
+ smpi_datatype_use(reinterpret_cast<s_smpi_mpi_indexed_t*>((*d)->substruct)->old_type);
}
/* Hvector Implementation - Vector with stride in bytes */
*/
void serialize_hvector( const void *noncontiguous_hvector, void *contiguous_hvector, int count, void *type)
{
- s_smpi_mpi_hvector_t* type_c = (s_smpi_mpi_hvector_t*)type;
+ s_smpi_mpi_hvector_t* type_c = reinterpret_cast<s_smpi_mpi_hvector_t*>(type);
int i;
- char* contiguous_vector_char = (char*)contiguous_hvector;
- char* noncontiguous_vector_char = (char*)noncontiguous_hvector;
+ char* contiguous_vector_char = static_cast<char*>(contiguous_hvector);
+ const char* noncontiguous_vector_char = static_cast<const char*>(noncontiguous_hvector);
for (i = 0; i < type_c->block_count * count; i++) {
- if (type_c->old_type->has_subtype == 0)
+ if (type_c->old_type->sizeof_substruct == 0)
memcpy(contiguous_vector_char, noncontiguous_vector_char, type_c->block_length * type_c->size_oldtype);
else
- ((s_smpi_subtype_t*)type_c->old_type->substruct)->serialize( noncontiguous_vector_char,
+ static_cast<s_smpi_subtype_t*>(type_c->old_type->substruct)->serialize( noncontiguous_vector_char,
contiguous_vector_char,
type_c->block_length, type_c->old_type->substruct);
*/
void unserialize_hvector( const void *contiguous_vector, void *noncontiguous_vector, int count, void *type, MPI_Op op)
{
- s_smpi_mpi_hvector_t* type_c = (s_smpi_mpi_hvector_t*)type;
+ s_smpi_mpi_hvector_t* type_c = reinterpret_cast<s_smpi_mpi_hvector_t*>(type);
int i;
- char* contiguous_vector_char = (char*)contiguous_vector;
- char* noncontiguous_vector_char = (char*)noncontiguous_vector;
+ const char* contiguous_vector_char = static_cast<const char*>(contiguous_vector);
+ char* noncontiguous_vector_char = static_cast<char*>(noncontiguous_vector);
for (i = 0; i < type_c->block_count * count; i++) {
- if (type_c->old_type->has_subtype == 0)
+ if (type_c->old_type->sizeof_substruct == 0)
smpi_op_apply(op, contiguous_vector_char, noncontiguous_vector_char, &type_c->block_length, &type_c->old_type);
- /*memcpy(noncontiguous_vector_char,
- contiguous_vector_char, type_c->block_length * type_c->size_oldtype);*/
else
- ((s_smpi_subtype_t*)type_c->old_type->substruct)->unserialize( contiguous_vector_char, noncontiguous_vector_char,
+ static_cast<s_smpi_subtype_t*>(type_c->old_type->substruct)->unserialize( contiguous_vector_char, noncontiguous_vector_char,
type_c->block_length, type_c->old_type->substruct,
op);
contiguous_vector_char += type_c->block_length*type_c->size_oldtype;
new_t->base.serialize = &serialize_hvector;
new_t->base.unserialize = &unserialize_hvector;
new_t->base.subtype_free = &free_hvector;
+ new_t->base.subtype_use = &use_hvector;
new_t->block_stride = block_stride;
new_t->block_length = block_length;
new_t->block_count = block_count;
//do nothing for vector types
void free_hvector(MPI_Datatype* d){
- smpi_datatype_unuse(((s_smpi_mpi_indexed_t *)(*d)->substruct)->old_type);
+ smpi_datatype_unuse(reinterpret_cast<s_smpi_mpi_hvector_t*>((*d)->substruct)->old_type);
+}
+
+void use_hvector(MPI_Datatype* d){
+ smpi_datatype_use(reinterpret_cast<s_smpi_mpi_hvector_t*>((*d)->substruct)->old_type);
}
int smpi_datatype_hvector(int count, int blocklen, MPI_Aint stride, MPI_Datatype old_type, MPI_Datatype* new_type)
{
int retval;
- if (blocklen<0) return MPI_ERR_ARG;
+ if (blocklen<0)
+ return MPI_ERR_ARG;
MPI_Aint lb = 0;
MPI_Aint ub = 0;
if(count>0){
lb=smpi_datatype_lb(old_type);
ub=((count-1)*stride)+(blocklen-1)*smpi_datatype_get_extent(old_type)+smpi_datatype_ub(old_type);
}
- if(old_type->has_subtype || stride != blocklen*smpi_datatype_get_extent(old_type)){
+ if(old_type->sizeof_substruct != 0 || stride != blocklen*smpi_datatype_get_extent(old_type)){
s_smpi_mpi_hvector_t* subtype = smpi_datatype_hvector_create( stride, blocklen, count, old_type,
smpi_datatype_size(old_type));
- smpi_datatype_create(new_type, count * blocklen * smpi_datatype_size(old_type), lb,ub, 1, subtype, DT_FLAG_VECTOR);
+ smpi_datatype_create(new_type, count * blocklen * smpi_datatype_size(old_type), lb,ub, sizeof(s_smpi_mpi_hvector_t), subtype, DT_FLAG_VECTOR);
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;
*/
void serialize_indexed( const void *noncontiguous_indexed, void *contiguous_indexed, int count, void *type)
{
- s_smpi_mpi_indexed_t* type_c = (s_smpi_mpi_indexed_t*)type;
+ s_smpi_mpi_indexed_t* type_c = reinterpret_cast<s_smpi_mpi_indexed_t*>(type);
int i,j;
- char* contiguous_indexed_char = (char*)contiguous_indexed;
- char* noncontiguous_indexed_char = (char*)noncontiguous_indexed+type_c->block_indices[0] * type_c->size_oldtype;
+ char* contiguous_indexed_char = static_cast<char*>(contiguous_indexed);
+ const char* noncontiguous_indexed_char = static_cast<const char*>(noncontiguous_indexed)+type_c->block_indices[0] * type_c->size_oldtype;
for(j=0; j<count;j++){
for (i = 0; i < type_c->block_count; i++) {
- if (type_c->old_type->has_subtype == 0)
+ if (type_c->old_type->sizeof_substruct == 0)
memcpy(contiguous_indexed_char, noncontiguous_indexed_char, type_c->block_lengths[i] * type_c->size_oldtype);
else
- ((s_smpi_subtype_t*)type_c->old_type->substruct)->serialize( noncontiguous_indexed_char,
+ static_cast<s_smpi_subtype_t*>(type_c->old_type->substruct)->serialize( noncontiguous_indexed_char,
contiguous_indexed_char,
type_c->block_lengths[i],
type_c->old_type->substruct);
contiguous_indexed_char += type_c->block_lengths[i]*type_c->size_oldtype;
if (i<type_c->block_count-1)
noncontiguous_indexed_char =
- (char*)noncontiguous_indexed + type_c->block_indices[i+1]*smpi_datatype_get_extent(type_c->old_type);
+ static_cast<const char*>(noncontiguous_indexed) + type_c->block_indices[i+1]*smpi_datatype_get_extent(type_c->old_type);
else
noncontiguous_indexed_char += type_c->block_lengths[i]*smpi_datatype_get_extent(type_c->old_type);
}
- noncontiguous_indexed=(void*)noncontiguous_indexed_char;
+ noncontiguous_indexed=static_cast<const void*>(noncontiguous_indexed_char);
}
}
/* Copies contiguous data into noncontiguous memory.
*/
void unserialize_indexed( const void *contiguous_indexed, void *noncontiguous_indexed, int count, void *type, MPI_Op op)
{
- s_smpi_mpi_indexed_t* type_c = (s_smpi_mpi_indexed_t*)type;
+ s_smpi_mpi_indexed_t* type_c = reinterpret_cast<s_smpi_mpi_indexed_t*>(type);
int i,j;
- char* contiguous_indexed_char = (char*)contiguous_indexed;
+ const char* contiguous_indexed_char = static_cast<const char*>(contiguous_indexed);
char* noncontiguous_indexed_char =
- (char*)noncontiguous_indexed+type_c->block_indices[0]*smpi_datatype_get_extent(type_c->old_type);
+ static_cast<char*>(noncontiguous_indexed)+type_c->block_indices[0]*smpi_datatype_get_extent(type_c->old_type);
for(j=0; j<count;j++){
for (i = 0; i < type_c->block_count; i++) {
- if (type_c->old_type->has_subtype == 0)
+ if (type_c->old_type->sizeof_substruct == 0)
smpi_op_apply(op, contiguous_indexed_char, noncontiguous_indexed_char, &type_c->block_lengths[i],
&type_c->old_type);
- /*memcpy(noncontiguous_indexed_char ,
- contiguous_indexed_char, type_c->block_lengths[i] * type_c->size_oldtype);*/
else
- ((s_smpi_subtype_t*)type_c->old_type->substruct)->unserialize( contiguous_indexed_char,
+ static_cast<s_smpi_subtype_t*>(type_c->old_type->substruct)->unserialize( contiguous_indexed_char,
noncontiguous_indexed_char,
type_c->block_lengths[i],
type_c->old_type->substruct, op);
contiguous_indexed_char += type_c->block_lengths[i]*type_c->size_oldtype;
if (i<type_c->block_count-1)
noncontiguous_indexed_char =
- (char*)noncontiguous_indexed + type_c->block_indices[i+1]*smpi_datatype_get_extent(type_c->old_type);
+ static_cast<char*>(noncontiguous_indexed) + type_c->block_indices[i+1]*smpi_datatype_get_extent(type_c->old_type);
else
noncontiguous_indexed_char += type_c->block_lengths[i]*smpi_datatype_get_extent(type_c->old_type);
}
- noncontiguous_indexed=(void*)noncontiguous_indexed_char;
+ noncontiguous_indexed=static_cast<void*>(noncontiguous_indexed_char);
}
}
void free_indexed(MPI_Datatype* type){
- xbt_free(((s_smpi_mpi_indexed_t *)(*type)->substruct)->block_lengths);
- xbt_free(((s_smpi_mpi_indexed_t *)(*type)->substruct)->block_indices);
- smpi_datatype_unuse(((s_smpi_mpi_indexed_t *)(*type)->substruct)->old_type);
+ if((*type)->in_use==0){
+ xbt_free(reinterpret_cast<s_smpi_mpi_indexed_t*>((*type)->substruct)->block_lengths);
+ xbt_free(reinterpret_cast<s_smpi_mpi_indexed_t*>((*type)->substruct)->block_indices);
+ }
+ smpi_datatype_unuse(reinterpret_cast<s_smpi_mpi_indexed_t*>((*type)->substruct)->old_type);
+}
+
+void use_indexed(MPI_Datatype* type){
+ smpi_datatype_use(reinterpret_cast<s_smpi_mpi_indexed_t*>((*type)->substruct)->old_type);
}
+
/* Create a Sub type indexed to be able to serialize and unserialize it the structure s_smpi_mpi_indexed_t is derived
* from s_smpi_subtype which required the functions unserialize and serialize */
s_smpi_mpi_indexed_t* smpi_datatype_indexed_create( int* block_lengths, int* block_indices, int block_count,
new_t->base.serialize = &serialize_indexed;
new_t->base.unserialize = &unserialize_indexed;
new_t->base.subtype_free = &free_indexed;
- //TODO : add a custom function for each time to clean these
+ new_t->base.subtype_use = &use_indexed;
new_t->block_lengths= xbt_new(int, block_count);
new_t->block_indices= xbt_new(int, block_count);
int i;
int i;
int retval;
int size = 0;
- int contiguous=1;
+ bool contiguous=true;
MPI_Aint lb = 0;
MPI_Aint ub = 0;
if(count>0){
if(indices[i]*smpi_datatype_get_extent(old_type)+blocklens[i]*smpi_datatype_ub(old_type)>ub)
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;
+ if ( (i< count -1) && (indices[i]+blocklens[i] != indices[i+1]) )
+ contiguous=false;
}
- if (old_type->has_subtype == 1)
- contiguous=0;
+ if (old_type->sizeof_substruct != 0)
+ contiguous=false;
if(!contiguous){
s_smpi_mpi_indexed_t* subtype = smpi_datatype_indexed_create( blocklens, indices, count, old_type,
smpi_datatype_size(old_type));
- smpi_datatype_create(new_type, size * smpi_datatype_size(old_type),lb,ub,1, subtype, DT_FLAG_DATA);
+ smpi_datatype_create(new_type, size * smpi_datatype_size(old_type),lb,ub,sizeof(s_smpi_mpi_indexed_t), subtype, DT_FLAG_DATA);
}else{
s_smpi_mpi_contiguous_t* subtype = smpi_datatype_contiguous_create( lb, size, old_type,
smpi_datatype_size(old_type));
- smpi_datatype_create(new_type, size * smpi_datatype_size(old_type), lb, ub, 1, subtype,
+ smpi_datatype_create(new_type, size * smpi_datatype_size(old_type), lb, ub, sizeof(s_smpi_mpi_contiguous_t), subtype,
DT_FLAG_DATA|DT_FLAG_CONTIGUOUS);
}
retval=MPI_SUCCESS;
*/
void serialize_hindexed( const void *noncontiguous_hindexed, void *contiguous_hindexed, int count, void *type)
{
- s_smpi_mpi_hindexed_t* type_c = (s_smpi_mpi_hindexed_t*)type;
+ s_smpi_mpi_hindexed_t* type_c = reinterpret_cast<s_smpi_mpi_hindexed_t*>(type);
int i,j;
- char* contiguous_hindexed_char = (char*)contiguous_hindexed;
- char* noncontiguous_hindexed_char = (char*)noncontiguous_hindexed+ type_c->block_indices[0];
+ char* contiguous_hindexed_char = static_cast<char*>(contiguous_hindexed);
+ const char* noncontiguous_hindexed_char = static_cast<const char*>(noncontiguous_hindexed)+ type_c->block_indices[0];
for(j=0; j<count;j++){
for (i = 0; i < type_c->block_count; i++) {
- if (type_c->old_type->has_subtype == 0)
+ if (type_c->old_type->sizeof_substruct == 0)
memcpy(contiguous_hindexed_char, noncontiguous_hindexed_char, type_c->block_lengths[i] * type_c->size_oldtype);
else
- ((s_smpi_subtype_t*)type_c->old_type->substruct)->serialize( noncontiguous_hindexed_char,
+ static_cast<s_smpi_subtype_t*>(type_c->old_type->substruct)->serialize( noncontiguous_hindexed_char,
contiguous_hindexed_char,
type_c->block_lengths[i],
type_c->old_type->substruct);
contiguous_hindexed_char += type_c->block_lengths[i]*type_c->size_oldtype;
if (i<type_c->block_count-1)
- noncontiguous_hindexed_char = (char*)noncontiguous_hindexed + type_c->block_indices[i+1];
+ noncontiguous_hindexed_char = static_cast<const char*>(noncontiguous_hindexed) + type_c->block_indices[i+1];
else
noncontiguous_hindexed_char += type_c->block_lengths[i]*smpi_datatype_get_extent(type_c->old_type);
}
- noncontiguous_hindexed=(void*)noncontiguous_hindexed_char;
+ noncontiguous_hindexed=reinterpret_cast<const void*>(noncontiguous_hindexed_char);
}
}
/* Copies contiguous data into noncontiguous memory.
void unserialize_hindexed( const void *contiguous_hindexed, void *noncontiguous_hindexed, int count, void *type,
MPI_Op op)
{
- s_smpi_mpi_hindexed_t* type_c = (s_smpi_mpi_hindexed_t*)type;
+ s_smpi_mpi_hindexed_t* type_c = reinterpret_cast<s_smpi_mpi_hindexed_t*>(type);
int i,j;
- char* contiguous_hindexed_char = (char*)contiguous_hindexed;
- char* noncontiguous_hindexed_char = (char*)noncontiguous_hindexed+ type_c->block_indices[0];
+ const char* contiguous_hindexed_char = static_cast<const char*>(contiguous_hindexed);
+ char* noncontiguous_hindexed_char = static_cast<char*>(noncontiguous_hindexed)+ type_c->block_indices[0];
for(j=0; j<count;j++){
for (i = 0; i < type_c->block_count; i++) {
- if (type_c->old_type->has_subtype == 0)
+ if (type_c->old_type->sizeof_substruct == 0)
smpi_op_apply(op, contiguous_hindexed_char, noncontiguous_hindexed_char, &type_c->block_lengths[i],
&type_c->old_type);
- /*memcpy(noncontiguous_hindexed_char,contiguous_hindexed_char,type_c->block_lengths[i]*type_c->size_oldtype);*/
else
- ((s_smpi_subtype_t*)type_c->old_type->substruct)->unserialize( contiguous_hindexed_char,
+ static_cast<s_smpi_subtype_t*>(type_c->old_type->substruct)->unserialize( contiguous_hindexed_char,
noncontiguous_hindexed_char,
type_c->block_lengths[i],
type_c->old_type->substruct, op);
contiguous_hindexed_char += type_c->block_lengths[i]*type_c->size_oldtype;
if (i<type_c->block_count-1)
- noncontiguous_hindexed_char = (char*)noncontiguous_hindexed + type_c->block_indices[i+1];
+ noncontiguous_hindexed_char = static_cast<char*>(noncontiguous_hindexed) + type_c->block_indices[i+1];
else
noncontiguous_hindexed_char += type_c->block_lengths[i]*smpi_datatype_get_extent(type_c->old_type);
}
- noncontiguous_hindexed=(void*)noncontiguous_hindexed_char;
+ noncontiguous_hindexed=reinterpret_cast<void*>(noncontiguous_hindexed_char);
}
}
void free_hindexed(MPI_Datatype* type){
- xbt_free(((s_smpi_mpi_hindexed_t *)(*type)->substruct)->block_lengths);
- xbt_free(((s_smpi_mpi_hindexed_t *)(*type)->substruct)->block_indices);
- smpi_datatype_unuse(((s_smpi_mpi_indexed_t *)(*type)->substruct)->old_type);
+ if((*type)->in_use==0){
+ xbt_free(reinterpret_cast<s_smpi_mpi_hindexed_t*>((*type)->substruct)->block_lengths);
+ xbt_free(reinterpret_cast<s_smpi_mpi_hindexed_t*>((*type)->substruct)->block_indices);
+ }
+ smpi_datatype_unuse(reinterpret_cast<s_smpi_mpi_hindexed_t*>((*type)->substruct)->old_type);
+}
+
+void use_hindexed(MPI_Datatype* type){
+ smpi_datatype_use(reinterpret_cast<s_smpi_mpi_hindexed_t*>((*type)->substruct)->old_type);
}
/* Create a Sub type hindexed to be able to serialize and unserialize it the structure s_smpi_mpi_hindexed_t is derived
new_t->base.serialize = &serialize_hindexed;
new_t->base.unserialize = &unserialize_hindexed;
new_t->base.subtype_free = &free_hindexed;
- //TODO : add a custom function for each time to clean these
+ 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];
}
new_t->block_count = block_count;
new_t->old_type = old_type;
+ smpi_datatype_use(old_type);
new_t->size_oldtype = size_oldtype;
return new_t;
}
int i;
int retval;
int size = 0;
- int contiguous=1;
+ bool contiguous=true;
MPI_Aint lb = 0;
MPI_Aint ub = 0;
if(count>0){
return MPI_ERR_ARG;
size += blocklens[i];
- if(indices[i]+smpi_datatype_lb(old_type)<lb) lb = indices[i]+smpi_datatype_lb(old_type);
- if(indices[i]+blocklens[i]*smpi_datatype_ub(old_type)>ub) ub = indices[i]+blocklens[i]*smpi_datatype_ub(old_type);
+ if(indices[i]+smpi_datatype_lb(old_type)<lb)
+ lb = indices[i]+smpi_datatype_lb(old_type);
+ if(indices[i]+blocklens[i]*smpi_datatype_ub(old_type)>ub)
+ 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;
+ if ( (i< count -1) && (indices[i]+blocklens[i]*(static_cast<int>(smpi_datatype_size(old_type))) != indices[i+1]) )
+ contiguous=false;
}
- if (old_type->has_subtype == 1 || lb!=0)
- contiguous=0;
+ if (old_type->sizeof_substruct != 0 || lb!=0)
+ contiguous=false;
if(!contiguous){
s_smpi_mpi_hindexed_t* subtype = smpi_datatype_hindexed_create( blocklens, indices, count, old_type,
smpi_datatype_size(old_type));
- smpi_datatype_create(new_type, size * smpi_datatype_size(old_type), lb, ub ,1, subtype, DT_FLAG_DATA);
+ smpi_datatype_create(new_type, size * smpi_datatype_size(old_type), lb, ub ,sizeof(s_smpi_mpi_hindexed_t), subtype, DT_FLAG_DATA);
}else{
s_smpi_mpi_contiguous_t* subtype = smpi_datatype_contiguous_create(lb,size, old_type, smpi_datatype_size(old_type));
smpi_datatype_create(new_type, size * smpi_datatype_size(old_type), 0,size * smpi_datatype_size(old_type),
*/
void serialize_struct( const void *noncontiguous_struct, void *contiguous_struct, int count, void *type)
{
- s_smpi_mpi_struct_t* type_c = (s_smpi_mpi_struct_t*)type;
+ s_smpi_mpi_struct_t* type_c = reinterpret_cast<s_smpi_mpi_struct_t*>(type);
int i,j;
- char* contiguous_struct_char = (char*)contiguous_struct;
- char* noncontiguous_struct_char = (char*)noncontiguous_struct+ type_c->block_indices[0];
+ char* contiguous_struct_char = static_cast<char*>(contiguous_struct);
+ const char* noncontiguous_struct_char = static_cast<const char*>(noncontiguous_struct)+ type_c->block_indices[0];
for(j=0; j<count;j++){
for (i = 0; i < type_c->block_count; i++) {
- if (type_c->old_types[i]->has_subtype == 0)
+ if (type_c->old_types[i]->sizeof_substruct == 0)
memcpy(contiguous_struct_char, noncontiguous_struct_char,
type_c->block_lengths[i] * smpi_datatype_size(type_c->old_types[i]));
else
- ((s_smpi_subtype_t*)type_c->old_types[i]->substruct)->serialize( noncontiguous_struct_char,
+ static_cast<s_smpi_subtype_t*>(type_c->old_types[i]->substruct)->serialize( noncontiguous_struct_char,
contiguous_struct_char,
type_c->block_lengths[i],
type_c->old_types[i]->substruct);
contiguous_struct_char += type_c->block_lengths[i]*smpi_datatype_size(type_c->old_types[i]);
if (i<type_c->block_count-1)
- noncontiguous_struct_char = (char*)noncontiguous_struct + type_c->block_indices[i+1];
+ noncontiguous_struct_char = static_cast<const char*>(noncontiguous_struct) + type_c->block_indices[i+1];
else //let's hope this is MPI_UB ?
noncontiguous_struct_char += type_c->block_lengths[i]*smpi_datatype_get_extent(type_c->old_types[i]);
}
- noncontiguous_struct=(void*)noncontiguous_struct_char;
+ noncontiguous_struct=reinterpret_cast<const void*>(noncontiguous_struct_char);
}
}
*/
void unserialize_struct( const void *contiguous_struct, void *noncontiguous_struct, int count, void *type, MPI_Op op)
{
- s_smpi_mpi_struct_t* type_c = (s_smpi_mpi_struct_t*)type;
+ s_smpi_mpi_struct_t* type_c = reinterpret_cast<s_smpi_mpi_struct_t*>(type);
int i,j;
- char* contiguous_struct_char = (char*)contiguous_struct;
- char* noncontiguous_struct_char = (char*)noncontiguous_struct+ type_c->block_indices[0];
+ const char* contiguous_struct_char = static_cast<const char*>(contiguous_struct);
+ char* noncontiguous_struct_char = static_cast<char*>(noncontiguous_struct)+ type_c->block_indices[0];
for(j=0; j<count;j++){
for (i = 0; i < type_c->block_count; i++) {
- if (type_c->old_types[i]->has_subtype == 0)
+ if (type_c->old_types[i]->sizeof_substruct == 0)
smpi_op_apply(op, contiguous_struct_char, noncontiguous_struct_char, &type_c->block_lengths[i],
& type_c->old_types[i]);
- /*memcpy(noncontiguous_struct_char,
- contiguous_struct_char, type_c->block_lengths[i] * smpi_datatype_size(type_c->old_types[i]));*/
else
- ((s_smpi_subtype_t*)type_c->old_types[i]->substruct)->unserialize( contiguous_struct_char,
+ static_cast<s_smpi_subtype_t*>(type_c->old_types[i]->substruct)->unserialize( contiguous_struct_char,
noncontiguous_struct_char,
type_c->block_lengths[i],
type_c->old_types[i]->substruct, op);
contiguous_struct_char += type_c->block_lengths[i]*smpi_datatype_size(type_c->old_types[i]);
if (i<type_c->block_count-1)
- noncontiguous_struct_char = (char*)noncontiguous_struct + type_c->block_indices[i+1];
+ noncontiguous_struct_char = static_cast<char*>(noncontiguous_struct) + type_c->block_indices[i+1];
else
noncontiguous_struct_char += type_c->block_lengths[i]*smpi_datatype_get_extent(type_c->old_types[i]);
}
- noncontiguous_struct=(void*)noncontiguous_struct_char;
+ noncontiguous_struct=reinterpret_cast<void*>(noncontiguous_struct_char);
}
}
void free_struct(MPI_Datatype* type){
- xbt_free(((s_smpi_mpi_struct_t *)(*type)->substruct)->block_lengths);
- xbt_free(((s_smpi_mpi_struct_t *)(*type)->substruct)->block_indices);
int i=0;
- for (i = 0; i < ((s_smpi_mpi_struct_t *)(*type)->substruct)->block_count; i++)
- smpi_datatype_unuse(((s_smpi_mpi_struct_t *)(*type)->substruct)->old_types[i]);
- xbt_free(((s_smpi_mpi_struct_t *)(*type)->substruct)->old_types);
+ for (i = 0; i < reinterpret_cast<s_smpi_mpi_struct_t*>((*type)->substruct)->block_count; i++)
+ smpi_datatype_unuse(reinterpret_cast<s_smpi_mpi_struct_t*>((*type)->substruct)->old_types[i]);
+ if((*type)->in_use==0){
+ xbt_free(reinterpret_cast<s_smpi_mpi_struct_t*>((*type)->substruct)->block_lengths);
+ xbt_free(reinterpret_cast<s_smpi_mpi_struct_t*>((*type)->substruct)->block_indices);
+ xbt_free(reinterpret_cast<s_smpi_mpi_struct_t*>((*type)->substruct)->old_types);
+ }
+}
+
+void use_struct(MPI_Datatype* type){
+ int i=0;
+ for (i = 0; i < reinterpret_cast<s_smpi_mpi_struct_t*>((*type)->substruct)->block_count; i++)
+ smpi_datatype_use(reinterpret_cast<s_smpi_mpi_struct_t*>((*type)->substruct)->old_types[i]);
}
/* Create a Sub type struct to be able to serialize and unserialize it the structure s_smpi_mpi_struct_t is derived
new_t->base.serialize = &serialize_struct;
new_t->base.unserialize = &unserialize_struct;
new_t->base.subtype_free = &free_struct;
- //TODO : add a custom function for each time to clean these
+ new_t->base.subtype_use = &use_struct;
new_t->block_lengths= xbt_new(int, block_count);
new_t->block_indices= xbt_new(MPI_Aint, block_count);
new_t->old_types= xbt_new(MPI_Datatype, block_count);
new_t->old_types[i]=old_types[i];
smpi_datatype_use(new_t->old_types[i]);
}
- //new_t->block_lengths = block_lengths;
- //new_t->block_indices = block_indices;
new_t->block_count = block_count;
- //new_t->old_types = old_types;
return new_t;
}
{
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]->has_subtype == 1)
- contiguous=0;
+ if (old_types[i]->sizeof_substruct != 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) lb = indices[i];
+ if(!forced_lb && indices[i]+smpi_datatype_lb(old_types[i])<lb)
+ lb = indices[i];
if(!forced_ub && indices[i]+blocklens[i]*smpi_datatype_ub(old_types[i])>ub)
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){
s_smpi_mpi_struct_t* subtype = smpi_datatype_struct_create( blocklens, indices, count, old_types);
- smpi_datatype_create(new_type, size, lb, ub,1, subtype, DT_FLAG_DATA);
+ smpi_datatype_create(new_type, size, lb, ub,sizeof(s_smpi_mpi_struct_t), subtype, DT_FLAG_DATA);
}else{
s_smpi_mpi_contiguous_t* subtype = smpi_datatype_contiguous_create( lb, size, MPI_CHAR, 1);
smpi_datatype_create(new_type, size, lb, ub,1, subtype, DT_FLAG_DATA|DT_FLAG_CONTIGUOUS);
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)
static void max_func(void *a, void *b, int *length, MPI_Datatype * datatype)
{
if (*datatype == MPI_CHAR) {
- APPLY_FUNC(a, b, length, char, MAX_OP);
+ APPLY_FUNC(a, b, length, char, MAX_OP)
} else if (*datatype == MPI_SHORT) {
- APPLY_FUNC(a, b, length, short, MAX_OP);
+ APPLY_FUNC(a, b, length, short, MAX_OP)
} else if (*datatype == MPI_INT) {
- APPLY_FUNC(a, b, length, int, MAX_OP);
+ APPLY_FUNC(a, b, length, int, MAX_OP)
} else if (*datatype == MPI_LONG) {
- APPLY_FUNC(a, b, length, long, MAX_OP);
+ APPLY_FUNC(a, b, length, long, MAX_OP)
} else if (*datatype == MPI_UNSIGNED_SHORT) {
- APPLY_FUNC(a, b, length, unsigned short, MAX_OP);
+ APPLY_FUNC(a, b, length, unsigned short, MAX_OP)
} else if (*datatype == MPI_UNSIGNED) {
- APPLY_FUNC(a, b, length, unsigned int, MAX_OP);
+ APPLY_FUNC(a, b, length, unsigned int, MAX_OP)
} else if (*datatype == MPI_UNSIGNED_LONG) {
- APPLY_FUNC(a, b, length, unsigned long, MAX_OP);
+ APPLY_FUNC(a, b, length, unsigned long, MAX_OP)
} else if (*datatype == MPI_UNSIGNED_CHAR) {
- APPLY_FUNC(a, b, length, unsigned char, MAX_OP);
+ APPLY_FUNC(a, b, length, unsigned char, MAX_OP)
} else if (*datatype == MPI_FLOAT) {
- APPLY_FUNC(a, b, length, float, MAX_OP);
+ APPLY_FUNC(a, b, length, float, MAX_OP)
} else if (*datatype == MPI_DOUBLE) {
- APPLY_FUNC(a, b, length, double, MAX_OP);
+ APPLY_FUNC(a, b, length, double, MAX_OP)
} else if (*datatype == MPI_LONG_DOUBLE) {
- APPLY_FUNC(a, b, length, long double, MAX_OP);
+ APPLY_FUNC(a, b, length, long double, MAX_OP)
+ } else {
+ xbt_die("Failed to apply MAX_OP to type %s", (*datatype)->name);
}
}
static void min_func(void *a, void *b, int *length, MPI_Datatype * datatype)
{
if (*datatype == MPI_CHAR) {
- APPLY_FUNC(a, b, length, char, MIN_OP);
+ APPLY_FUNC(a, b, length, char, MIN_OP)
} else if (*datatype == MPI_SHORT) {
- APPLY_FUNC(a, b, length, short, MIN_OP);
+ APPLY_FUNC(a, b, length, short, MIN_OP)
} else if (*datatype == MPI_INT) {
- APPLY_FUNC(a, b, length, int, MIN_OP);
+ APPLY_FUNC(a, b, length, int, MIN_OP)
} else if (*datatype == MPI_LONG) {
- APPLY_FUNC(a, b, length, long, MIN_OP);
+ APPLY_FUNC(a, b, length, long, MIN_OP)
} else if (*datatype == MPI_UNSIGNED_SHORT) {
- APPLY_FUNC(a, b, length, unsigned short, MIN_OP);
+ APPLY_FUNC(a, b, length, unsigned short, MIN_OP)
} else if (*datatype == MPI_UNSIGNED) {
- APPLY_FUNC(a, b, length, unsigned int, MIN_OP);
+ APPLY_FUNC(a, b, length, unsigned int, MIN_OP)
} else if (*datatype == MPI_UNSIGNED_LONG) {
- APPLY_FUNC(a, b, length, unsigned long, MIN_OP);
+ APPLY_FUNC(a, b, length, unsigned long, MIN_OP)
} else if (*datatype == MPI_UNSIGNED_CHAR) {
- APPLY_FUNC(a, b, length, unsigned char, MIN_OP);
+ APPLY_FUNC(a, b, length, unsigned char, MIN_OP)
} else if (*datatype == MPI_FLOAT) {
- APPLY_FUNC(a, b, length, float, MIN_OP);
+ APPLY_FUNC(a, b, length, float, MIN_OP)
} else if (*datatype == MPI_DOUBLE) {
- APPLY_FUNC(a, b, length, double, MIN_OP);
+ APPLY_FUNC(a, b, length, double, MIN_OP)
} else if (*datatype == MPI_LONG_DOUBLE) {
- APPLY_FUNC(a, b, length, long double, MIN_OP);
+ APPLY_FUNC(a, b, length, long double, MIN_OP)
+ } else {
+ xbt_die("Failed to apply MIN_OP to type %s", (*datatype)->name);
}
}
static void sum_func(void *a, void *b, int *length, MPI_Datatype * datatype)
{
if (*datatype == MPI_CHAR) {
- APPLY_FUNC(a, b, length, char, SUM_OP);
+ APPLY_FUNC(a, b, length, char, SUM_OP)
} else if (*datatype == MPI_SHORT) {
- APPLY_FUNC(a, b, length, short, SUM_OP);
+ APPLY_FUNC(a, b, length, short, SUM_OP)
} else if (*datatype == MPI_INT) {
- APPLY_FUNC(a, b, length, int, SUM_OP);
+ APPLY_FUNC(a, b, length, int, SUM_OP)
} else if (*datatype == MPI_LONG) {
- APPLY_FUNC(a, b, length, long, SUM_OP);
+ APPLY_FUNC(a, b, length, long, SUM_OP)
} else if (*datatype == MPI_UNSIGNED_SHORT) {
- APPLY_FUNC(a, b, length, unsigned short, SUM_OP);
+ APPLY_FUNC(a, b, length, unsigned short, SUM_OP)
} else if (*datatype == MPI_UNSIGNED) {
- APPLY_FUNC(a, b, length, unsigned int, SUM_OP);
+ APPLY_FUNC(a, b, length, unsigned int, SUM_OP)
} else if (*datatype == MPI_UNSIGNED_LONG) {
- APPLY_FUNC(a, b, length, unsigned long, SUM_OP);
+ APPLY_FUNC(a, b, length, unsigned long, SUM_OP)
} else if (*datatype == MPI_UNSIGNED_CHAR) {
- APPLY_FUNC(a, b, length, unsigned char, SUM_OP);
+ APPLY_FUNC(a, b, length, unsigned char, SUM_OP)
} else if (*datatype == MPI_FLOAT) {
- APPLY_FUNC(a, b, length, float, SUM_OP);
+ APPLY_FUNC(a, b, length, float, SUM_OP)
} else if (*datatype == MPI_DOUBLE) {
- APPLY_FUNC(a, b, length, double, SUM_OP);
+ APPLY_FUNC(a, b, length, double, SUM_OP)
} else if (*datatype == MPI_LONG_DOUBLE) {
- APPLY_FUNC(a, b, length, long double, SUM_OP);
+ APPLY_FUNC(a, b, length, long double, SUM_OP)
} else if (*datatype == MPI_C_FLOAT_COMPLEX) {
- APPLY_FUNC(a, b, length, float _Complex, SUM_OP);
+ APPLY_FUNC(a, b, length, float _Complex, SUM_OP)
} else if (*datatype == MPI_C_DOUBLE_COMPLEX) {
- APPLY_FUNC(a, b, length, double _Complex, SUM_OP);
+ APPLY_FUNC(a, b, length, double _Complex, SUM_OP)
} else if (*datatype == MPI_C_LONG_DOUBLE_COMPLEX) {
- APPLY_FUNC(a, b, length, long double _Complex, SUM_OP);
+ APPLY_FUNC(a, b, length, long double _Complex, SUM_OP)
+ } else {
+ xbt_die("Failed to apply SUM_OP to type %s", (*datatype)->name);
}
}
static void prod_func(void *a, void *b, int *length, MPI_Datatype * datatype)
{
if (*datatype == MPI_CHAR) {
- APPLY_FUNC(a, b, length, char, PROD_OP);
+ APPLY_FUNC(a, b, length, char, PROD_OP)
} else if (*datatype == MPI_SHORT) {
- APPLY_FUNC(a, b, length, short, PROD_OP);
+ APPLY_FUNC(a, b, length, short, PROD_OP)
} else if (*datatype == MPI_INT) {
- APPLY_FUNC(a, b, length, int, PROD_OP);
+ APPLY_FUNC(a, b, length, int, PROD_OP)
} else if (*datatype == MPI_LONG) {
- APPLY_FUNC(a, b, length, long, PROD_OP);
+ APPLY_FUNC(a, b, length, long, PROD_OP)
} else if (*datatype == MPI_UNSIGNED_SHORT) {
- APPLY_FUNC(a, b, length, unsigned short, PROD_OP);
+ APPLY_FUNC(a, b, length, unsigned short, PROD_OP)
} else if (*datatype == MPI_UNSIGNED) {
- APPLY_FUNC(a, b, length, unsigned int, PROD_OP);
+ APPLY_FUNC(a, b, length, unsigned int, PROD_OP)
} else if (*datatype == MPI_UNSIGNED_LONG) {
- APPLY_FUNC(a, b, length, unsigned long, PROD_OP);
+ APPLY_FUNC(a, b, length, unsigned long, PROD_OP)
} else if (*datatype == MPI_UNSIGNED_CHAR) {
- APPLY_FUNC(a, b, length, unsigned char, PROD_OP);
+ APPLY_FUNC(a, b, length, unsigned char, PROD_OP)
} else if (*datatype == MPI_FLOAT) {
- APPLY_FUNC(a, b, length, float, PROD_OP);
+ APPLY_FUNC(a, b, length, float, PROD_OP)
} else if (*datatype == MPI_DOUBLE) {
- APPLY_FUNC(a, b, length, double, PROD_OP);
+ APPLY_FUNC(a, b, length, double, PROD_OP)
} else if (*datatype == MPI_LONG_DOUBLE) {
- APPLY_FUNC(a, b, length, long double, PROD_OP);
+ APPLY_FUNC(a, b, length, long double, PROD_OP)
} else if (*datatype == MPI_C_FLOAT_COMPLEX) {
- APPLY_FUNC(a, b, length, float _Complex, PROD_OP);
+ APPLY_FUNC(a, b, length, float _Complex, PROD_OP)
} else if (*datatype == MPI_C_DOUBLE_COMPLEX) {
- APPLY_FUNC(a, b, length, double _Complex, PROD_OP);
+ APPLY_FUNC(a, b, length, double _Complex, PROD_OP)
} else if (*datatype == MPI_C_LONG_DOUBLE_COMPLEX) {
- APPLY_FUNC(a, b, length, long double _Complex, PROD_OP);
+ APPLY_FUNC(a, b, length, long double _Complex, PROD_OP)
+ } else {
+ xbt_die("Failed to apply PROD_OP to type %s", (*datatype)->name);
}
}
static void land_func(void *a, void *b, int *length, MPI_Datatype * datatype)
{
if (*datatype == MPI_CHAR) {
- APPLY_FUNC(a, b, length, char, LAND_OP);
+ APPLY_FUNC(a, b, length, char, LAND_OP)
} else if (*datatype == MPI_SHORT) {
- APPLY_FUNC(a, b, length, short, LAND_OP);
+ APPLY_FUNC(a, b, length, short, LAND_OP)
} else if (*datatype == MPI_INT) {
- APPLY_FUNC(a, b, length, int, LAND_OP);
+ APPLY_FUNC(a, b, length, int, LAND_OP)
} else if (*datatype == MPI_LONG) {
- APPLY_FUNC(a, b, length, long, LAND_OP);
+ APPLY_FUNC(a, b, length, long, LAND_OP)
} else if (*datatype == MPI_UNSIGNED_SHORT) {
- APPLY_FUNC(a, b, length, unsigned short, LAND_OP);
+ APPLY_FUNC(a, b, length, unsigned short, LAND_OP)
} else if (*datatype == MPI_UNSIGNED) {
- APPLY_FUNC(a, b, length, unsigned int, LAND_OP);
+ APPLY_FUNC(a, b, length, unsigned int, LAND_OP)
} else if (*datatype == MPI_UNSIGNED_LONG) {
- APPLY_FUNC(a, b, length, unsigned long, LAND_OP);
+ APPLY_FUNC(a, b, length, unsigned long, LAND_OP)
} else if (*datatype == MPI_UNSIGNED_CHAR) {
- APPLY_FUNC(a, b, length, unsigned char, LAND_OP);
+ APPLY_FUNC(a, b, length, unsigned char, LAND_OP)
} else if (*datatype == MPI_C_BOOL) {
- APPLY_FUNC(a, b, length, bool, LAND_OP);
+ APPLY_FUNC(a, b, length, bool, LAND_OP)
+ } else {
+ xbt_die("Failed to apply LAND_OP to type %s", (*datatype)->name);
}
}
static void lor_func(void *a, void *b, int *length, MPI_Datatype * datatype)
{
if (*datatype == MPI_CHAR) {
- APPLY_FUNC(a, b, length, char, LOR_OP);
+ APPLY_FUNC(a, b, length, char, LOR_OP)
} else if (*datatype == MPI_SHORT) {
- APPLY_FUNC(a, b, length, short, LOR_OP);
+ APPLY_FUNC(a, b, length, short, LOR_OP)
} else if (*datatype == MPI_INT) {
- APPLY_FUNC(a, b, length, int, LOR_OP);
+ APPLY_FUNC(a, b, length, int, LOR_OP)
} else if (*datatype == MPI_LONG) {
- APPLY_FUNC(a, b, length, long, LOR_OP);
+ APPLY_FUNC(a, b, length, long, LOR_OP)
} else if (*datatype == MPI_UNSIGNED_SHORT) {
- APPLY_FUNC(a, b, length, unsigned short, LOR_OP);
+ APPLY_FUNC(a, b, length, unsigned short, LOR_OP)
} else if (*datatype == MPI_UNSIGNED) {
- APPLY_FUNC(a, b, length, unsigned int, LOR_OP);
+ APPLY_FUNC(a, b, length, unsigned int, LOR_OP)
} else if (*datatype == MPI_UNSIGNED_LONG) {
- APPLY_FUNC(a, b, length, unsigned long, LOR_OP);
+ APPLY_FUNC(a, b, length, unsigned long, LOR_OP)
} else if (*datatype == MPI_UNSIGNED_CHAR) {
- APPLY_FUNC(a, b, length, unsigned char, LOR_OP);
+ APPLY_FUNC(a, b, length, unsigned char, LOR_OP)
} else if (*datatype == MPI_C_BOOL) {
- APPLY_FUNC(a, b, length, bool, LOR_OP);
+ APPLY_FUNC(a, b, length, bool, LOR_OP)
+ } else {
+ xbt_die("Failed to apply LOR_OP to type %s", (*datatype)->name);
}
}
static void lxor_func(void *a, void *b, int *length, MPI_Datatype * datatype)
{
if (*datatype == MPI_CHAR) {
- APPLY_FUNC(a, b, length, char, LXOR_OP);
+ APPLY_FUNC(a, b, length, char, LXOR_OP)
} else if (*datatype == MPI_SHORT) {
- APPLY_FUNC(a, b, length, short, LXOR_OP);
+ APPLY_FUNC(a, b, length, short, LXOR_OP)
} else if (*datatype == MPI_INT) {
- APPLY_FUNC(a, b, length, int, LXOR_OP);
+ APPLY_FUNC(a, b, length, int, LXOR_OP)
} else if (*datatype == MPI_LONG) {
- APPLY_FUNC(a, b, length, long, LXOR_OP);
+ APPLY_FUNC(a, b, length, long, LXOR_OP)
} else if (*datatype == MPI_UNSIGNED_SHORT) {
- APPLY_FUNC(a, b, length, unsigned short, LXOR_OP);
+ APPLY_FUNC(a, b, length, unsigned short, LXOR_OP)
} else if (*datatype == MPI_UNSIGNED) {
- APPLY_FUNC(a, b, length, unsigned int, LXOR_OP);
+ APPLY_FUNC(a, b, length, unsigned int, LXOR_OP)
} else if (*datatype == MPI_UNSIGNED_LONG) {
- APPLY_FUNC(a, b, length, unsigned long, LXOR_OP);
+ APPLY_FUNC(a, b, length, unsigned long, LXOR_OP)
} else if (*datatype == MPI_UNSIGNED_CHAR) {
- APPLY_FUNC(a, b, length, unsigned char, LXOR_OP);
+ APPLY_FUNC(a, b, length, unsigned char, LXOR_OP)
} else if (*datatype == MPI_C_BOOL) {
- APPLY_FUNC(a, b, length, bool, LXOR_OP);
+ APPLY_FUNC(a, b, length, bool, LXOR_OP)
+ } else {
+ xbt_die("Failed to apply LXOR_OP to type %s", (*datatype)->name);
}
}
static void band_func(void *a, void *b, int *length, MPI_Datatype * datatype)
{
if (*datatype == MPI_CHAR) {
- APPLY_FUNC(a, b, length, char, BAND_OP);
+ APPLY_FUNC(a, b, length, char, BAND_OP)
}else if (*datatype == MPI_SHORT) {
- APPLY_FUNC(a, b, length, short, BAND_OP);
+ APPLY_FUNC(a, b, length, short, BAND_OP)
} else if (*datatype == MPI_INT) {
- APPLY_FUNC(a, b, length, int, BAND_OP);
+ APPLY_FUNC(a, b, length, int, BAND_OP)
} else if (*datatype == MPI_LONG) {
- APPLY_FUNC(a, b, length, long, BAND_OP);
+ APPLY_FUNC(a, b, length, long, BAND_OP)
} else if (*datatype == MPI_UNSIGNED_SHORT) {
- APPLY_FUNC(a, b, length, unsigned short, BAND_OP);
+ APPLY_FUNC(a, b, length, unsigned short, BAND_OP)
} else if (*datatype == MPI_UNSIGNED) {
- APPLY_FUNC(a, b, length, unsigned int, BAND_OP);
+ APPLY_FUNC(a, b, length, unsigned int, BAND_OP)
} else if (*datatype == MPI_UNSIGNED_LONG) {
- APPLY_FUNC(a, b, length, unsigned long, BAND_OP);
+ APPLY_FUNC(a, b, length, unsigned long, BAND_OP)
} else if (*datatype == MPI_UNSIGNED_CHAR) {
- APPLY_FUNC(a, b, length, unsigned char, BAND_OP);
+ APPLY_FUNC(a, b, length, unsigned char, BAND_OP)
} else if (*datatype == MPI_BYTE) {
- APPLY_FUNC(a, b, length, uint8_t, BAND_OP);
+ APPLY_FUNC(a, b, length, uint8_t, BAND_OP)
+ } else {
+ xbt_die("Failed to apply BAND_OP to type %s", (*datatype)->name);
}
}
static void bor_func(void *a, void *b, int *length, MPI_Datatype * datatype)
{
if (*datatype == MPI_CHAR) {
- APPLY_FUNC(a, b, length, char, BOR_OP);
+ APPLY_FUNC(a, b, length, char, BOR_OP)
} else if (*datatype == MPI_SHORT) {
- APPLY_FUNC(a, b, length, short, BOR_OP);
+ APPLY_FUNC(a, b, length, short, BOR_OP)
} else if (*datatype == MPI_INT) {
- APPLY_FUNC(a, b, length, int, BOR_OP);
+ APPLY_FUNC(a, b, length, int, BOR_OP)
} else if (*datatype == MPI_LONG) {
- APPLY_FUNC(a, b, length, long, BOR_OP);
+ APPLY_FUNC(a, b, length, long, BOR_OP)
} else if (*datatype == MPI_UNSIGNED_SHORT) {
- APPLY_FUNC(a, b, length, unsigned short, BOR_OP);
+ APPLY_FUNC(a, b, length, unsigned short, BOR_OP)
} else if (*datatype == MPI_UNSIGNED) {
- APPLY_FUNC(a, b, length, unsigned int, BOR_OP);
+ APPLY_FUNC(a, b, length, unsigned int, BOR_OP)
} else if (*datatype == MPI_UNSIGNED_LONG) {
- APPLY_FUNC(a, b, length, unsigned long, BOR_OP);
+ APPLY_FUNC(a, b, length, unsigned long, BOR_OP)
} else if (*datatype == MPI_UNSIGNED_CHAR) {
- APPLY_FUNC(a, b, length, unsigned char, BOR_OP);
+ APPLY_FUNC(a, b, length, unsigned char, BOR_OP)
} else if (*datatype == MPI_BYTE) {
- APPLY_FUNC(a, b, length, uint8_t, BOR_OP);
+ APPLY_FUNC(a, b, length, uint8_t, BOR_OP)
+ } else {
+ xbt_die("Failed to apply BOR_OP to type %s", (*datatype)->name);
}
}
static void bxor_func(void *a, void *b, int *length, MPI_Datatype * datatype)
{
if (*datatype == MPI_CHAR) {
- APPLY_FUNC(a, b, length, char, BXOR_OP);
+ APPLY_FUNC(a, b, length, char, BXOR_OP)
} else if (*datatype == MPI_SHORT) {
- APPLY_FUNC(a, b, length, short, BXOR_OP);
+ APPLY_FUNC(a, b, length, short, BXOR_OP)
} else if (*datatype == MPI_INT) {
- APPLY_FUNC(a, b, length, int, BXOR_OP);
+ APPLY_FUNC(a, b, length, int, BXOR_OP)
} else if (*datatype == MPI_LONG) {
- APPLY_FUNC(a, b, length, long, BXOR_OP);
+ APPLY_FUNC(a, b, length, long, BXOR_OP)
} else if (*datatype == MPI_UNSIGNED_SHORT) {
- APPLY_FUNC(a, b, length, unsigned short, BXOR_OP);
+ APPLY_FUNC(a, b, length, unsigned short, BXOR_OP)
} else if (*datatype == MPI_UNSIGNED) {
- APPLY_FUNC(a, b, length, unsigned int, BXOR_OP);
+ APPLY_FUNC(a, b, length, unsigned int, BXOR_OP)
} else if (*datatype == MPI_UNSIGNED_LONG) {
- APPLY_FUNC(a, b, length, unsigned long, BXOR_OP);
+ APPLY_FUNC(a, b, length, unsigned long, BXOR_OP)
} else if (*datatype == MPI_UNSIGNED_CHAR) {
- APPLY_FUNC(a, b, length, unsigned char, BXOR_OP);
+ APPLY_FUNC(a, b, length, unsigned char, BXOR_OP)
} else if (*datatype == MPI_BYTE) {
- APPLY_FUNC(a, b, length, uint8_t, BXOR_OP);
+ APPLY_FUNC(a, b, length, uint8_t, BXOR_OP)
+ } else {
+ xbt_die("Failed to apply BXOR_OP to type %s", (*datatype)->name);
}
}
static void minloc_func(void *a, void *b, int *length, MPI_Datatype * datatype)
{
if (*datatype == MPI_FLOAT_INT) {
- APPLY_FUNC(a, b, length, float_int, MINLOC_OP);
+ APPLY_FUNC(a, b, length, float_int, MINLOC_OP)
} else if (*datatype == MPI_LONG_INT) {
- APPLY_FUNC(a, b, length, long_int, MINLOC_OP);
+ APPLY_FUNC(a, b, length, long_int, MINLOC_OP)
} else if (*datatype == MPI_DOUBLE_INT) {
- APPLY_FUNC(a, b, length, double_int, MINLOC_OP);
+ APPLY_FUNC(a, b, length, double_int, MINLOC_OP)
} else if (*datatype == MPI_SHORT_INT) {
- APPLY_FUNC(a, b, length, short_int, MINLOC_OP);
+ APPLY_FUNC(a, b, length, short_int, MINLOC_OP)
} else if (*datatype == MPI_2LONG) {
- APPLY_FUNC(a, b, length, long_long, MINLOC_OP);
+ APPLY_FUNC(a, b, length, long_long, MINLOC_OP)
} else if (*datatype == MPI_2INT) {
- APPLY_FUNC(a, b, length, int_int, MINLOC_OP);
+ APPLY_FUNC(a, b, length, int_int, MINLOC_OP)
} else if (*datatype == MPI_LONG_DOUBLE_INT) {
- APPLY_FUNC(a, b, length, long_double_int, MINLOC_OP);
+ APPLY_FUNC(a, b, length, long_double_int, MINLOC_OP)
} else if (*datatype == MPI_2FLOAT) {
- APPLY_FUNC(a, b, length, float_float, MINLOC_OP);
+ APPLY_FUNC(a, b, length, float_float, MINLOC_OP)
} else if (*datatype == MPI_2DOUBLE) {
- APPLY_FUNC(a, b, length, double_double, MINLOC_OP);
+ APPLY_FUNC(a, b, length, double_double, MINLOC_OP)
+ } else {
+ xbt_die("Failed to apply MINLOC_OP to type %s", (*datatype)->name);
}
}
static void maxloc_func(void *a, void *b, int *length, MPI_Datatype * datatype)
{
if (*datatype == MPI_FLOAT_INT) {
- APPLY_FUNC(a, b, length, float_int, MAXLOC_OP);
+ APPLY_FUNC(a, b, length, float_int, MAXLOC_OP)
} else if (*datatype == MPI_LONG_INT) {
- APPLY_FUNC(a, b, length, long_int, MAXLOC_OP);
+ APPLY_FUNC(a, b, length, long_int, MAXLOC_OP)
} else if (*datatype == MPI_DOUBLE_INT) {
- APPLY_FUNC(a, b, length, double_int, MAXLOC_OP);
+ APPLY_FUNC(a, b, length, double_int, MAXLOC_OP)
} else if (*datatype == MPI_SHORT_INT) {
- APPLY_FUNC(a, b, length, short_int, MAXLOC_OP);
+ APPLY_FUNC(a, b, length, short_int, MAXLOC_OP)
} else if (*datatype == MPI_2LONG) {
- APPLY_FUNC(a, b, length, long_long, MAXLOC_OP);
+ APPLY_FUNC(a, b, length, long_long, MAXLOC_OP)
} else if (*datatype == MPI_2INT) {
- APPLY_FUNC(a, b, length, int_int, MAXLOC_OP);
+ APPLY_FUNC(a, b, length, int_int, MAXLOC_OP)
} else if (*datatype == MPI_LONG_DOUBLE_INT) {
- APPLY_FUNC(a, b, length, long_double_int, MAXLOC_OP);
+ APPLY_FUNC(a, b, length, long_double_int, MAXLOC_OP)
} else if (*datatype == MPI_2FLOAT) {
- APPLY_FUNC(a, b, length, float_float, MAXLOC_OP);
+ APPLY_FUNC(a, b, length, float_float, MAXLOC_OP)
} else if (*datatype == MPI_2DOUBLE) {
- APPLY_FUNC(a, b, length, double_double, MAXLOC_OP);
+ APPLY_FUNC(a, b, length, double_double, MAXLOC_OP)
+ } else {
+ xbt_die("Failed to apply MAXLOC_OP to type %s", (*datatype)->name);
}
}
}
#define CREATE_MPI_OP(name, func) \
- static s_smpi_mpi_op_t mpi_##name = { &(func) /* func */, TRUE }; \
+ static s_smpi_mpi_op_t mpi_##name = { &(func) /* func */, true }; \
MPI_Op name = &mpi_##name;
CREATE_MPI_OP(MPI_MAX, max_func);
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)
xbt_free(op);
}
-void smpi_op_apply(MPI_Op op, void *invec, void *inoutvec, int *len, MPI_Datatype * datatype)
+void smpi_op_apply(MPI_Op op, const void *invec, void *inoutvec, int *len, MPI_Datatype * datatype)
{
if(op==MPI_OP_NULL)
return;
}
if(!smpi_process_get_replaying())
- op->func(invec, inoutvec, len, datatype);
+ op->func(const_cast<void*>(invec), inoutvec, len, datatype);
}
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, (const char*)&keyval, sizeof(int)));
- if(!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;
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);
- if(ret!=MPI_SUCCESS) return ret;
+ if(ret!=MPI_SUCCESS)
+ return ret;
}
}
- if(type->attributes==NULL)
+ if(type->attributes==nullptr)
return MPI_ERR_ARG;
- xbt_dict_remove_ext(type->attributes, (const char*)&keyval, sizeof(int));
+ xbt_dict_remove_ext(type->attributes, reinterpret_cast<const char*>(&keyval), sizeof(int));
return MPI_SUCCESS;
}
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, (const char*)&keyval, sizeof(int)));
- if(!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;
- xbt_ex_t ex;
- if(type->attributes==NULL){
+ if(type->attributes==nullptr){
*flag=0;
return MPI_SUCCESS;
}
- TRY {
- *(void**)attr_value = xbt_dict_get_ext(type->attributes, (const char*)&keyval, sizeof(int));
+ 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, (const char*)&keyval, sizeof(int)));
- if(!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 && 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(ret!=MPI_SUCCESS)
+ return ret;
}
- if(type->attributes==NULL)
+ if(type->attributes==nullptr)
type->attributes=xbt_dict_new();
- xbt_dict_set_ext(type->attributes, (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,(const char*)keyval, sizeof(int),(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, (const char*)keyval, sizeof(int)));
- if(!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==0){
return MPI_ERR_ARG;
}
- xbt_dict_remove_ext(smpi_type_keyvals, (const char*)keyval, sizeof(int));
+ xbt_dict_remove_ext(smpi_type_keyvals, reinterpret_cast<const char*>(keyval), sizeof(int));
xbt_free(elem);
return MPI_SUCCESS;
}
size_t size = smpi_datatype_size(type);
if (outcount - *position < incount*static_cast<int>(size))
return MPI_ERR_BUFFER;
- smpi_datatype_copy(inbuf, incount, type, (char*)outbuf + *position, outcount, MPI_CHAR);
+ smpi_datatype_copy(inbuf, incount, type, static_cast<char*>(outbuf) + *position, outcount, MPI_CHAR);
*position += incount * size;
return MPI_SUCCESS;
}
int size = static_cast<int>(smpi_datatype_size(type));
if (outcount*size> insize)
return MPI_ERR_BUFFER;
- smpi_datatype_copy((char*)inbuf + *position, insize, MPI_CHAR, outbuf, outcount, type);
+ smpi_datatype_copy(static_cast<char*>(inbuf) + *position, insize, MPI_CHAR, outbuf, outcount, type);
*position += outcount * size;
return MPI_SUCCESS;
}