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
introduce type aid_t for Actor's ID (ie, PID)
[simgrid.git]
/
teshsuite
/
s4u
/
actor
/
actor.cpp
diff --git
a/teshsuite/s4u/actor/actor.cpp
b/teshsuite/s4u/actor/actor.cpp
index
d7a8628
..
3be9b12
100644
(file)
--- a/
teshsuite/s4u/actor/actor.cpp
+++ b/
teshsuite/s4u/actor/actor.cpp
@@
-10,7
+10,7
@@
XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this s4u example")
static void worker()
{
simgrid::s4u::this_actor::sleep_for(.5);
static void worker()
{
simgrid::s4u::this_actor::sleep_for(.5);
- XBT_INFO("Worker started (PID:%
d, PPID:%d
)", simgrid::s4u::this_actor::pid(), simgrid::s4u::this_actor::ppid());
+ XBT_INFO("Worker started (PID:%
lu, PPID:%lu
)", simgrid::s4u::this_actor::pid(), simgrid::s4u::this_actor::ppid());
while (1) {
XBT_INFO("Plop i am %ssuspended", simgrid::s4u::this_actor::isSuspended() ? "" : "not ");
simgrid::s4u::this_actor::sleep_for(1);
while (1) {
XBT_INFO("Plop i am %ssuspended", simgrid::s4u::this_actor::isSuspended() ? "" : "not ");
simgrid::s4u::this_actor::sleep_for(1);
@@
-25,7
+25,7
@@
static void master()
simgrid::s4u::this_actor::host()->actorList(actor_list);
for (auto actor : *actor_list) {
simgrid::s4u::this_actor::host()->actorList(actor_list);
for (auto actor : *actor_list) {
- XBT_INFO("Actor (pid=%
d, ppid=%d
, name=%s)", actor->pid(), actor->ppid(), actor->name().c_str());
+ XBT_INFO("Actor (pid=%
lu, ppid=%lu
, name=%s)", actor->pid(), actor->ppid(), actor->name().c_str());
if (simgrid::s4u::this_actor::pid() != actor->pid())
actor->kill();
}
if (simgrid::s4u::this_actor::pid() != actor->pid())
actor->kill();
}
@@
-34,16
+34,16
@@
static void master()
simgrid::s4u::Actor::createActor("worker from master", simgrid::s4u::this_actor::host(), worker);
simgrid::s4u::this_actor::sleep_for(2);
simgrid::s4u::Actor::createActor("worker from master", simgrid::s4u::this_actor::host(), worker);
simgrid::s4u::this_actor::sleep_for(2);
- XBT_INFO("Suspend Actor (pid=%
d
)", actor->pid());
+ XBT_INFO("Suspend Actor (pid=%
lu
)", actor->pid());
actor->suspend();
actor->suspend();
- XBT_INFO("Actor (pid=%
d
) is %ssuspended", actor->pid(), actor->isSuspended() ? "" : "not ");
+ XBT_INFO("Actor (pid=%
lu
) is %ssuspended", actor->pid(), actor->isSuspended() ? "" : "not ");
simgrid::s4u::this_actor::sleep_for(2);
simgrid::s4u::this_actor::sleep_for(2);
- XBT_INFO("Resume Actor (pid=%
d
)", actor->pid());
+ XBT_INFO("Resume Actor (pid=%
lu
)", actor->pid());
actor->resume();
actor->resume();
- XBT_INFO("Actor (pid=%
d
) is %ssuspended", actor->pid(), actor->isSuspended() ? "" : "not ");
+ XBT_INFO("Actor (pid=%
lu
) is %ssuspended", actor->pid(), actor->isSuspended() ? "" : "not ");
simgrid::s4u::this_actor::sleep_for(2);
actor->kill();
simgrid::s4u::this_actor::sleep_for(2);
actor->kill();