-/* Copyright (c) 2006-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-2019. 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. */
#include "simgrid/s4u/Comm.hpp"
#include "simgrid/s4u/Mailbox.hpp"
#include "src/kernel/activity/MailboxImpl.hpp"
+
#include <simgrid/mailbox.h>
XBT_LOG_EXTERNAL_CATEGORY(s4u);
return pimpl_->get_cname();
}
-MailboxPtr Mailbox::by_name(std::string name)
+MailboxPtr Mailbox::by_name(const std::string& name)
{
kernel::activity::MailboxImpl* mbox = kernel::activity::MailboxImpl::by_name_or_null(name);
if (mbox == nullptr) {
return comm_ready;
}
-smx_activity_t Mailbox::front()
+kernel::activity::CommImplPtr Mailbox::front()
{
return pimpl_->comm_queue_.empty() ? nullptr : pimpl_->comm_queue_.front();
}
c->set_remaining(simulated_size_in_bytes);
c->set_src_data(payload);
// c->start() is optional.
- c->wait(timeout);
+ c->wait_for(timeout);
}
s4u::CommPtr Mailbox::get_init()
void* res = nullptr;
CommPtr c = get_init();
c->set_dst_data(&res, sizeof(res));
- c->wait(timeout);
+ c->wait_for(timeout);
return res;
}
+
+smx_activity_t Mailbox::iprobe(int type, int (*match_fun)(void*, void*, kernel::activity::CommImpl*), void* data)
+{
+ return simix::simcall([this, type, match_fun, data] { return pimpl_->iprobe(type, match_fun, data); });
+}
} // namespace s4u
} // namespace simgrid