A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Modernize simcall_execution_test().
[simgrid.git]
/
src
/
kernel
/
activity
/
MailboxImpl.cpp
diff --git
a/src/kernel/activity/MailboxImpl.cpp
b/src/kernel/activity/MailboxImpl.cpp
index
3137c62
..
7be3b40
100644
(file)
--- a/
src/kernel/activity/MailboxImpl.cpp
+++ b/
src/kernel/activity/MailboxImpl.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-20
20
. 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. */
/* 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. */
@@
-85,7
+85,7
@@
void MailboxImpl::remove(const CommImplPtr& comm)
xbt_die("Comm %p not found in mailbox %s", comm.get(), this->get_cname());
}
xbt_die("Comm %p not found in mailbox %s", comm.get(), this->get_cname());
}
-CommImplPtr MailboxImpl::iprobe(int type,
int
(*match_fun)(void*, void*, CommImpl*), void* data)
+CommImplPtr MailboxImpl::iprobe(int type,
bool
(*match_fun)(void*, void*, CommImpl*), void* data)
{
XBT_DEBUG("iprobe from %p %p", this, &comm_queue_);
{
XBT_DEBUG("iprobe from %p %p", this, &comm_queue_);
@@
-122,7
+122,7
@@
CommImplPtr MailboxImpl::iprobe(int type, int (*match_fun)(void*, void*, CommImp
* @param remove_matching whether or not to clean the found object from the queue
* @return The communication activity if found, nullptr otherwise
*/
* @param remove_matching whether or not to clean the found object from the queue
* @return The communication activity if found, nullptr otherwise
*/
-CommImplPtr MailboxImpl::find_matching_comm(CommImpl::Type type,
int
(*match_fun)(void*, void*, CommImpl*),
+CommImplPtr MailboxImpl::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)
{
void* this_user_data, const CommImplPtr& my_synchro, bool done,
bool remove_matching)
{
@@
-130,7
+130,7
@@
CommImplPtr MailboxImpl::find_matching_comm(CommImpl::Type type, int (*match_fun
auto& comm_queue = done ? done_comm_queue_ : comm_queue_;
for (auto it = comm_queue.begin(); it != comm_queue.end(); it++) {
auto& comm_queue = done ? done_comm_queue_ : comm_queue_;
for (auto it = comm_queue.begin(); it != comm_queue.end(); it++) {
- CommImplPtr& comm = *it;
+
const
CommImplPtr& comm = *it;
if (comm->type_ == CommImpl::Type::SEND) {
other_user_data = comm->src_data_;
if (comm->type_ == CommImpl::Type::SEND) {
other_user_data = comm->src_data_;