X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d756f639a47486f3266eb84367ec2dfb707cda25..596e36117322c22fd31372e7803bc197bcd4a016:/src/kernel/activity/MailboxImpl.hpp

diff --git a/src/kernel/activity/MailboxImpl.hpp b/src/kernel/activity/MailboxImpl.hpp
index ffdbbb0570..172bda4cee 100644
--- a/src/kernel/activity/MailboxImpl.hpp
+++ b/src/kernel/activity/MailboxImpl.hpp
@@ -1,61 +1,68 @@
-/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2023. 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. */
 
-#ifndef SIMIX_MAILBOXIMPL_H
-#define SIMIX_MAILBOXIMPL_H
-
-#include <boost/circular_buffer.hpp>
-#include <xbt/string.hpp>
+#ifndef SIMGRID_KERNEL_ACTIVITY_MAILBOX_HPP
+#define SIMGRID_KERNEL_ACTIVITY_MAILBOX_HPP
 
+#include "simgrid/config.h" /* FIXME: KILLME. This makes the ABI config-dependent, but mandatory for the hack below */
+#include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Mailbox.hpp"
 #include "src/kernel/activity/CommImpl.hpp"
-#include "src/simix/ActorImpl.hpp"
+#include "src/kernel/actor/ActorImpl.hpp"
 
-#define MAX_MAILBOX_SIZE 10000000
-namespace simgrid {
-namespace kernel {
-namespace activity {
+namespace simgrid::kernel::activity {
 
-/** @brief Implementation of the simgrid::s4u::Mailbox */
+/** @brief Implementation of the s4u::Mailbox */
 
 class MailboxImpl {
+  s4u::Mailbox piface_;
+  std::string name_;
+  actor::ActorImplPtr permanent_receiver_; // actor to which the mailbox is attached
+
+  std::deque<CommImplPtr> comm_queue_;
+  // messages already received in the permanent receive mode
+  std::deque<CommImplPtr> done_comm_queue_;
+
+  friend s4u::Engine;
   friend s4u::Mailbox;
-  friend s4u::MailboxPtr s4u::Mailbox::by_name(const std::string& name);
-  friend mc::CommunicationDeterminismChecker;
+  friend s4u::Mailbox* s4u::Engine::mailbox_by_name_or_create(const std::string& name) const;
+  friend s4u::Mailbox* s4u::Mailbox::by_name(const std::string& name);
 
-  explicit MailboxImpl(std::string name)
-      : piface_(this), name_(std::move(name)), comm_queue_(MAX_MAILBOX_SIZE), done_comm_queue_(MAX_MAILBOX_SIZE)
-  {
-  }
+  static unsigned next_id_; // Next ID to be given
+  const unsigned id_ = next_id_++;
+  explicit MailboxImpl(const std::string& name) : piface_(this), name_(name) {}
+  MailboxImpl(const MailboxImpl&) = delete;
+  MailboxImpl& operator=(const MailboxImpl&) = delete;
 
 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(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);
-  CommImplPtr find_matching_comm(e_smx_comm_type_t type, int (*match_fun)(void*, void*, CommImpl*),
-                                 void* this_user_data, CommImplPtr my_synchro, bool done, bool remove_matching);
+  /** @brief Public interface */
+  unsigned get_id() const { return id_; }
 
-private:
-  simgrid::s4u::Mailbox piface_;
-  simgrid::xbt::string name_;
+  ~MailboxImpl();
 
-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
-};
-}
-}
-}
+  const s4u::Mailbox* get_iface() const { return &piface_; }
+  s4u::Mailbox* get_iface() { return &piface_; }
 
-XBT_PRIVATE void SIMIX_mailbox_exit();
+  const std::string& get_name() const { return name_; }
+  const char* get_cname() const { return name_.c_str(); }
+  void set_receiver(s4u::ActorPtr actor);
+  void push(const CommImplPtr& comm);
+  void push_done(const CommImplPtr& done_comm) { done_comm_queue_.push_back(done_comm); }
+  void remove(const CommImplPtr& comm);
+  void clear(bool do_finish);
+  CommImplPtr iprobe(int type, const std::function<bool(void*, void*, CommImpl*)>& match_fun, void* data);
+  CommImplPtr find_matching_comm(CommImplType type, const std::function<bool(void*, void*, CommImpl*)>& match_fun,
+                                 void* this_user_data, const CommImplPtr& my_synchro, bool done, bool remove_matching);
+  bool is_permanent() const { return permanent_receiver_ != nullptr; }
+  actor::ActorImplPtr get_permanent_receiver() const { return permanent_receiver_; }
+  bool empty() const { return comm_queue_.empty(); }
+  size_t size() const { return comm_queue_.size(); }
+  const CommImplPtr& front() const { return comm_queue_.front(); }
+  bool has_some_done_comm() const { return not done_comm_queue_.empty(); }
+  const CommImplPtr& done_front() const { return done_comm_queue_.front(); }
+};
+} // namespace simgrid::kernel::activity
 
-#endif /* SIMIX_MAILBOXIMPL_H */
+#endif