X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/519fc4af194190fc8092d801d51b2fd83d35845e..3203afd846219ef8b41cadda945ea0a98103c46f:/src/kernel/activity/MailboxImpl.hpp diff --git a/src/kernel/activity/MailboxImpl.hpp b/src/kernel/activity/MailboxImpl.hpp index 353b963e73..199fcd12cc 100644 --- a/src/kernel/activity/MailboxImpl.hpp +++ b/src/kernel/activity/MailboxImpl.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2022. 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. */ @@ -6,14 +6,13 @@ #ifndef SIMGRID_KERNEL_ACTIVITY_MAILBOX_HPP #define SIMGRID_KERNEL_ACTIVITY_MAILBOX_HPP -#include -#include - #include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Mailbox.hpp" #include "src/kernel/activity/CommImpl.hpp" #include "src/kernel/actor/ActorImpl.hpp" +#include + namespace simgrid::kernel::activity { /** @brief Implementation of the s4u::Mailbox */ @@ -22,7 +21,7 @@ class MailboxImpl { static constexpr size_t MAX_MAILBOX_SIZE = 10000000; s4u::Mailbox piface_; - xbt::string name_; + std::string name_; actor::ActorImplPtr permanent_receiver_; // actor to which the mailbox is attached boost::circular_buffer_space_optimized comm_queue_{MAX_MAILBOX_SIZE}; // messages already received in the permanent receive mode @@ -48,13 +47,13 @@ public: const s4u::Mailbox* get_iface() const { return &piface_; } s4u::Mailbox* get_iface() { return &piface_; } - const xbt::string& get_name() const { return name_; } + 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(CommImplPtr comm); void push_done(CommImplPtr done_comm) { done_comm_queue_.push_back(done_comm); } void remove(const CommImplPtr& comm); - void clear(bool do_post ); + void clear(bool do_finish); CommImplPtr iprobe(int type, const std::function& match_fun, void* data); CommImplPtr find_matching_comm(CommImplType type, const std::function& match_fun, void* this_user_data, const CommImplPtr& my_synchro, bool done, bool remove_matching);