X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d5b29830df70e823202e384a7655e4371193ecd7..8749f7dec702f8afc9a24ac2770f2e2a47dfec62:/src/kernel/activity/MailboxImpl.hpp

diff --git a/src/kernel/activity/MailboxImpl.hpp b/src/kernel/activity/MailboxImpl.hpp
index 8c4541d611..69ae9b8a0f 100644
--- a/src/kernel/activity/MailboxImpl.hpp
+++ b/src/kernel/activity/MailboxImpl.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2018. 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. */
@@ -7,6 +7,7 @@
 #define SIMIX_MAILBOXIMPL_H
 
 #include <boost/circular_buffer.hpp>
+#include <xbt/string.hpp>
 
 #include "simgrid/s4u/Mailbox.hpp"
 #include "src/kernel/activity/CommImpl.hpp"
@@ -20,25 +21,33 @@ namespace activity {
 /** @brief Implementation of the simgrid::s4u::Mailbox */
 
 class MailboxImpl {
-  explicit MailboxImpl(const char* name)
-      : piface_(this), name_(xbt_strdup(name)), comm_queue(MAX_MAILBOX_SIZE), done_comm_queue(MAX_MAILBOX_SIZE)
+  friend s4u::Mailbox;
+  friend s4u::MailboxPtr s4u::Mailbox::by_name(std::string name);
+  friend mc::CommunicationDeterminismChecker;
+
+  explicit MailboxImpl(std::string name)
+      : piface_(this), name_(name), comm_queue_(MAX_MAILBOX_SIZE), done_comm_queue_(MAX_MAILBOX_SIZE)
   {
   }
 
 public:
-  ~MailboxImpl() { xbt_free(name_); }
-
-  static MailboxImpl* byNameOrNull(const char* name);
-  static MailboxImpl* byNameOrCreate(const char* name);
-  void setReceiver(s4u::ActorPtr actor);
+  const simgrid::xbt::string& get_name() const { return name_; }
+  const char* get_cname() const { return name_.c_str(); }
+  static MailboxImpl* by_name_or_null(std::string name);
+  static MailboxImpl* by_name_or_create(std::string name);
+  void set_receiver(s4u::ActorPtr actor);
   void push(activity::CommImplPtr comm);
   void remove(smx_activity_t activity);
-  simgrid::s4u::Mailbox piface_; // Our interface
-  char* name_;
 
-  simgrid::simix::ActorImplPtr permanent_receiver; // process which the mailbox is attached to
-  boost::circular_buffer_space_optimized<smx_activity_t> comm_queue;
-  boost::circular_buffer_space_optimized<smx_activity_t> done_comm_queue; // messages already received in the permanent receive mode
+private:
+  simgrid::s4u::Mailbox piface_;
+  simgrid::xbt::string name_;
+
+public:
+  simgrid::kernel::actor::ActorImplPtr permanent_receiver_; // actor to which the mailbox is attached
+  boost::circular_buffer_space_optimized<smx_activity_t> comm_queue_;
+  boost::circular_buffer_space_optimized<smx_activity_t>
+      done_comm_queue_; // messages already received in the permanent receive mode
 };
 }
 }