Replace #define with constexpr declarations.

[simgrid.git] / src / kernel / activity / MailboxImpl.hpp

diff --git a/src/kernel/activity/MailboxImpl.hpp b/src/kernel/activity/MailboxImpl.hpp
index 69ae9b8..2620d7e 100644 (file)
--- a/src/kernel/activity/MailboxImpl.hpp
+++ b/src/kernel/activity/MailboxImpl.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2019. 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. */
@@ -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,23 +20,28 @@ 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(std::string name);
+  friend s4u::MailboxPtr s4u::Mailbox::by_name(const 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)
+      : piface_(this), name_(std::move(name)), comm_queue_(MAX_MAILBOX_SIZE), done_comm_queue_(MAX_MAILBOX_SIZE)
   {
   }
 
 public:
   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);
+  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);
+  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,
+                                 const CommImplPtr& my_synchro, bool done, bool remove_matching);
 
 private:
   simgrid::s4u::Mailbox piface_;
@@ -45,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
 };
 }
 }