X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b214b15ec055be50978640d04708fb5f64abe53c..84402e8e2ee2a2d0bef25fdceb0a263ed8b471f6:/src/kernel/activity/MailboxImpl.hpp diff --git a/src/kernel/activity/MailboxImpl.hpp b/src/kernel/activity/MailboxImpl.hpp index ac05e6688e..956b021032 100644 --- a/src/kernel/activity/MailboxImpl.hpp +++ b/src/kernel/activity/MailboxImpl.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2020. 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. */ @@ -29,10 +29,7 @@ class MailboxImpl { friend s4u::Mailbox* s4u::Mailbox::by_name(const std::string& name); friend mc::CommunicationDeterminismChecker; - explicit MailboxImpl(const std::string& name) - : piface_(this), name_(name), comm_queue_(MAX_MAILBOX_SIZE), done_comm_queue_(MAX_MAILBOX_SIZE) - { - } + explicit MailboxImpl(const std::string& name) : piface_(this), name_(name) {} public: const xbt::string& get_name() const { return name_; } @@ -42,14 +39,14 @@ public: void set_receiver(s4u::ActorPtr actor); 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 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, const CommImplPtr& my_synchro, bool done, bool remove_matching); actor::ActorImplPtr permanent_receiver_; // actor to which the mailbox is attached - boost::circular_buffer_space_optimized comm_queue_; - boost::circular_buffer_space_optimized done_comm_queue_; // messages already received in the permanent - // receive mode + boost::circular_buffer_space_optimized comm_queue_{MAX_MAILBOX_SIZE}; + // messages already received in the permanent receive mode + boost::circular_buffer_space_optimized done_comm_queue_{MAX_MAILBOX_SIZE}; }; } // namespace activity } // namespace kernel