- void* other_user_data = nullptr;
- boost::circular_buffer_space_optimized<smx_activity_t>* deque;
- if (done)
- deque = &done_comm_queue_;
- else
- deque = &comm_queue_;
-
- for (auto it = deque->begin(); it != deque->end(); it++) {
- CommImplPtr comm = boost::static_pointer_cast<CommImpl>(std::move(*it));
-
- if (comm->type == CommImpl::Type::SEND) {
- other_user_data = comm->src_data_;
- } else if (comm->type == CommImpl::Type::RECEIVE) {
- other_user_data = comm->dst_data_;
- }
- if (comm->type == type && (match_fun == nullptr || match_fun(this_user_data, other_user_data, comm.get())) &&
- (not comm->match_fun || comm->match_fun(other_user_data, this_user_data, my_synchro.get()))) {
- XBT_DEBUG("Found a matching communication synchro %p", comm.get());
- if (remove_matching)
- deque->erase(it);
-#if SIMGRID_HAVE_MC
- comm->mbox_cpy = comm->mbox;
-#endif
- comm->mbox = nullptr;
- return comm;
- }
- XBT_DEBUG("Sorry, communication synchro %p does not match our needs:"
- " its type is %d but we are looking for a comm of type %d (or maybe the filtering didn't match)",
- comm.get(), (int)comm->type, (int)type);
+ auto& comm_queue = done ? done_comm_queue_ : comm_queue_;
+
+ auto iter = std::find_if(
+ comm_queue.begin(), comm_queue.end(), [&type, &match_fun, &this_user_data, &my_synchro](const CommImplPtr& comm) {
+ void* other_user_data = (comm->get_type() == CommImplType::SEND ? comm->src_data_ : comm->dst_data_);
+ return (comm->get_type() == type && (not match_fun || match_fun(this_user_data, other_user_data, comm.get())) &&
+ (not comm->match_fun || comm->match_fun(other_user_data, this_user_data, my_synchro.get())));
+ });
+ if (iter == comm_queue.end()) {
+ XBT_DEBUG("No matching communication synchro found");
+ return nullptr;