Merge branch 'oldstyle_element_set'

[simgrid.git] / src / s4u / s4u_mailbox.cpp

diff --git a/src/s4u/s4u_mailbox.cpp b/src/s4u/s4u_mailbox.cpp
index d18150d..587a72a 100644 (file)
--- a/src/s4u/s4u_mailbox.cpp
+++ b/src/s4u/s4u_mailbox.cpp
@@ -5,8 +5,8 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "xbt/log.h"
-#include "msg/msg_private.h"
-#include "msg/msg_mailbox.h"
+#include "src/msg/msg_private.h"
+#include "src/msg/msg_mailbox.h"
 
 #include "simgrid/s4u/mailbox.hpp"
 
@@ -20,24 +20,24 @@ boost::unordered_map <std::string, s4u::Mailbox *> *s4u::Mailbox::mailboxes = ne
 
 
 s4u::Mailbox::Mailbox(const char*name, smx_rdv_t inferior) {
-       p_inferior = inferior;
-       p_name = name;
-       mailboxes->insert({name, this});
+  p_inferior = inferior;
+  p_name = name;
+  mailboxes->insert({name, this});
 }
 const char *s4u::Mailbox::getName() {
-       return p_name.c_str();
+  return p_name.c_str();
 }
 s4u::Mailbox *s4u::Mailbox::byName(const char*name) {
-       s4u::Mailbox *res;
-       try {
-               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.
-               // 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));
-               res = mailboxes->at(name); // Use the stored one, even if it's not the one I created myself.
-       }
-       return res;
+  s4u::Mailbox *res;
+  try {
+    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.
+    // 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));
+    res = mailboxes->at(name); // Use the stored one, even if it's not the one I created myself.
+  }
+  return res;
 }