X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/22b5d20a7e430ab8d5b69ef1e6a422309d45814d..HEAD:/teshsuite/s4u/actor/actor.cpp

diff --git a/teshsuite/s4u/actor/actor.cpp b/teshsuite/s4u/actor/actor.cpp
index c742c2b41e..37548fb614 100644
--- a/teshsuite/s4u/actor/actor.cpp
+++ b/teshsuite/s4u/actor/actor.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2023. 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. */
@@ -10,9 +10,11 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this s4u example")
 static void worker()
 {
   simgrid::s4u::this_actor::sleep_for(.5);
-  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 ");
+  XBT_INFO("Worker started (PID:%ld, PPID:%ld)", simgrid::s4u::this_actor::get_pid(),
+           simgrid::s4u::this_actor::get_ppid());
+  while (simgrid::s4u::this_actor::get_host()->is_on()) {
+    simgrid::s4u::this_actor::yield();
+    XBT_INFO("Plop i am not suspended");
     simgrid::s4u::this_actor::sleep_for(1);
   }
   XBT_INFO("I'm done. See you!");
@@ -21,47 +23,44 @@ static void worker()
 static void master()
 {
   simgrid::s4u::this_actor::sleep_for(1);
-  std::vector<simgrid::s4u::ActorPtr>* actor_list = new std::vector<simgrid::s4u::ActorPtr>();
-  simgrid::s4u::this_actor::host()->actorList(actor_list);
+  std::vector<simgrid::s4u::ActorPtr> actor_list = simgrid::s4u::this_actor::get_host()->get_all_actors();
 
-  for (auto actor : *actor_list) {
-    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())
+  for (auto const& actor : actor_list) {
+    XBT_INFO("Actor (pid=%ld, ppid=%ld, name=%s)", actor->get_pid(), actor->get_ppid(), actor->get_cname());
+    if (simgrid::s4u::this_actor::get_pid() != actor->get_pid())
       actor->kill();
   }
 
   simgrid::s4u::ActorPtr actor =
-      simgrid::s4u::Actor::createActor("worker from master", simgrid::s4u::this_actor::host(), worker);
+      simgrid::s4u::Actor::create("worker from master", simgrid::s4u::this_actor::get_host(), worker);
   simgrid::s4u::this_actor::sleep_for(2);
 
-  XBT_INFO("Suspend Actor (pid=%lu)", actor->pid());
+  XBT_INFO("Suspend Actor (pid=%ld)", actor->get_pid());
   actor->suspend();
 
-  XBT_INFO("Actor (pid=%lu) is %ssuspended", actor->pid(), actor->isSuspended() ? "" : "not ");
+  XBT_INFO("Actor (pid=%ld) is %ssuspended", actor->get_pid(), actor->is_suspended() ? "" : "not ");
   simgrid::s4u::this_actor::sleep_for(2);
 
-  XBT_INFO("Resume Actor (pid=%lu)", actor->pid());
+  XBT_INFO("Resume Actor (pid=%ld)", actor->get_pid());
   actor->resume();
 
-  XBT_INFO("Actor (pid=%lu) is %ssuspended", actor->pid(), actor->isSuspended() ? "" : "not ");
+  XBT_INFO("Actor (pid=%ld) is %ssuspended", actor->get_pid(), actor->is_suspended() ? "" : "not ");
   simgrid::s4u::this_actor::sleep_for(2);
   actor->kill();
 
-  delete actor_list;
   XBT_INFO("Goodbye now!");
 }
 
 int main(int argc, char* argv[])
 {
-  simgrid::s4u::Engine* e = new simgrid::s4u::Engine(&argc, argv);
-  e->loadPlatform(argv[1]);
+  simgrid::s4u::Engine e(&argc, argv);
+  e.load_platform(argv[1]);
 
-  simgrid::s4u::Actor::createActor("master", simgrid::s4u::Host::by_name("Tremblay"), master);
-  simgrid::s4u::Actor::createActor("worker", simgrid::s4u::Host::by_name("Tremblay"), worker);
+  simgrid::s4u::Actor::create("master", e.host_by_name("Tremblay"), master);
+  simgrid::s4u::Actor::create("worker", e.host_by_name("Tremblay"), worker);
 
-  e->run();
-  XBT_INFO("Simulation time %g", e->getClock());
+  e.run();
+  XBT_INFO("Simulation time %g", simgrid::s4u::Engine::get_clock());
 
-  delete e;
   return 0;
 }