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
Merge branch 'master' of https://framagit.org/simgrid/simgrid
[simgrid.git]
/
include
/
simgrid
/
plugins
/
ProducerConsumer.hpp
diff --git
a/include/simgrid/plugins/ProducerConsumer.hpp
b/include/simgrid/plugins/ProducerConsumer.hpp
index
c45563f
..
1ecaa1e
100644
(file)
--- a/
include/simgrid/plugins/ProducerConsumer.hpp
+++ b/
include/simgrid/plugins/ProducerConsumer.hpp
@@
-28,9
+28,16
@@
namespace plugin {
template <typename T> class ProducerConsumer;
template <typename T> using ProducerConsumerPtr = boost::intrusive_ptr<ProducerConsumer<T>>;
template <typename T> class ProducerConsumer;
template <typename T> using ProducerConsumerPtr = boost::intrusive_ptr<ProducerConsumer<T>>;
-XBT_PUBLIC_DATA unsigned long pc_id;
+class ProducerConsumerId {
+private:
+ static unsigned long pc_id;
+
+protected:
+ const std::string id = "ProducerConsumer" + std::to_string(pc_id);
+ ProducerConsumerId() { ++pc_id; }
+};
-template <typename T> class ProducerConsumer {
+template <typename T> class ProducerConsumer
: public ProducerConsumerId
{
public:
/** This ProducerConsumer plugin can use two different transfer modes:
* - TransferMode::MAILBOX: this mode induces a s4u::Comm between the actors doing the calls to put() and get().
public:
/** This ProducerConsumer plugin can use two different transfer modes:
* - TransferMode::MAILBOX: this mode induces a s4u::Comm between the actors doing the calls to put() and get().
@@
-45,8
+52,6
@@
public:
enum class TransferMode { MAILBOX = 0, QUEUE };
private:
enum class TransferMode { MAILBOX = 0, QUEUE };
private:
- std::string id;
-
/* Implementation of a Monitor to handle the data exchanges */
s4u::MutexPtr mutex_;
s4u::ConditionVariablePtr can_put_;
/* Implementation of a Monitor to handle the data exchanges */
s4u::MutexPtr mutex_;
s4u::ConditionVariablePtr can_put_;
@@
-75,9
+80,6
@@
private:
{
xbt_assert(max_queue_size > 0, "Max queue size of 0 is not allowed");
{
xbt_assert(max_queue_size > 0, "Max queue size of 0 is not allowed");
- id = "ProducerConsumer" + std::to_string(pc_id);
- pc_id++;
-
mutex_ = s4u::Mutex::create();
can_put_ = s4u::ConditionVariable::create();
can_get_ = s4u::ConditionVariable::create();
mutex_ = s4u::Mutex::create();
can_put_ = s4u::ConditionVariable::create();
can_get_ = s4u::ConditionVariable::create();