#include "src/instr/instr_private.hpp"
#include "src/smpi/include/smpi_actor.hpp"
+#include <algorithm>
+#include <array>
+#include <functional>
#include <string>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_datatype, smpi, "Logging specific to SMPI (datatype)");
}
// for predefined types, so refcount_ = 0.
-Datatype::Datatype(char* name, int ident, int size, MPI_Aint lb, MPI_Aint ub, int flags)
+Datatype::Datatype(const char* name, int ident, int size, MPI_Aint lb, MPI_Aint ub, int flags)
: name_(name), id(std::to_string(ident)), size_(size), lb_(lb), ub_(ub), flags_(flags), refcount_(0)
{
id2type_lookup.insert({id, this});
Datatype::Datatype(Datatype* datatype, int* ret)
: size_(datatype->size_), lb_(datatype->lb_), ub_(datatype->ub_), flags_(datatype->flags_)
{
+ *ret = this->copy_attrs(datatype);
+}
+
+Datatype::~Datatype()
+{
+ xbt_assert(refcount_ >= 0);
+
+ if(flags_ & DT_FLAG_PREDEFINED)
+ return;
+
+ //if still used, mark for deletion
+ if(refcount_!=0){
+ flags_ |=DT_FLAG_DESTROYED;
+ return;
+ }
+
+ cleanup_attr<Datatype>();
+ delete contents_;
+}
+
+int Datatype::copy_attrs(Datatype* datatype){
flags_ &= ~DT_FLAG_PREDEFINED;
- *ret = MPI_SUCCESS;
+ int ret = MPI_SUCCESS;
if (not datatype->attributes()->empty()) {
int flag=0;
if (elem != nullptr){
if( elem->copy_fn.type_copy_fn != MPI_NULL_COPY_FN &&
elem->copy_fn.type_copy_fn != MPI_TYPE_DUP_FN)
- *ret = elem->copy_fn.type_copy_fn(datatype, it.first, elem->extra_state, it.second, &value_out, &flag);
+ ret = elem->copy_fn.type_copy_fn(datatype, it.first, elem->extra_state, it.second, &value_out, &flag);
else if ( elem->copy_fn.type_copy_fn_fort != MPI_NULL_COPY_FN &&
(*(int*)*elem->copy_fn.type_copy_fn_fort) != 1){
value_out=(int*)xbt_malloc(sizeof(int));
- elem->copy_fn.type_copy_fn_fort(datatype, it.first, elem->extra_state, it.second, value_out, &flag,ret);
+ elem->copy_fn.type_copy_fn_fort(datatype, it.first, elem->extra_state, it.second, value_out, &flag, &ret);
}
- if (*ret != MPI_SUCCESS) {
+ if (ret != MPI_SUCCESS) {
break;
}
if(elem->copy_fn.type_copy_fn == MPI_TYPE_DUP_FN ||
}
}
}
+ delete contents_;
contents_ = new Datatype_contents(MPI_COMBINER_DUP, 0, nullptr, 0, nullptr, 1, &datatype);
+ return ret;
}
-Datatype::~Datatype()
-{
- xbt_assert(refcount_ >= 0);
-
- if(flags_ & DT_FLAG_PREDEFINED)
- return;
-
- //if still used, mark for deletion
- if(refcount_!=0){
- flags_ |=DT_FLAG_DESTROYED;
- return;
- }
-
- cleanup_attr<Datatype>();
- delete contents_;
- xbt_free(name_);
+int Datatype::clone(MPI_Datatype* type){
+ int ret;
+ *type = new Datatype(this, &ret);
+ return ret;
}
void Datatype::ref()
flags_ |= DT_FLAG_COMMITED;
}
-bool Datatype::is_valid(){
+bool Datatype::is_valid() const
+{
return (flags_ & DT_FLAG_COMMITED);
}
-bool Datatype::is_basic()
+bool Datatype::is_basic() const
{
return (flags_ & DT_FLAG_BASIC);
}
-bool Datatype::is_replayable()
+bool Datatype::is_replayable() const
{
return (simgrid::instr::trace_format == simgrid::instr::TraceFormat::Ti) &&
((this == MPI_BYTE) || (this == MPI_DOUBLE) || (this == MPI_INT) || (this == MPI_CHAR) ||
flags_ &= flag;
}
-int Datatype::extent(MPI_Aint * lb, MPI_Aint * extent){
+int Datatype::extent(MPI_Aint* lb, MPI_Aint* extent) const
+{
*lb = lb_;
*extent = ub_ - lb_;
return MPI_SUCCESS;
}
-void Datatype::get_name(char* name, int* length){
- if(name_!=nullptr){
- *length = strlen(name_);
- strncpy(name, name_, *length+1);
- }else{
- *length = 0;
+void Datatype::get_name(char* name, int* length) const
+{
+ *length = static_cast<int>(name_.length());
+ if (not name_.empty()) {
+ name_.copy(name, *length);
+ name[*length] = '\0';
}
}
-void Datatype::set_name(const char* name){
- if(name_!=nullptr && (flags_ & DT_FLAG_PREDEFINED) == 0)
- xbt_free(name_);
- name_ = xbt_strdup(name);
+void Datatype::set_name(const char* name)
+{
+ name_ = name;
}
int Datatype::pack(const void* inbuf, int incount, void* outbuf, int outcount, int* position, const Comm*)
return MPI_SUCCESS;
}
-int Datatype::get_contents (int max_integers, int max_addresses,
- int max_datatypes, int* array_of_integers, MPI_Aint* array_of_addresses,
- MPI_Datatype *array_of_datatypes)
+int Datatype::get_contents(int max_integers, int max_addresses, int max_datatypes, int* array_of_integers,
+ MPI_Aint* array_of_addresses, MPI_Datatype* array_of_datatypes) const
{
if(contents_==nullptr)
return MPI_ERR_ARG;
- if(max_integers<contents_->number_of_integers_)
+ if (static_cast<unsigned>(max_integers) < contents_->integers_.size())
return MPI_ERR_COUNT;
- for(int i=0; i<contents_->number_of_integers_; i++){
- array_of_integers[i]=contents_->integers_[i];
- }
- if(max_addresses<contents_->number_of_addresses_)
+ std::copy(begin(contents_->integers_), end(contents_->integers_), array_of_integers);
+ if (static_cast<unsigned>(max_addresses) < contents_->addresses_.size())
return MPI_ERR_COUNT;
- for(int i=0; i<contents_->number_of_addresses_; i++){
- array_of_addresses[i]=contents_->addresses_[i];
- }
- if(max_datatypes<contents_->number_of_datatypes_)
+ std::copy(begin(contents_->addresses_), end(contents_->addresses_), array_of_addresses);
+ if (static_cast<unsigned>(max_datatypes) < contents_->datatypes_.size())
return MPI_ERR_COUNT;
- for(int i=0; i<contents_->number_of_datatypes_; i++){
- array_of_datatypes[i]=contents_->datatypes_[i];
- contents_->datatypes_[i]->ref();
- }
+ std::copy(begin(contents_->datatypes_), end(contents_->datatypes_), array_of_datatypes);
+ std::for_each(begin(contents_->datatypes_), end(contents_->datatypes_), std::mem_fn(&Datatype::ref));
return MPI_SUCCESS;
}
-int Datatype::get_envelope (int* num_integers, int* num_addresses,
- int* num_datatypes, int* combiner)
+int Datatype::get_envelope(int* num_integers, int* num_addresses, int* num_datatypes, int* combiner) const
{
if(contents_==nullptr){
+ *num_integers = 0;
+ *num_addresses = 0;
+ *num_datatypes = 0;
*combiner = MPI_COMBINER_NAMED;
}else{
- *num_integers = contents_->number_of_integers_;
- *num_addresses = contents_->number_of_addresses_;
- *num_datatypes = contents_->number_of_datatypes_;
+ *num_integers = contents_->integers_.size();
+ *num_addresses = contents_->addresses_.size();
+ *num_datatypes = contents_->datatypes_.size();
*combiner = contents_->combiner_;
}
return MPI_SUCCESS;
int count = sendcount < recvcount ? sendcount : recvcount;
XBT_DEBUG("Copying %d bytes from %p to %p", count, sendbuf, recvbuf);
if (not(sendtype->flags() & DT_FLAG_DERIVED) && not(recvtype->flags() & DT_FLAG_DERIVED)) {
- if (not smpi_process()->replaying())
+ if (not smpi_process()->replaying() && count > 0)
memcpy(recvbuf, sendbuf, count);
} else if (not(sendtype->flags() & DT_FLAG_DERIVED)) {
recvtype->unserialize(sendbuf, recvbuf, count / recvtype->size(), MPI_REPLACE);
//Default serialization method : memcpy.
void Datatype::serialize(const void* noncontiguous_buf, void* contiguous_buf, int count)
{
- char* contiguous_buf_char = static_cast<char*>(contiguous_buf);
- const char* noncontiguous_buf_char = static_cast<const char*>(noncontiguous_buf)+lb_;
+ auto* contiguous_buf_char = static_cast<char*>(contiguous_buf);
+ const auto* noncontiguous_buf_char = static_cast<const char*>(noncontiguous_buf) + lb_;
memcpy(contiguous_buf_char, noncontiguous_buf_char, count*size_);
}
void Datatype::unserialize(const void* contiguous_buf, void *noncontiguous_buf, int count, MPI_Op op){
- const char* contiguous_buf_char = static_cast<const char*>(contiguous_buf);
- char* noncontiguous_buf_char = static_cast<char*>(noncontiguous_buf)+lb_;
+ const auto* contiguous_buf_char = static_cast<const char*>(contiguous_buf);
+ auto* noncontiguous_buf_char = static_cast<char*>(noncontiguous_buf) + lb_;
int n=count;
if(op!=MPI_OP_NULL)
op->apply( contiguous_buf_char, noncontiguous_buf_char, &n, this);
/* in this situation the data are contiguous thus it's not required to serialize and unserialize it*/
*new_type = new Datatype(count * block_length * old_type->size(), 0, ((count -1) * stride + block_length)*
old_type->size(), DT_FLAG_CONTIGUOUS);
- int ints[3] = {count, block_length, stride};
- (*new_type)->contents_ = new Datatype_contents(MPI_COMBINER_VECTOR, 3, ints, 0, nullptr, 1, &old_type);
+ const std::array<int, 3> ints = {{count, block_length, stride}};
+ (*new_type)->contents_ = new Datatype_contents(MPI_COMBINER_VECTOR, 3, ints.data(), 0, nullptr, 1, &old_type);
retval=MPI_SUCCESS;
}
return retval;
}else{
/* in this situation the data are contiguous thus it's not required to serialize and unserialize it*/
*new_type = new Datatype(count * block_length * old_type->size(), 0, count * block_length * old_type->size(), DT_FLAG_CONTIGUOUS);
- int ints[2] = {count, block_length};
- (*new_type)->contents_ = new Datatype_contents(MPI_COMBINER_HVECTOR, 2, ints, 1, &stride, 1, &old_type);
+ const std::array<int, 2> ints = {{count, block_length}};
+ (*new_type)->contents_ = new Datatype_contents(MPI_COMBINER_HVECTOR, 2, ints.data(), 1, &stride, 1, &old_type);
retval=MPI_SUCCESS;
}
return retval;
tmp = *newtype;
}
- MPI_Aint lbs[1] = {lb * extent};
- int sizes [1]={1};
+ const MPI_Aint lbs = lb * extent;
+ const int sizes = 1;
//handle LB and UB with a resized call
- create_hindexed( 1, sizes, lbs, tmp, newtype);
+ create_hindexed(1, &sizes, &lbs, tmp, newtype);
unref(tmp);
tmp = *newtype;
}
int Datatype::create_resized(MPI_Datatype oldtype,MPI_Aint lb, MPI_Aint extent, MPI_Datatype *newtype){
- int blocks[3] = {1, 1, 1};
- MPI_Aint disps[3] = {lb, 0, lb + extent};
- MPI_Datatype types[3] = {MPI_LB, oldtype, MPI_UB};
+ const std::array<int, 3> blocks = {{1, 1, 1}};
+ const std::array<MPI_Aint, 3> disps = {{lb, 0, lb + extent}};
+ const std::array<MPI_Datatype, 3> types = {{MPI_LB, oldtype, MPI_UB}};
- *newtype = new simgrid::smpi::Type_Struct(oldtype->size(), lb, lb + extent, DT_FLAG_DERIVED, 3, blocks, disps, types);
+ *newtype = new simgrid::smpi::Type_Struct(oldtype->size(), lb, lb + extent, DT_FLAG_DERIVED, 3, blocks.data(),
+ disps.data(), types.data());
(*newtype)->addflag(~DT_FLAG_COMMITED);
return MPI_SUCCESS;