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
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
s4u
/
s4u_actor.cpp
diff --git
a/src/s4u/s4u_actor.cpp
b/src/s4u/s4u_actor.cpp
index
bfc88d3
..
3d8a38e
100644
(file)
--- a/
src/s4u/s4u_actor.cpp
+++ b/
src/s4u/s4u_actor.cpp
@@
-75,7
+75,7
@@
void Actor::migrate(Host* new_host)
simgrid::simix::kernelImmediate([this, new_host]() { pimpl_->new_host = new_host; });
}
simgrid::simix::kernelImmediate([this, new_host]() { pimpl_->new_host = new_host; });
}
-s4u::Host* Actor::
h
ost()
+s4u::Host* Actor::
getH
ost()
{
return this->pimpl_->host;
}
{
return this->pimpl_->host;
}
@@
-85,22
+85,22
@@
void Actor::daemonize()
simgrid::simix::kernelImmediate([this]() { pimpl_->daemonize(); });
}
simgrid::simix::kernelImmediate([this]() { pimpl_->daemonize(); });
}
-const char* Actor::
c
name()
+const char* Actor::
getC
name()
{
return this->pimpl_->name.c_str();
}
{
return this->pimpl_->name.c_str();
}
-simgrid::xbt::string Actor::
n
ame()
+simgrid::xbt::string Actor::
getN
ame()
{
return this->pimpl_->name;
}
{
return this->pimpl_->name;
}
-aid_t Actor::
p
id()
+aid_t Actor::
getP
id()
{
return this->pimpl_->pid;
}
{
return this->pimpl_->pid;
}
-aid_t Actor::
p
pid()
+aid_t Actor::
getP
pid()
{
return this->pimpl_->ppid;
}
{
return this->pimpl_->ppid;
}
@@
-112,21
+112,22
@@
void Actor::suspend()
void Actor::resume()
{
void Actor::resume()
{
- sim
call_process_resume(pimpl_
);
+ sim
grid::simix::kernelImmediate([this] { pimpl_->resume(); }
);
}
int Actor::isSuspended()
{
}
int Actor::isSuspended()
{
- return simgrid::simix::kernelImmediate([this]
()
{ return pimpl_->suspended; });
+ return simgrid::simix::kernelImmediate([this] { return pimpl_->suspended; });
}
void Actor::setKillTime(double time) {
simcall_process_set_kill_time(pimpl_,time);
}
}
void Actor::setKillTime(double time) {
simcall_process_set_kill_time(pimpl_,time);
}
-double Actor::killTime()
+/** \brief Get the kill time of an actor(or 0 if unset). */
+double Actor::getKillTime()
{
{
- return
simcall_process_get_kill_time(pimpl_
);
+ return
SIMIX_timer_get_date(pimpl_->kill_timer
);
}
void Actor::kill(aid_t pid)
}
void Actor::kill(aid_t pid)
@@
-171,10
+172,11
@@
void Actor::killAll(int resetPid)
}
/** Retrieve the property value (or nullptr if not set) */
}
/** Retrieve the property value (or nullptr if not set) */
-const char* Actor::
p
roperty(const char* key)
+const char* Actor::
getP
roperty(const char* key)
{
return (char*)xbt_dict_get_or_null(simcall_process_get_properties(pimpl_), key);
}
{
return (char*)xbt_dict_get_or_null(simcall_process_get_properties(pimpl_), key);
}
+
void Actor::setProperty(const char* key, const char* value)
{
simgrid::simix::kernelImmediate([this, key, value] {
void Actor::setProperty(const char* key, const char* value)
{
simgrid::simix::kernelImmediate([this, key, value] {
@@
-214,77
+216,57
@@
XBT_PUBLIC(void) sleep_until(double timeout)
simcall_process_sleep(timeout - now);
}
simcall_process_sleep(timeout - now);
}
-e_smx_state_t execute(double flops) {
+void execute(double flops)
+{
smx_activity_t s = simcall_execution_start(nullptr,flops,1.0/*priority*/,0./*bound*/);
smx_activity_t s = simcall_execution_start(nullptr,flops,1.0/*priority*/,0./*bound*/);
-
return
simcall_execution_wait(s);
+ simcall_execution_wait(s);
}
void* recv(MailboxPtr chan) {
}
void* recv(MailboxPtr chan) {
- void *res = nullptr;
- CommPtr c = Comm::recv_init(chan);
- c->setDstData(&res, sizeof(res));
- c->wait();
- return res;
+ return chan->get();
}
void* recv(MailboxPtr chan, double timeout)
{
}
void* recv(MailboxPtr chan, double timeout)
{
- void* res = nullptr;
- CommPtr c = Comm::recv_init(chan);
- c->setDstData(&res, sizeof(res));
- c->wait(timeout);
- return res;
+ return chan->get(timeout);
}
void send(MailboxPtr chan, void* payload, double simulatedSize)
{
}
void send(MailboxPtr chan, void* payload, double simulatedSize)
{
- CommPtr c = Comm::send_init(chan);
- c->setRemains(simulatedSize);
- c->setSrcData(payload);
- // c->start() is optional.
- c->wait();
+ chan->put(payload, simulatedSize);
}
void send(MailboxPtr chan, void* payload, double simulatedSize, double timeout)
{
}
void send(MailboxPtr chan, void* payload, double simulatedSize, double timeout)
{
- CommPtr c = Comm::send_init(chan);
- c->setRemains(simulatedSize);
- c->setSrcData(payload);
- // c->start() is optional.
- c->wait(timeout);
+ chan->put(payload, simulatedSize, timeout);
}
CommPtr isend(MailboxPtr chan, void* payload, double simulatedSize)
{
}
CommPtr isend(MailboxPtr chan, void* payload, double simulatedSize)
{
- return Comm::send_async(chan, payload, simulatedSize);
-}
-
-void dsend(MailboxPtr chan, void* payload, double simulatedSize)
-{
- Comm::send_detached(chan, payload, simulatedSize);
+ return chan->put_async(payload, simulatedSize);
}
CommPtr irecv(MailboxPtr chan, void** data)
{
}
CommPtr irecv(MailboxPtr chan, void** data)
{
- return
Comm::recv_async(chan,
data);
+ return
chan->get_async(
data);
}
}
-aid_t
p
id()
+aid_t
getP
id()
{
return SIMIX_process_self()->pid;
}
{
return SIMIX_process_self()->pid;
}
-aid_t
p
pid()
+aid_t
getP
pid()
{
return SIMIX_process_self()->ppid;
}
{
return SIMIX_process_self()->ppid;
}
-std::string
n
ame()
+std::string
getN
ame()
{
return SIMIX_process_self()->name;
}
{
return SIMIX_process_self()->name;
}
-Host*
h
ost()
+Host*
getH
ost()
{
return SIMIX_process_self()->host;
}
{
return SIMIX_process_self()->host;
}
@@
-296,7
+278,8
@@
void suspend()
void resume()
{
void resume()
{
- simcall_process_resume(SIMIX_process_self());
+ smx_actor_t process = SIMIX_process_self();
+ simgrid::simix::kernelImmediate([process] { process->resume(); });
}
bool isSuspended()
}
bool isSuspended()