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

diff --git a/src/kernel/activity/MailboxImpl.hpp b/src/kernel/activity/MailboxImpl.hpp
index c248f9d23e..2620d7eb24 100644
--- a/src/kernel/activity/MailboxImpl.hpp
+++ b/src/kernel/activity/MailboxImpl.hpp
@@ -13,7 +13,6 @@
 #include "src/kernel/activity/CommImpl.hpp"
 #include "src/simix/ActorImpl.hpp"
 
-#define MAX_MAILBOX_SIZE 10000000
 namespace simgrid {
 namespace kernel {
 namespace activity {
@@ -21,6 +20,8 @@ namespace activity {
 /** @brief Implementation of the simgrid::s4u::Mailbox */
 
 class MailboxImpl {
+  static constexpr size_t MAX_MAILBOX_SIZE = 10000000;
+
   friend s4u::Mailbox;
   friend s4u::MailboxPtr s4u::Mailbox::by_name(const std::string& name);
   friend mc::CommunicationDeterminismChecker;
@@ -36,11 +37,11 @@ public:
   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(activity::CommImplPtr comm);
-  void remove(smx_activity_t activity);
-  smx_activity_t iprobe(int type, int (*match_fun)(void*, void*, CommImpl*), void* data);
+  void push(CommImplPtr comm);
+  void remove(const CommImplPtr& comm);
+  CommImplPtr iprobe(int type, int (*match_fun)(void*, void*, CommImpl*), void* data);
   CommImplPtr find_matching_comm(CommImpl::Type type, int (*match_fun)(void*, void*, CommImpl*), void* this_user_data,
-                                 CommImplPtr my_synchro, bool done, bool remove_matching);
+                                 const CommImplPtr& my_synchro, bool done, bool remove_matching);
 
 private:
   simgrid::s4u::Mailbox piface_;
@@ -48,9 +49,9 @@ private:
 
 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
+  boost::circular_buffer_space_optimized<CommImplPtr> comm_queue_;
+  boost::circular_buffer_space_optimized<CommImplPtr> done_comm_queue_; // messages already received in the permanent
+                                                                        // receive mode
 };
 }
 }