X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/01761d6510e49cb704423b9f1d775407e0633c2d..b6dde5ff6f208b83545a4b4e9e81712d0d8617a1:/src/smpi/include/smpi_datatype.hpp diff --git a/src/smpi/include/smpi_datatype.hpp b/src/smpi/include/smpi_datatype.hpp index 160a9f970f..5b4d4c0281 100644 --- a/src/smpi/include/smpi_datatype.hpp +++ b/src/smpi/include/smpi_datatype.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2020. 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,24 +8,26 @@ #include "smpi_f2c.hpp" #include "smpi_keyvals.hpp" +#include -#define DT_FLAG_DESTROYED 0x0001 /**< user destroyed but some other layers still have a reference */ -#define DT_FLAG_COMMITED 0x0002 /**< ready to be used for a send/recv operation */ -#define DT_FLAG_CONTIGUOUS 0x0004 /**< contiguous datatype */ -#define DT_FLAG_OVERLAP 0x0008 /**< datatype is unpropper for a recv operation */ -#define DT_FLAG_USER_LB 0x0010 /**< has a user defined LB */ -#define DT_FLAG_USER_UB 0x0020 /**< has a user defined UB */ -#define DT_FLAG_PREDEFINED 0x0040 /**< cannot be removed: initial and predefined datatypes */ -#define DT_FLAG_NO_GAPS 0x0080 /**< no gaps around the datatype */ -#define DT_FLAG_DATA 0x0100 /**< data or control structure */ -#define DT_FLAG_ONE_SIDED 0x0200 /**< datatype can be used for one sided operations */ -#define DT_FLAG_UNAVAILABLE 0x0400 /**< datatypes unavailable on the build (OS or compiler dependant) */ -#define DT_FLAG_DERIVED 0x0800 /**< is the datatype derived ? */ +constexpr unsigned DT_FLAG_DESTROYED = 0x0001; /**< user destroyed but some other layers still have a reference */ +constexpr unsigned DT_FLAG_COMMITED = 0x0002; /**< ready to be used for a send/recv operation */ +constexpr unsigned DT_FLAG_CONTIGUOUS = 0x0004; /**< contiguous datatype */ +constexpr unsigned DT_FLAG_OVERLAP = 0x0008; /**< datatype is unproper for a recv operation */ +constexpr unsigned DT_FLAG_USER_LB = 0x0010; /**< has a user defined LB */ +constexpr unsigned DT_FLAG_USER_UB = 0x0020; /**< has a user defined UB */ +constexpr unsigned DT_FLAG_PREDEFINED = 0x0040; /**< cannot be removed: initial and predefined datatypes */ +constexpr unsigned DT_FLAG_NO_GAPS = 0x0080; /**< no gaps around the datatype */ +constexpr unsigned DT_FLAG_DATA = 0x0100; /**< data or control structure */ +constexpr unsigned DT_FLAG_ONE_SIDED = 0x0200; /**< datatype can be used for one sided operations */ +constexpr unsigned DT_FLAG_UNAVAILABLE = 0x0400; /**< datatypes unavailable on the build (OS or compiler dependant) */ +constexpr unsigned DT_FLAG_DERIVED = 0x0800; /**< is the datatype derived ? */ /* * We should make the difference here between the predefined contiguous and non contiguous * datatypes. The DT_FLAG_BASIC is held by all predefined contiguous datatypes. */ -#define DT_FLAG_BASIC (DT_FLAG_PREDEFINED | DT_FLAG_CONTIGUOUS | DT_FLAG_NO_GAPS | DT_FLAG_DATA | DT_FLAG_COMMITED) +constexpr unsigned DT_FLAG_BASIC = + (DT_FLAG_PREDEFINED | DT_FLAG_CONTIGUOUS | DT_FLAG_NO_GAPS | DT_FLAG_DATA | DT_FLAG_COMMITED); extern const MPI_Datatype MPI_PTR; @@ -75,17 +77,17 @@ namespace simgrid{ namespace smpi{ class Datatype : public F2C, public Keyval{ - char* name_; + char* name_ = nullptr; /* The id here is the (unique) datatype id used for this datastructure. * It's default value is set to -1 since some code expects this return value * when no other id has been assigned */ - int id = -1; + std::string id = "-1"; size_t size_; MPI_Aint lb_; MPI_Aint ub_; int flags_; - int refcount_; + int refcount_ = 1; public: static std::unordered_map keyvals_; @@ -96,48 +98,50 @@ public: Datatype(int size, MPI_Aint lb, MPI_Aint ub, int flags); Datatype(char* name, int size, MPI_Aint lb, MPI_Aint ub, int flags); Datatype(Datatype* datatype, int* ret); + Datatype(const Datatype&) = delete; + Datatype& operator=(const Datatype&) = delete; virtual ~Datatype(); - char* name(); - size_t size(); - MPI_Aint lb(); - MPI_Aint ub(); - int flags(); - int refcount(); + char* name() { return name_; } + size_t size() { return size_; } + MPI_Aint lb() { return lb_; } + MPI_Aint ub() { return ub_; } + int flags() { return flags_; } + int refcount() { return refcount_; } void ref(); static void unref(MPI_Datatype datatype); void commit(); bool is_valid(); bool is_basic(); - static const char* encode(MPI_Datatype dt); - static MPI_Datatype decode(std::string datatype_id); + static const char* encode(const Datatype* dt) { return dt->id.c_str(); } + static MPI_Datatype decode(const std::string& datatype_id); bool is_replayable(); void addflag(int flag); int extent(MPI_Aint* lb, MPI_Aint* extent); - MPI_Aint get_extent(); + MPI_Aint get_extent() { return ub_ - lb_; }; void get_name(char* name, int* length); - void set_name(char* name); - static int copy(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, + void set_name(const char* name); + static int copy(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype); - virtual void serialize(void* noncontiguous, void* contiguous, int count); - virtual void unserialize(void* contiguous, void* noncontiguous, int count, MPI_Op op); + virtual void serialize(const void* noncontiguous, void* contiguous, int count); + virtual void unserialize(const void* contiguous, void* noncontiguous, int count, MPI_Op op); static int keyval_create(MPI_Type_copy_attr_function* copy_fn, MPI_Type_delete_attr_function* delete_fn, int* keyval, void* extra_state); static int keyval_free(int* keyval); - int pack(void* inbuf, int incount, void* outbuf, int outcount, int* position, MPI_Comm comm); - int unpack(void* inbuf, int insize, int* position, void* outbuf, int outcount, MPI_Comm comm); + int pack(const void* inbuf, int incount, void* outbuf, int outcount, int* position, const Comm* comm); + int unpack(const void* inbuf, int insize, int* position, void* outbuf, int outcount, const Comm* comm); static int create_contiguous(int count, MPI_Datatype old_type, MPI_Aint lb, MPI_Datatype* new_type); static int create_vector(int count, int blocklen, int stride, MPI_Datatype old_type, MPI_Datatype* new_type); static int create_hvector(int count, int blocklen, MPI_Aint stride, MPI_Datatype old_type, MPI_Datatype* new_type); - static int create_indexed(int count, int* blocklens, int* indices, MPI_Datatype old_type, MPI_Datatype* new_type); - static int create_hindexed(int count, int* blocklens, MPI_Aint* indices, MPI_Datatype old_type, + static int create_indexed(int count, const int* blocklens, const int* indices, MPI_Datatype old_type, MPI_Datatype* new_type); + static int create_hindexed(int count, const int* blocklens, const MPI_Aint* indices, MPI_Datatype old_type, MPI_Datatype* new_type); - static int create_struct(int count, int* blocklens, MPI_Aint* indices, MPI_Datatype* old_types, + static int create_struct(int count, const int* blocklens, const MPI_Aint* indices, const MPI_Datatype* old_types, MPI_Datatype* new_type); - static int create_subarray(int ndims, int* array_of_sizes, - int* array_of_subsizes, int* array_of_starts, + static int 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); static int create_resized(MPI_Datatype oldtype,MPI_Aint lb, MPI_Aint extent, MPI_Datatype *newtype);