X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8d51848cefcf39dbe0072eacd5fc50765b8b4e37..fbcf6ab31cae1988be858f9f894dafe529c575d7:/src/smpi/mpi/smpi_datatype.cpp diff --git a/src/smpi/mpi/smpi_datatype.cpp b/src/smpi/mpi/smpi_datatype.cpp index 5136911deb..8cfb5508cf 100644 --- a/src/smpi/mpi/smpi_datatype.cpp +++ b/src/smpi/mpi/smpi_datatype.cpp @@ -1,5 +1,5 @@ /* smpi_datatype.cpp -- MPI primitives to handle datatypes */ -/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2019. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -8,6 +8,7 @@ #include "simgrid/modelchecker.h" #include "smpi_datatype_derived.hpp" #include "smpi_op.hpp" +#include "src/instr/instr_private.hpp" #include "src/smpi/include/smpi_actor.hpp" #include @@ -94,6 +95,8 @@ CREATE_MPI_DATATYPE_NULL(MPI_LB, 52); CREATE_MPI_DATATYPE(MPI_PACKED, 53, char); // Internal use only CREATE_MPI_DATATYPE(MPI_PTR, 54, void*); +CREATE_MPI_DATATYPE(MPI_COUNT, 55, long long); + namespace simgrid{ namespace smpi{ @@ -122,27 +125,37 @@ Datatype::Datatype(char* name, int ident, int size, MPI_Aint lb, MPI_Aint ub, in #endif } -Datatype::Datatype(Datatype *datatype, int* ret) : name_(nullptr), lb_(datatype->lb_), ub_(datatype->ub_), flags_(datatype->flags_), refcount_(1) +Datatype::Datatype(Datatype *datatype, int* ret) : name_(nullptr), size_(datatype->size_), lb_(datatype->lb_), ub_(datatype->ub_), flags_(datatype->flags_), refcount_(1) { flags_ &= ~DT_FLAG_PREDEFINED; *ret = MPI_SUCCESS; if(datatype->name_) name_ = xbt_strdup(datatype->name_); - + if (not datatype->attributes()->empty()) { - int flag; + int flag=0; void* value_out; - for(auto it = datatype->attributes()->begin(); it != datatype->attributes()->end(); it++){ - smpi_key_elem elem = keyvals_.at((*it).first); - - if (elem != nullptr && elem->copy_fn.type_copy_fn != MPI_NULL_COPY_FN) { - *ret = elem->copy_fn.type_copy_fn(datatype, (*it).first, nullptr, (*it).second, &value_out, &flag); + for (auto const& it : *(datatype->attributes())) { + smpi_key_elem elem = keyvals_.at(it.first); + 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); + 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); + } if (*ret != MPI_SUCCESS) { break; } - if (flag){ + if(elem->copy_fn.type_copy_fn == MPI_TYPE_DUP_FN || + ((elem->copy_fn.type_copy_fn_fort != MPI_NULL_COPY_FN) && (*(int*)*elem->copy_fn.type_copy_fn_fort == 1))){ + elem->refcount++; + attributes()->insert({it.first, it.second}); + } else if (flag){ elem->refcount++; - attributes()->insert({(*it).first, value_out}); + attributes()->insert({it.first, value_out}); } } } @@ -166,7 +179,6 @@ Datatype::~Datatype(){ xbt_free(name_); } - void Datatype::ref(){ refcount_++; @@ -205,90 +217,58 @@ bool Datatype::is_basic() return (flags_ & DT_FLAG_BASIC); } -const char* Datatype::encode(MPI_Datatype dt) +bool Datatype::is_replayable() { - return dt->id.c_str(); + return (simgrid::instr::trace_format == simgrid::instr::TraceFormat::Ti) && + ((this == MPI_BYTE) || (this == MPI_DOUBLE) || (this == MPI_INT) || (this == MPI_CHAR) || + (this == MPI_SHORT) || (this == MPI_LONG) || (this == MPI_FLOAT)); } -MPI_Datatype Datatype::decode(std::string datatype_id) +MPI_Datatype Datatype::decode(const std::string& datatype_id) { return id2type_lookup.find(datatype_id)->second; } -bool Datatype::is_replayable() -{ - return ((this==MPI_BYTE)||(this==MPI_DOUBLE)||(this==MPI_INT)|| - (this==MPI_CHAR)||(this==MPI_SHORT)||(this==MPI_LONG)||(this==MPI_FLOAT)); -} - -size_t Datatype::size(){ - return size_; -} - -int Datatype::flags(){ - return flags_; -} - -int Datatype::refcount(){ - return refcount_; -} - void Datatype::addflag(int flag){ flags_ &= flag; } -MPI_Aint Datatype::lb(){ - return lb_; -} - -MPI_Aint Datatype::ub(){ - return ub_; -} - -char* Datatype::name(){ - return name_; -} - - int Datatype::extent(MPI_Aint * lb, MPI_Aint * extent){ *lb = lb_; *extent = ub_ - lb_; return MPI_SUCCESS; } -MPI_Aint Datatype::get_extent(){ - return ub_ - lb_; -} - void Datatype::get_name(char* name, int* length){ *length = strlen(name_); strncpy(name, name_, *length+1); } -void Datatype::set_name(char* name){ +void Datatype::set_name(const char* name){ if(name_!=nullptr && (flags_ & DT_FLAG_PREDEFINED) == 0) xbt_free(name_); name_ = xbt_strdup(name); } -int Datatype::pack(void* inbuf, int incount, void* outbuf, int outcount, int* position,MPI_Comm comm){ +int Datatype::pack(const void* inbuf, int incount, void* outbuf, int outcount, int* position, MPI_Comm) +{ if (outcount - *position < incount*static_cast(size_)) - return MPI_ERR_BUFFER; + return MPI_ERR_OTHER; Datatype::copy(inbuf, incount, this, static_cast(outbuf) + *position, outcount, MPI_CHAR); *position += incount * size_; return MPI_SUCCESS; } -int Datatype::unpack(void* inbuf, int insize, int* position, void* outbuf, int outcount,MPI_Comm comm){ +int Datatype::unpack(const void* inbuf, int insize, int* position, void* outbuf, int outcount, MPI_Comm) +{ if (outcount*static_cast(size_)> insize) - return MPI_ERR_BUFFER; - Datatype::copy(static_cast(inbuf) + *position, insize, MPI_CHAR, outbuf, outcount, this); + return MPI_ERR_OTHER; + Datatype::copy(static_cast(inbuf) + *position, insize, MPI_CHAR, outbuf, outcount, this); *position += outcount * size_; return MPI_SUCCESS; } - -int Datatype::copy(void *sendbuf, int sendcount, MPI_Datatype sendtype, +int Datatype::copy(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype){ // FIXME Handle the case of a partial shared malloc. @@ -301,7 +281,7 @@ int Datatype::copy(void *sendbuf, int sendcount, MPI_Datatype sendtype, sendcount *= sendtype->size(); recvcount *= recvtype->size(); 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()) memcpy(recvbuf, sendbuf, count); @@ -324,15 +304,15 @@ int Datatype::copy(void *sendbuf, int sendcount, MPI_Datatype sendtype, } //Default serialization method : memcpy. -void Datatype::serialize( void* noncontiguous_buf, void *contiguous_buf, int count){ +void Datatype::serialize(const void* noncontiguous_buf, void* contiguous_buf, int count) +{ char* contiguous_buf_char = static_cast(contiguous_buf); - char* noncontiguous_buf_char = static_cast(noncontiguous_buf)+lb_; + const char* noncontiguous_buf_char = static_cast(noncontiguous_buf)+lb_; memcpy(contiguous_buf_char, noncontiguous_buf_char, count*size_); - } -void Datatype::unserialize( void* contiguous_buf, void *noncontiguous_buf, int count, MPI_Op op){ - char* contiguous_buf_char = static_cast(contiguous_buf); +void Datatype::unserialize(const void* contiguous_buf, void *noncontiguous_buf, int count, MPI_Op op){ + const char* contiguous_buf_char = static_cast(contiguous_buf); char* noncontiguous_buf_char = static_cast(noncontiguous_buf)+lb_; int n=count; if(op!=MPI_OP_NULL) @@ -400,7 +380,7 @@ int Datatype::create_hvector(int count, int block_length, MPI_Aint stride, MPI_D return retval; } -int Datatype::create_indexed(int count, int* block_lengths, int* indices, MPI_Datatype old_type, MPI_Datatype* new_type){ +int Datatype::create_indexed(int count, const int* block_lengths, const int* indices, MPI_Datatype old_type, MPI_Datatype* new_type){ int size = 0; bool contiguous=true; MPI_Aint lb = 0; @@ -435,7 +415,7 @@ int Datatype::create_indexed(int count, int* block_lengths, int* indices, MPI_Da return MPI_SUCCESS; } -int Datatype::create_hindexed(int count, int* block_lengths, MPI_Aint* indices, MPI_Datatype old_type, MPI_Datatype* new_type){ +int Datatype::create_hindexed(int count, const int* block_lengths, const MPI_Aint* indices, MPI_Datatype old_type, MPI_Datatype* new_type){ int size = 0; bool contiguous=true; MPI_Aint lb = 0; @@ -469,7 +449,7 @@ int Datatype::create_hindexed(int count, int* block_lengths, MPI_Aint* indices, return MPI_SUCCESS; } -int Datatype::create_struct(int count, int* block_lengths, MPI_Aint* indices, MPI_Datatype* old_types, MPI_Datatype* new_type){ +int Datatype::create_struct(int count, const int* block_lengths, const MPI_Aint* indices, const MPI_Datatype* old_types, MPI_Datatype* new_type){ size_t size = 0; bool contiguous=true; size = 0; @@ -514,8 +494,8 @@ int Datatype::create_struct(int count, int* block_lengths, MPI_Aint* indices, MP return MPI_SUCCESS; } -int Datatype::create_subarray(int ndims, int* array_of_sizes, - int* array_of_subsizes, int* array_of_starts, +int Datatype::create_subarray(int ndims, const int* array_of_sizes, + const int* array_of_subsizes, const int* array_of_starts, int order, MPI_Datatype oldtype, MPI_Datatype *newtype){ MPI_Datatype tmp;