A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cornercases handling
[simgrid.git]
/
src
/
smpi
/
smpi_comm.hpp
diff --git
a/src/smpi/smpi_comm.hpp
b/src/smpi/smpi_comm.hpp
index
4c2ead0
..
9076cc0
100644
(file)
--- a/
src/smpi/smpi_comm.hpp
+++ b/
src/smpi/smpi_comm.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2010-201
5
. The SimGrid Team.
+/* Copyright (c) 2010-201
7
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-8,18
+8,12
@@
#define SMPI_COMM_HPP_INCLUDED
#include "private.h"
#define SMPI_COMM_HPP_INCLUDED
#include "private.h"
-
-
-typedef struct s_smpi_mpi_comm_key_elem {
- MPI_Comm_copy_attr_function* copy_fn;
- MPI_Comm_delete_attr_function* delete_fn;
-} s_smpi_mpi_comm_key_elem_t;
-typedef struct s_smpi_mpi_comm_key_elem *smpi_comm_key_elem;
+#include <list>
namespace simgrid{
namespace smpi{
namespace simgrid{
namespace smpi{
-class Comm : public F2C{
+class Comm : public F2C
, public Keyval
{
private:
MPI_Group group_;
private:
MPI_Group group_;
@@
-33,16
+27,15
@@
class Comm : public F2C{
int is_uniform_;
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 ?
int is_uniform_;
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 ?
- xbt_dict_t attributes_;
- static xbt_dict_t keyvals_;
- static int keyval_id_;
+ std::list<MPI_Win> rma_wins_; // attached windows for synchronization.
public:
public:
+ static std::unordered_map<int, smpi_key_elem> keyvals_;
+ static int keyval_id_;
+
Comm() = default;
Comm(MPI_Group group, MPI_Topology topo);
Comm() = default;
Comm(MPI_Group group, MPI_Topology topo);
-
-
int dup(MPI_Comm* newcomm);
MPI_Group group();
MPI_Topology topo();
int dup(MPI_Comm* newcomm);
MPI_Group group();
MPI_Topology topo();
@@
-58,15
+51,11
@@
class Comm : public F2C{
int is_uniform();
int is_blocked();
MPI_Comm split(int color, int key);
int is_uniform();
int is_blocked();
MPI_Comm split(int color, int key);
- void cleanup_attributes();
void cleanup_smp();
void ref();
static void unref(MPI_Comm comm);
static void destroy(MPI_Comm comm);
void init_smp();
void cleanup_smp();
void ref();
static void unref(MPI_Comm comm);
static void destroy(MPI_Comm comm);
void init_smp();
- int attr_delete(int keyval);
- int attr_get(int keyval, void* attr_value, int* flag);
- int attr_put(int keyval, void* attr_value);
int add_f();
static void free_f(int id);
int add_f();
static void free_f(int id);
@@
-76,6
+65,10
@@
class Comm : public F2C{
static int keyval_free(int* keyval);
static void keyval_cleanup();
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();
+
};
}
};
}