Keep the right definition for type_names[].

[simgrid.git] / examples / c / actor-daemon / actor-daemon.c

diff --git a/examples/c/actor-daemon/actor-daemon.c b/examples/c/actor-daemon/actor-daemon.c
index 56e0f62a1e510a5265b44ea48382fc1ca486dbb4..e62a1299d9f1c2431a5e712ae77be18e42c083d9 100644 (file)
--- a/examples/c/actor-daemon/actor-daemon.c
+++ b/examples/c/actor-daemon/actor-daemon.c
@@ -11,16 +11,16 @@
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(actor_daemon, "Messages specific for this example");
 
-/* The worker process, working for a while before leaving */
-static void worker(XBT_ATTRIB_UNUSED int argc, XBT_ATTRIB_UNUSED char* argv[])
+/* The worker actor, working for a while before leaving */
+static void worker(int argc, char* argv[])
 {
   XBT_INFO("Let's do some work (for 10 sec on Boivin).");
-  sg_actor_self_execute(980.95e6);
+  sg_actor_execute(980.95e6);
   XBT_INFO("I'm done now. I leave even if it makes the daemon die.");
 }
 
-/* The daemon, displaying a message every 3 seconds until all other processes stop */
-static void my_daemon(XBT_ATTRIB_UNUSED int argc, XBT_ATTRIB_UNUSED char* argv[])
+/* The daemon, displaying a message every 3 seconds until all other actors stop */
+static void my_daemon(int argc, char* argv[])
 {
   sg_actor_daemonize(sg_actor_self());
 
@@ -29,7 +29,7 @@ static void my_daemon(XBT_ATTRIB_UNUSED int argc, XBT_ATTRIB_UNUSED char* argv[]
     sg_actor_sleep_for(3.0);
   }
 
-  XBT_INFO("I will never reach that point: daemons are killed when regular processes are done");
+  XBT_INFO("I will never reach that point: daemons are killed when regular actors are done");
 }
 
 int main(int argc, char* argv[])
@@ -38,10 +38,8 @@ int main(int argc, char* argv[])
   xbt_assert(argc > 1, "Usage: %s platform.xml\n", argv[0]);
   simgrid_load_platform(argv[1]);
 
-  sg_actor_t w = sg_actor_init("worker", sg_host_by_name("Boivin"));
-  sg_actor_start(w, worker, 0, NULL);
-  sg_actor_t d = sg_actor_init("daemon", sg_host_by_name("Tremblay"));
-  sg_actor_start(d, my_daemon, 0, NULL);
+  sg_actor_create("worker", sg_host_by_name("Boivin"), worker, 0, NULL);
+  sg_actor_create("daemon", sg_host_by_name("Tremblay"), my_daemon, 0, NULL);
 
   simgrid_run();
 }