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
remove a dependency on MSG from SMPI
[simgrid.git]
/
src
/
smpi
/
include
/
smpi_win.hpp
diff --git
a/src/smpi/include/smpi_win.hpp
b/src/smpi/include/smpi_win.hpp
index
8106b22
..
ec89c1d
100644
(file)
--- a/
src/smpi/include/smpi_win.hpp
+++ b/
src/smpi/include/smpi_win.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2010
, 2013-2017
. The SimGrid Team.
+/* Copyright (c) 2010
-2018
. 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
@@
-7,10
+7,10
@@
#ifndef SMPI_WIN_HPP_INCLUDED
#define SMPI_WIN_HPP_INCLUDED
#ifndef SMPI_WIN_HPP_INCLUDED
#define SMPI_WIN_HPP_INCLUDED
+#include "simgrid/s4u/Barrier.hpp"
#include "smpi_f2c.hpp"
#include "smpi_keyvals.hpp"
#include "xbt/synchro.h"
#include "smpi_f2c.hpp"
#include "smpi_keyvals.hpp"
#include "xbt/synchro.h"
-#include <simgrid/msg.h>
#include <vector>
#include <list>
#include <vector>
#include <list>
@@
-28,7
+28,7
@@
class Win : public F2C, public Keyval {
MPI_Comm comm_;
std::vector<MPI_Request> *requests_;
xbt_mutex_t mut_;
MPI_Comm comm_;
std::vector<MPI_Request> *requests_;
xbt_mutex_t mut_;
-
msg_bar_t
bar_;
+
simgrid::s4u::Barrier*
bar_;
MPI_Win* connected_wins_;
char* name_;
int opened_;
MPI_Win* connected_wins_;
char* name_;
int opened_;
@@
-90,6
+90,7
@@
public:
int flush_local_all();
int finish_comms();
int finish_comms(int rank);
int flush_local_all();
int finish_comms();
int finish_comms(int rank);
+ int shared_query(int rank, MPI_Aint* size, int* disp_unit, void* baseptr);
};
};