X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/033eb0461ca0bc73eff29615c388a81fb5bd80e8..140e8a87d2424178aca00911009e9dea815646fd:/src/smpi/include/smpi_datatype.hpp

diff --git a/src/smpi/include/smpi_datatype.hpp b/src/smpi/include/smpi_datatype.hpp
index 24cd3049e3..3b00c7e02b 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-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,24 +8,26 @@
 
 #include "smpi_f2c.hpp"
 #include "smpi_keyvals.hpp"
+#include <string>
 
-#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 unpropper 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;
 
@@ -80,7 +82,7 @@ class Datatype : public F2C, public Keyval{
    * 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_;
@@ -96,26 +98,28 @@ 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(const char* const datatype_id);
+  static const char* encode(MPI_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,