X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d17275a7f232bacf3d00279e3ba76c32cc6cf2c5..ae0e5607956f1b19a4605d297bc6d51e5e18f845:/src/smpi/smpi_datatype.hpp

diff --git a/src/smpi/smpi_datatype.hpp b/src/smpi/smpi_datatype.hpp
index 9c0cb86da8..220a424ca5 100644
--- a/src/smpi/smpi_datatype.hpp
+++ b/src/smpi/smpi_datatype.hpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2009-2010, 2012-2014. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2009-2017. 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. */
@@ -7,9 +6,8 @@
 #ifndef SMPI_DATATYPE_HPP
 #define SMPI_DATATYPE_HPP
 
-#include <xbt/base.h>
-
-#include "private.h"
+#include "src/smpi/smpi_f2c.hpp"
+#include "src/smpi/smpi_keyvals.hpp"
 
 #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 */
@@ -77,33 +75,38 @@ typedef struct {
 namespace simgrid{
 namespace smpi{
 
-class Datatype{
-  protected:
+class Datatype : public F2C, public Keyval{
+  private:
     char* name_;
     size_t size_;
     MPI_Aint lb_;
     MPI_Aint ub_;
     int flags_;
-    xbt_dict_t attributes_;
-    int in_use_;
+    int refcount_;
 
   public:
+    static std::unordered_map<int, smpi_key_elem> keyvals_;
+    static int keyval_id_;
+
     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);
     virtual ~Datatype();
-    void use();
-    void unuse();
-    void commit();
-    bool is_valid();
+
+    char* name();
     size_t size();
-    int flags();
-    void addflag(int flag);
     MPI_Aint lb();
     MPI_Aint ub();
+    int flags();
+    int refcount();
+
+    void ref();
+    static void unref(MPI_Datatype datatype);
+    void commit();
+    bool is_valid();
+    void addflag(int flag);
     int extent(MPI_Aint * lb, MPI_Aint * extent);
     MPI_Aint get_extent();
-    char* name();
     void get_name(char* name, int* length);
     void set_name(char* name);
     static int copy(void *sendbuf, int sendcount, MPI_Datatype sendtype,
@@ -112,9 +115,6 @@ class Datatype{
                             int count);
     virtual void unserialize( void* contiguous, void *noncontiguous, 
                               int count, MPI_Op op);
-    int attr_delete(int keyval);
-    int attr_get(int keyval, void* attr_value, int* flag);
-    int attr_put(int keyval, void* attr_value);
     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);
@@ -127,8 +127,9 @@ class Datatype{
     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, MPI_Datatype* new_type);
     static int create_struct(int count, int* blocklens, MPI_Aint* indices, MPI_Datatype* old_types, MPI_Datatype* new_type);
-};
 
+    static Datatype* f2c(int id);
+};
 
 }
 }