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
Change way Mailboxes are create, stored, and destroyed
[simgrid.git]
/
src
/
kernel
/
activity
/
MailboxImpl.hpp
diff --git
a/src/kernel/activity/MailboxImpl.hpp
b/src/kernel/activity/MailboxImpl.hpp
index
956b021
..
14a03d3
100644
(file)
--- a/
src/kernel/activity/MailboxImpl.hpp
+++ b/
src/kernel/activity/MailboxImpl.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007-202
0
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-202
1
. 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. */
@@
-9,6
+9,7
@@
#include <boost/circular_buffer.hpp>
#include <xbt/string.hpp>
#include <boost/circular_buffer.hpp>
#include <xbt/string.hpp>
+#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Mailbox.hpp"
#include "src/kernel/activity/CommImpl.hpp"
#include "src/kernel/actor/ActorImpl.hpp"
#include "simgrid/s4u/Mailbox.hpp"
#include "src/kernel/activity/CommImpl.hpp"
#include "src/kernel/actor/ActorImpl.hpp"
@@
-25,6
+26,8
@@
class MailboxImpl {
s4u::Mailbox piface_;
xbt::string name_;
s4u::Mailbox piface_;
xbt::string name_;
+ friend s4u::Engine;
+ friend s4u::Mailbox* s4u::Engine::mailbox_by_name_or_create(const std::string& name) const;
friend s4u::Mailbox;
friend s4u::Mailbox* s4u::Mailbox::by_name(const std::string& name);
friend mc::CommunicationDeterminismChecker;
friend s4u::Mailbox;
friend s4u::Mailbox* s4u::Mailbox::by_name(const std::string& name);
friend mc::CommunicationDeterminismChecker;
@@
-32,10
+35,12
@@
class MailboxImpl {
explicit MailboxImpl(const std::string& name) : piface_(this), name_(name) {}
public:
explicit MailboxImpl(const std::string& name) : piface_(this), name_(name) {}
public:
+ /** @brief Public interface */
+ const s4u::Mailbox* get_iface() const { return &piface_; }
+ s4u::Mailbox* get_iface() { return &piface_; }
+
const xbt::string& get_name() const { return name_; }
const char* get_cname() const { return name_.c_str(); }
const xbt::string& get_name() const { return name_; }
const char* get_cname() const { return name_.c_str(); }
- static MailboxImpl* by_name_or_null(const std::string& name);
- static MailboxImpl* by_name_or_create(const std::string& name);
void set_receiver(s4u::ActorPtr actor);
void push(CommImplPtr comm);
void remove(const CommImplPtr& comm);
void set_receiver(s4u::ActorPtr actor);
void push(CommImplPtr comm);
void remove(const CommImplPtr& comm);
@@
-52,6
+57,4
@@
public:
} // namespace kernel
} // namespace simgrid
} // namespace kernel
} // namespace simgrid
-XBT_PRIVATE void SIMIX_mailbox_exit();
-
#endif
#endif