Merge pull request #193 from Takishipp/signals

[simgrid.git] / src / smpi / smpi_comm.hpp

diff --git a/src/smpi/smpi_comm.hpp b/src/smpi/smpi_comm.hpp
index c0b0c20..3e99776 100644 (file)
--- a/src/smpi/smpi_comm.hpp
+++ b/src/smpi/smpi_comm.hpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2010-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2010-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,8 +6,10 @@
 #ifndef SMPI_COMM_HPP_INCLUDED
 #define SMPI_COMM_HPP_INCLUDED
 
-#include "private.h"
-
+#include <list>
+#include "src/smpi/smpi_keyvals.hpp"
+#include "src/smpi/smpi_group.hpp"
+#include "src/smpi/smpi_topo.hpp"
 
 namespace simgrid{
 namespace smpi{
@@ -17,7 +18,7 @@ class Comm : public F2C, public Keyval{
 
   private:
     MPI_Group group_;
-    MPIR_Topo_type topoType_; 
+    MPIR_Topo_type topoType_;
     MPI_Topology topo_; // to be replaced by an union
     int refcount_;
     MPI_Comm leaders_comm_;//inter-node communicator
@@ -28,6 +29,8 @@ class Comm : public F2C, public Keyval{
     int* non_uniform_map_; //set if smp nodes have a different number of processes allocated
     int is_blocked_;// are ranks allocated on the same smp node contiguous ?
 
+    std::list<MPI_Win> rma_wins_; // attached windows for synchronization.
+
   public:
     static std::unordered_map<int, smpi_key_elem> keyvals_;
     static int keyval_id_;
@@ -63,6 +66,10 @@ class Comm : public F2C, public Keyval{
     static int keyval_free(int* keyval);
     static void keyval_cleanup();
 
+    void add_rma_win(MPI_Win win);
+    void remove_rma_win(MPI_Win win);
+    void finish_rma_calls();
+
 };
 
 }