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 git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
s4u
/
s4u_mailbox.cpp
diff --git
a/src/s4u/s4u_mailbox.cpp
b/src/s4u/s4u_mailbox.cpp
index
c5be189
..
c057113
100644
(file)
--- a/
src/s4u/s4u_mailbox.cpp
+++ b/
src/s4u/s4u_mailbox.cpp
@@
-6,7
+6,6
@@
#include "xbt/log.h"
#include "src/msg/msg_private.h"
#include "xbt/log.h"
#include "src/msg/msg_private.h"
-#include "src/msg/msg_mailbox.h"
#include "simgrid/s4u/mailbox.hpp"
#include "simgrid/s4u/mailbox.hpp"
@@
-19,7
+18,7
@@
using namespace simgrid;
boost::unordered_map <std::string, s4u::Mailbox *> *s4u::Mailbox::mailboxes = new boost::unordered_map<std::string, s4u::Mailbox*> ();
boost::unordered_map <std::string, s4u::Mailbox *> *s4u::Mailbox::mailboxes = new boost::unordered_map<std::string, s4u::Mailbox*> ();
-s4u::Mailbox::Mailbox(const char*name, smx_
rdv
_t inferior) {
+s4u::Mailbox::Mailbox(const char*name, smx_
mailbox
_t inferior) {
inferior_ = inferior;
name_ = name;
mailboxes->insert({name, this});
inferior_ = inferior;
name_ = name;
mailboxes->insert({name, this});
@@
-33,11
+32,22
@@
s4u::Mailbox *s4u::Mailbox::byName(const char*name) {
res = mailboxes->at(name);
} catch (std::out_of_range& e) {
// FIXME: there is a potential race condition here where two actors run Mailbox::byName on a non-existent mailbox
res = mailboxes->at(name);
} catch (std::out_of_range& e) {
// FIXME: there is a potential race condition here where two actors run Mailbox::byName on a non-existent mailbox
- // during the same scheduling round. Both will be interrupted in the simcall creating the underlying simix
rdv
.
+ // during the same scheduling round. Both will be interrupted in the simcall creating the underlying simix
mbox
.
// Only one simix object will be created, but two S4U objects will be created.
// Only one S4U object will be stored in the hashmap and used, and the other one will be leaked.
// Only one simix object will be created, but two S4U objects will be created.
// Only one S4U object will be stored in the hashmap and used, and the other one will be leaked.
- new Mailbox(name,simcall_
rdv
_create(name));
+ new Mailbox(name,simcall_
mbox
_create(name));
res = mailboxes->at(name); // Use the stored one, even if it's not the one I created myself.
}
return res;
}
res = mailboxes->at(name); // Use the stored one, even if it's not the one I created myself.
}
return res;
}
+
+bool s4u::Mailbox::empty() {
+ return nullptr == simcall_mbox_get_head(inferior_);
+}
+
+sg_mbox_t sg_mbox_by_name(const char*name){
+ return s4u::Mailbox::byName(name);
+}
+int sg_mbox_is_empty(sg_mbox_t mbox) {
+ return mbox->empty();
+}