From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Tue, 1 Mar 2022 18:35:53 +0000 (+0000)
Subject: Merge branch 'dev' into 'master'
X-Git-Tag: v3.31~258
X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/14df1b2b0538cba0da86ce62f01863d7d2c156c0

Merge branch 'dev' into 'master'

Minimal changes to support hosts on/off

See merge request simgrid/simgrid!77
---

14df1b2b0538cba0da86ce62f01863d7d2c156c0
diff --cc src/kernel/activity/MailboxImpl.hpp
index b9c1214e7b,21a8c455a7..541283e441
--- a/src/kernel/activity/MailboxImpl.hpp
+++ b/src/kernel/activity/MailboxImpl.hpp
@@@ -52,8 -54,9 +54,9 @@@ public
    void push(CommImplPtr comm);
    void push_done(CommImplPtr done_comm) { done_comm_queue_.push_back(done_comm); }
    void remove(const CommImplPtr& comm);
+   void clear();
    CommImplPtr iprobe(int type, bool (*match_fun)(void*, void*, CommImpl*), void* data);
 -  CommImplPtr find_matching_comm(CommImpl::Type type, bool (*match_fun)(void*, void*, CommImpl*), void* this_user_data,
 +  CommImplPtr find_matching_comm(CommImplType type, bool (*match_fun)(void*, void*, CommImpl*), 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_; }