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
Fix a doc error about actors (Tutorial_algorithms)
[simgrid.git]
/
src
/
s4u
/
s4u_Mailbox.cpp
diff --git
a/src/s4u/s4u_Mailbox.cpp
b/src/s4u/s4u_Mailbox.cpp
index
8156900
..
d9d6c6c
100644
(file)
--- a/
src/s4u/s4u_Mailbox.cpp
+++ b/
src/s4u/s4u_Mailbox.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2006-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-201
9
. 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. */
@@
-6,6
+6,7
@@
#include "simgrid/s4u/Comm.hpp"
#include "simgrid/s4u/Mailbox.hpp"
#include "src/kernel/activity/MailboxImpl.hpp"
#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);
#include <simgrid/mailbox.h>
XBT_LOG_EXTERNAL_CATEGORY(s4u);
@@
-14,7
+15,7
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_channel, s4u, "S4U Communication Mailboxes")
namespace simgrid {
namespace s4u {
namespace simgrid {
namespace s4u {
-const
simgrid::
xbt::string& Mailbox::get_name() const
+const xbt::string& Mailbox::get_name() const
{
return pimpl_->get_name();
}
{
return pimpl_->get_name();
}
@@
-24,13
+25,13
@@
const char* Mailbox::get_cname() const
return pimpl_->get_cname();
}
return pimpl_->get_cname();
}
-Mailbox
Ptr Mailbox::by_name(std::string
name)
+Mailbox
* Mailbox::by_name(const std::string&
name)
{
kernel::activity::MailboxImpl* mbox = kernel::activity::MailboxImpl::by_name_or_null(name);
if (mbox == nullptr) {
{
kernel::activity::MailboxImpl* mbox = kernel::activity::MailboxImpl::by_name_or_null(name);
if (mbox == nullptr) {
- mbox =
simix::simcall([
name] { return kernel::activity::MailboxImpl::by_name_or_create(name); });
+ mbox =
kernel::actor::simcall([&
name] { return kernel::activity::MailboxImpl::by_name_or_create(name); });
}
}
- return
MailboxPtr(&mbox->piface_, true)
;
+ return
&mbox->piface_
;
}
bool Mailbox::empty()
}
bool Mailbox::empty()
@@
-55,14
+56,14
@@
bool Mailbox::ready()
return comm_ready;
}
return comm_ready;
}
-
smx_activity_t
Mailbox::front()
+
kernel::activity::CommImplPtr
Mailbox::front()
{
return pimpl_->comm_queue_.empty() ? nullptr : pimpl_->comm_queue_.front();
}
void Mailbox::set_receiver(ActorPtr actor)
{
{
return pimpl_->comm_queue_.empty() ? nullptr : pimpl_->comm_queue_.front();
}
void Mailbox::set_receiver(ActorPtr actor)
{
-
simix
::simcall([this, actor]() { this->pimpl_->set_receiver(actor); });
+
kernel::actor
::simcall([this, actor]() { this->pimpl_->set_receiver(actor); });
}
/** @brief get the receiver (process associated to the mailbox) */
}
/** @brief get the receiver (process associated to the mailbox) */
@@
-114,7
+115,7
@@
void Mailbox::put(void* payload, uint64_t simulated_size_in_bytes, double timeou
c->set_remaining(simulated_size_in_bytes);
c->set_src_data(payload);
// c->start() is optional.
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()
}
s4u::CommPtr Mailbox::get_init()
@@
-145,9
+146,14
@@
void* Mailbox::get(double timeout)
void* res = nullptr;
CommPtr c = get_init();
c->set_dst_data(&res, sizeof(res));
void* res = nullptr;
CommPtr c = get_init();
c->set_dst_data(&res, sizeof(res));
- c->wait(timeout);
+ c->wait
_for
(timeout);
return res;
}
return res;
}
+
+smx_activity_t Mailbox::iprobe(int type, int (*match_fun)(void*, void*, kernel::activity::CommImpl*), void* data)
+{
+ return kernel::actor::simcall([this, type, match_fun, data] { return pimpl_->iprobe(type, match_fun, data); });
+}
} // namespace s4u
} // namespace simgrid
} // namespace s4u
} // namespace simgrid