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
Update python/clusters-multicpu to the new API.
[simgrid.git]
/
include
/
simgrid
/
s4u
/
Barrier.hpp
diff --git
a/include/simgrid/s4u/Barrier.hpp
b/include/simgrid/s4u/Barrier.hpp
index 6a2dcb7a9defccb144a922d7cfd5a8141dcb3277..2d6db860858e9516676787b87fdde2320ae470af 100644
(file)
--- a/
include/simgrid/s4u/Barrier.hpp
+++ b/
include/simgrid/s4u/Barrier.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2018-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2018-20
23
. 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. */
/* 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. */
@@
-15,29
+15,26
@@
#include <atomic>
#include <future>
#include <atomic>
#include <future>
-namespace simgrid {
-namespace s4u {
+namespace simgrid::s4u {
class XBT_PUBLIC Barrier {
class XBT_PUBLIC Barrier {
-private:
- MutexPtr mutex_;
- ConditionVariablePtr cond_;
- unsigned int expected_actors_;
- unsigned int arrived_actors_ = 0;
+ kernel::activity::BarrierImpl* pimpl_;
+ friend kernel::activity::BarrierImpl;
- /* refcounting */
- std::atomic_int_fast32_t refcount_{0};
+ explicit Barrier(kernel::activity::BarrierImpl* pimpl) : pimpl_(pimpl) {}
public:
public:
- explicit Barrier(unsigned int count);
- ~Barrier() = default;
#ifndef DOXYGEN
Barrier(Barrier const&) = delete;
Barrier& operator=(Barrier const&) = delete;
#endif
#ifndef DOXYGEN
Barrier(Barrier const&) = delete;
Barrier& operator=(Barrier const&) = delete;
#endif
+ /** \static Creates a barrier for the given amount of actors */
static BarrierPtr create(unsigned int expected_actors);
static BarrierPtr create(unsigned int expected_actors);
+ /** Blocks into the barrier. Every waiting actors will be unlocked once the expected amount of actors reaches the barrier */
int wait();
int wait();
+ /** Returns some debug information about the barrier */
+ std::string to_string() const;
#ifndef DOXYGEN
/* refcounting */
#ifndef DOXYGEN
/* refcounting */
@@
-45,7
+42,6
@@
public:
friend XBT_PUBLIC void intrusive_ptr_release(Barrier* barrier);
#endif
};
friend XBT_PUBLIC void intrusive_ptr_release(Barrier* barrier);
#endif
};
-} // namespace s4u
-} // namespace simgrid
+} // namespace simgrid::s4u
#endif
#endif