Fix MPI_Type_dup for derived datatypes.

[simgrid.git] / src / smpi / include / smpi_datatype.hpp

diff --git a/src/smpi/include/smpi_datatype.hpp b/src/smpi/include/smpi_datatype.hpp
index 09a821b..5e387ba 100644 (file)
--- a/src/smpi/include/smpi_datatype.hpp
+++ b/src/smpi/include/smpi_datatype.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2019. 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. */
@@ -75,9 +75,26 @@ struct integer128_t {
 
 namespace simgrid{
 namespace smpi{
+class Datatype_contents {
+  public:
+  int combiner_;
+  int number_of_integers_;
+  int* integers_;
+  int number_of_addresses_;
+  MPI_Aint* addresses_;
+  int number_of_datatypes_;
+  MPI_Datatype* datatypes_;
+  Datatype_contents(int combiner, 
+                    int number_of_integers, const int* integers, 
+                    int number_of_addresses, const MPI_Aint* addresses, 
+                    int number_of_datatypes, const MPI_Datatype* datatypes);
+  Datatype_contents(const Datatype_contents&) = delete;
+  Datatype_contents& operator=(const Datatype_contents&) = delete;
+  ~Datatype_contents();
+};
 
 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
@@ -87,11 +104,12 @@ class Datatype : public F2C, public Keyval{
   MPI_Aint lb_;
   MPI_Aint ub_;
   int flags_;
-  int refcount_;
+  int refcount_ = 1;
 
 public:
   static std::unordered_map<int, smpi_key_elem> keyvals_;
   static int keyval_id_;
+  Datatype_contents* contents_ = nullptr;
 
   Datatype(int id, int size, MPI_Aint lb, MPI_Aint ub, int flags);
   Datatype(char* name, int id, int size, MPI_Aint lb, MPI_Aint ub, int flags);
@@ -114,7 +132,7 @@ public:
   void commit();
   bool is_valid();
   bool is_basic();
-  static const char* encode(MPI_Datatype dt) { return dt->id.c_str(); }
+  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);
@@ -124,14 +142,19 @@ public:
   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 MPI_Datatype clone();
   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(const void* inbuf, int incount, void* outbuf, int outcount, int* position, MPI_Comm comm);
-  int unpack(const 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);
+  int 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 get_envelope(int* num_integers, int* num_addresses, 
+                   int* num_datatypes, int* combiner);
   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);