Do not call actors processes in S4U examples

diff --git a/examples/c/actor-daemon/actor-daemon.c b/examples/c/actor-daemon/actor-daemon.c
index 852e23e..d73c67f 100644 (file)
--- a/examples/c/actor-daemon/actor-daemon.c
+++ b/examples/c/actor-daemon/actor-daemon.c
@@ -11,7 +11,7 @@
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(actor_daemon, "Messages specific for this example");
 
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(actor_daemon, "Messages specific for this example");
 

-/* The worker process, working for a while before leaving */
+/* The worker actor, working for a while before leaving */

 static void worker(XBT_ATTRIB_UNUSED int argc, XBT_ATTRIB_UNUSED char* argv[])
 {
   XBT_INFO("Let's do some work (for 10 sec on Boivin).");
 static void worker(XBT_ATTRIB_UNUSED int argc, XBT_ATTRIB_UNUSED char* argv[])
 {
   XBT_INFO("Let's do some work (for 10 sec on Boivin).");


@@ -19,7 +19,7 @@ static void worker(XBT_ATTRIB_UNUSED int argc, XBT_ATTRIB_UNUSED char* argv[])
   XBT_INFO("I'm done now. I leave even if it makes the daemon die.");
 }
 
   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 */
+/* The daemon, displaying a message every 3 seconds until all other actors stop */

 static void my_daemon(XBT_ATTRIB_UNUSED int argc, XBT_ATTRIB_UNUSED char* argv[])
 {
   sg_actor_daemonize(sg_actor_self());
 static void my_daemon(XBT_ATTRIB_UNUSED int argc, XBT_ATTRIB_UNUSED 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);
   }
 
     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[])
 }
 
 int main(int argc, char* argv[])

diff --git a/examples/c/actor-kill/actor-kill.c b/examples/c/actor-kill/actor-kill.c
index 417efd7..01247d8 100644 (file)
--- a/examples/c/actor-kill/actor-kill.c
+++ b/examples/c/actor-kill/actor-kill.c
@@ -36,7 +36,7 @@ static void victimB_fun(XBT_ATTRIB_UNUSED int argc, XBT_ATTRIB_UNUSED char* argv
 
 static void killer_fun(XBT_ATTRIB_UNUSED int argc, XBT_ATTRIB_UNUSED char* argv[])
 {
 
 static void killer_fun(XBT_ATTRIB_UNUSED int argc, XBT_ATTRIB_UNUSED char* argv[])
 {

-  XBT_INFO("Hello!"); /* - First start a victim process */
+  XBT_INFO("Hello!"); /* - First start a victim actor */

   sg_actor_t victimA = sg_actor_create("victim A", sg_host_by_name("Fafard"), victimA_fun, 0, NULL);
 
   sg_actor_t victimB = sg_actor_create("victim B", sg_host_by_name("Jupiter"), victimB_fun, 0, NULL);
   sg_actor_t victimA = sg_actor_create("victim A", sg_host_by_name("Fafard"), victimA_fun, 0, NULL);
 
   sg_actor_t victimB = sg_actor_create("victim B", sg_host_by_name("Jupiter"), victimB_fun, 0, NULL);


@@ -78,7 +78,7 @@ int main(int argc, char* argv[])
 
   simgrid_load_platform(argv[1]);
 
 
   simgrid_load_platform(argv[1]);
 

-  /* - Create and deploy killer process, that will create the victim process  */
+  /* - Create and deploy killer actor, that will create the victim actor  */

   sg_actor_create("killer", sg_host_by_name("Tremblay"), killer_fun, 0, NULL);
 
   simgrid_run();
   sg_actor_create("killer", sg_host_by_name("Tremblay"), killer_fun, 0, NULL);
 
   simgrid_run();

diff --git a/examples/c/actor-lifetime/actor-lifetime.c b/examples/c/actor-lifetime/actor-lifetime.c
index 10c6e35..25ac97e 100644 (file)
--- a/examples/c/actor-lifetime/actor-lifetime.c
+++ b/examples/c/actor-lifetime/actor-lifetime.c
@@ -13,7 +13,7 @@
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(test, "Messages specific for this example");
 
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(test, "Messages specific for this example");
 

-/* Executed on process termination*/
+/* Executed on actor termination*/

 static int my_onexit(XBT_ATTRIB_UNUSED int ignored1, XBT_ATTRIB_UNUSED void* ignored2)
 {
   XBT_INFO("Exiting now (done sleeping or got killed)."); /* - Just display an informative message (see tesh file) */
 static int my_onexit(XBT_ATTRIB_UNUSED int ignored1, XBT_ATTRIB_UNUSED void* ignored2)
 {
   XBT_INFO("Exiting now (done sleeping or got killed)."); /* - Just display an informative message (see tesh file) */


@@ -40,7 +40,7 @@ int main(int argc, char* argv[])
 
   simgrid_load_platform(argv[1]); /* - Load the platform description */
   simgrid_register_function("sleeper", sleeper);
 
   simgrid_load_platform(argv[1]); /* - Load the platform description */
   simgrid_register_function("sleeper", sleeper);

-  simgrid_load_deployment(argv[2]); /* - Deploy the sleeper processes with explicit start/kill times */
+  simgrid_load_deployment(argv[2]); /* - Deploy the sleeper actors with explicit start/kill times */

 
   simgrid_run(); /* - Run the simulation */
 
 
   simgrid_run(); /* - Run the simulation */
 

diff --git a/examples/c/actor-migrate/actor-migrate.c b/examples/c/actor-migrate/actor-migrate.c
index a8e6fd5..326512c 100644 (file)
--- a/examples/c/actor-migrate/actor-migrate.c
+++ b/examples/c/actor-migrate/actor-migrate.c
@@ -46,11 +46,11 @@ static void monitor(XBT_ATTRIB_UNUSED int argc, XBT_ATTRIB_UNUSED char* argv[])
 
   sg_actor_sleep_for(5);
 
 
   sg_actor_sleep_for(5);
 

-  XBT_INFO("After 5 seconds, move the process to %s", sg_host_get_name(jacquelin));
+  XBT_INFO("After 5 seconds, move the actor to %s", sg_host_get_name(jacquelin));

   sg_actor_set_host(actor, jacquelin);
 
   sg_actor_sleep_until(15);
   sg_actor_set_host(actor, jacquelin);
 
   sg_actor_sleep_until(15);

-  XBT_INFO("At t=15, move the process to %s and resume it.", sg_host_get_name(fafard));
+  XBT_INFO("At t=15, move the actor to %s and resume it.", sg_host_get_name(fafard));

   sg_actor_set_host(actor, fafard);
   sg_actor_resume(actor);
 }
   sg_actor_set_host(actor, fafard);
   sg_actor_resume(actor);
 }


@@ -61,7 +61,6 @@ int main(int argc, char* argv[])
   xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s msg_platform.xml\n", argv[0], argv[0]);
 
   simgrid_load_platform(argv[1]); /* - Load the platform description */
   xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s msg_platform.xml\n", argv[0], argv[0]);
 
   simgrid_load_platform(argv[1]); /* - Load the platform description */

-  /* - Create and deploy the emigrant and policeman processes */

   sg_actor_create("monitor", sg_host_by_name("Boivin"), monitor, 0, NULL);
 
   simgrid_run();
   sg_actor_create("monitor", sg_host_by_name("Boivin"), monitor, 0, NULL);
 
   simgrid_run();

diff --git a/examples/c/actor-migrate/actor-migrate.tesh b/examples/c/actor-migrate/actor-migrate.tesh
index f85a786..03dfd38 100644 (file)
--- a/examples/c/actor-migrate/actor-migrate.tesh
+++ b/examples/c/actor-migrate/actor-migrate.tesh
@@ -4,8 +4,8 @@ p Testing the actor migration feature
 
 $ ${bindir:=.}/actor-migrate-c ${platfdir:=.}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n"
 > [  0.000000] (worker@Fafard) Let's move to Boivin to execute 1177.14 Mflops (5sec on Boivin and 5sec on Jacquelin)
 
 $ ${bindir:=.}/actor-migrate-c ${platfdir:=.}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n"
 > [  0.000000] (worker@Fafard) Let's move to Boivin to execute 1177.14 Mflops (5sec on Boivin and 5sec on Jacquelin)

-> [  5.000000] (monitor@Boivin) After 5 seconds, move the process to Jacquelin
+> [  5.000000] (monitor@Boivin) After 5 seconds, move the actor to Jacquelin

 > [ 10.000000] (worker@Jacquelin) I wake up on Jacquelin. Let's suspend a bit
 > [ 10.000000] (worker@Jacquelin) I wake up on Jacquelin. Let's suspend a bit

-> [ 15.000000] (monitor@Boivin) At t=15, move the process to Fafard and resume it.
+> [ 15.000000] (monitor@Boivin) At t=15, move the actor to Fafard and resume it.

 > [ 15.000000] (worker@Fafard) I wake up on Fafard
 > [ 15.000000] (worker@Fafard) Done
 > [ 15.000000] (worker@Fafard) I wake up on Fafard
 > [ 15.000000] (worker@Fafard) Done

diff --git a/examples/c/actor-suspend/actor-suspend.c b/examples/c/actor-suspend/actor-suspend.c
index 58b7b9e..01ed3c0 100644 (file)
--- a/examples/c/actor-suspend/actor-suspend.c
+++ b/examples/c/actor-suspend/actor-suspend.c
@@ -13,7 +13,7 @@
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(actor_suspend, "Messages specific for this example");
 
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(actor_suspend, "Messages specific for this example");
 

-/* The Lazy guy only wants to sleep, but can be awaken by the dream_master process. */
+/* The Lazy guy only wants to sleep, but can be awaken by the dream_master actor. */

 static void lazy_guy(XBT_ATTRIB_UNUSED int argc, XBT_ATTRIB_UNUSED char* argv[])
 {
   XBT_INFO("Nobody's watching me ? Let's go to sleep.");
 static void lazy_guy(XBT_ATTRIB_UNUSED int argc, XBT_ATTRIB_UNUSED char* argv[])
 {
   XBT_INFO("Nobody's watching me ? Let's go to sleep.");


@@ -37,7 +37,7 @@ static void lazy_guy(XBT_ATTRIB_UNUSED int argc, XBT_ATTRIB_UNUSED char* argv[])
 /* The Dream master: */
 static void dream_master(XBT_ATTRIB_UNUSED int argc, XBT_ATTRIB_UNUSED char* argv[])
 {
 /* The Dream master: */
 static void dream_master(XBT_ATTRIB_UNUSED int argc, XBT_ATTRIB_UNUSED char* argv[])
 {

-  XBT_INFO("Let's create a lazy guy."); /* - Create a lazy_guy process */
+  XBT_INFO("Let's create a lazy guy."); /* - Create a lazy_guy actor */

   sg_actor_t lazy = sg_actor_create("Lazy", sg_host_self(), lazy_guy, 0, NULL);
   XBT_INFO("Let's wait a little bit...");
   sg_actor_sleep_for(10.0); /* - Wait for 10 seconds */
   sg_actor_t lazy = sg_actor_create("Lazy", sg_host_self(), lazy_guy, 0, NULL);
   XBT_INFO("Let's wait a little bit...");
   sg_actor_sleep_for(10.0); /* - Wait for 10 seconds */

diff --git a/examples/c/actor-yield/actor-yield.c b/examples/c/actor-yield/actor-yield.c
index 8171c61..49f49f5 100644 (file)
--- a/examples/c/actor-yield/actor-yield.c
+++ b/examples/c/actor-yield/actor-yield.c
@@ -10,18 +10,18 @@
 #include "xbt/log.h"
 #include "xbt/str.h"
 
 #include "xbt/log.h"
 #include "xbt/str.h"
 

-/* This example does not much: It just spans over-polite processes that yield a large amount
+/* This example does not much: It just spans over-polite actors that yield a large amount

  * of time before ending.
  *
  * of time before ending.
  *

- * This serves as an example for the sg_process_yield() function, with which a process can request
- * to be rescheduled after the other processes that are ready at the current timestamp.
+ * This serves as an example for the sg_actor_yield() function, with which an actor can request
+ * to be rescheduled after the other actors that are ready at the current timestamp.

  *
  * It can also be used to benchmark our context-switching mechanism.
  */
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(actor_yield, "Messages specific for this example");
 
  *
  * It can also be used to benchmark our context-switching mechanism.
  */
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(actor_yield, "Messages specific for this example");
 

-/* Main function of the Yielder process */
+/* Main function of the Yielder actor */

 static void yielder(int argc, char* argv[])
 {
   xbt_assert(argc == 2, "The sender function expects 1 arguments from the XML deployment file");
 static void yielder(int argc, char* argv[])
 {
   xbt_assert(argc == 2, "The sender function expects 1 arguments from the XML deployment file");


@@ -43,7 +43,7 @@ int main(int argc, char* argv[])
   simgrid_load_platform(argv[1]); /* - Load the platform description */
 
   simgrid_register_function("yielder", yielder);
   simgrid_load_platform(argv[1]); /* - Load the platform description */
 
   simgrid_register_function("yielder", yielder);

-  simgrid_load_deployment(argv[2]); /* - Deploy the sender and receiver processes */
+  simgrid_load_deployment(argv[2]); /* - Deploy the sender and receiver actors */

 
   simgrid_run();
   return 0;
 
   simgrid_run();
   return 0;

diff --git a/examples/c/app-token-ring/app-token-ring.c b/examples/c/app-token-ring/app-token-ring.c
index d7cf8cd..f78e27d 100644 (file)
--- a/examples/c/app-token-ring/app-token-ring.c
+++ b/examples/c/app-token-ring/app-token-ring.c
@@ -62,7 +62,7 @@ int main(int argc, char* argv[])
 
   XBT_INFO("Number of hosts '%zu'", host_count);
   for (size_t i = 0; i < host_count; i++) {
 
   XBT_INFO("Number of hosts '%zu'", host_count);
   for (size_t i = 0; i < host_count; i++) {

-    /* - Give a unique rank to each host and create a @ref relay_runner process on each */
+    /* - Give a unique rank to each host and create a @ref relay_runner actor on each */

     char* name_host  = bprintf("%zu", i);
     sg_actor_create(name_host, hosts[i], relay_runner, 0, NULL);
     free(name_host);
     char* name_host  = bprintf("%zu", i);
     sg_actor_create(name_host, hosts[i], relay_runner, 0, NULL);
     free(name_host);

diff --git a/examples/c/async-wait/async-wait.c b/examples/c/async-wait/async-wait.c
index 994485f..64ba4ef 100644 (file)
--- a/examples/c/async-wait/async-wait.c
+++ b/examples/c/async-wait/async-wait.c
@@ -16,7 +16,7 @@
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(async_wait, "Messages specific for this example");
 
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(async_wait, "Messages specific for this example");
 

-/* Main function of the Sender process */
+/* Main function of the Sender actor */

 static void sender(int argc, char* argv[])
 {
   xbt_assert(argc == 5, "The sender function expects 4 arguments from the XML deployment file");
 static void sender(int argc, char* argv[])
 {
   xbt_assert(argc == 5, "The sender function expects 4 arguments from the XML deployment file");


@@ -49,7 +49,7 @@ static void sender(int argc, char* argv[])
   sg_mailbox_put(mailbox, xbt_strdup("finalize"), 0);
 }
 
   sg_mailbox_put(mailbox, xbt_strdup("finalize"), 0);
 }
 

-/* Receiver process expects 3 arguments: */
+/* Receiver actor expects 3 arguments: */

 static void receiver(int argc, char* argv[])
 {
   xbt_assert(argc == 3, "The relay_runner function does not accept any parameter from the XML deployment file");
 static void receiver(int argc, char* argv[])
 {
   xbt_assert(argc == 3, "The relay_runner function does not accept any parameter from the XML deployment file");

diff --git a/examples/c/async-wait/async-wait2_d.xml b/examples/c/async-wait/async-wait2_d.xml
index 59a4d58..995efac 100644 (file)
--- a/examples/c/async-wait/async-wait2_d.xml
+++ b/examples/c/async-wait/async-wait2_d.xml
@@ -8,7 +8,7 @@
     <argument value="1"/>       <!-- Sleep_start_time -->
     <argument value="0.1"/>     <!-- Time for test -->
   </actor>
     <argument value="1"/>       <!-- Sleep_start_time -->
     <argument value="0.1"/>     <!-- Time for test -->
   </actor>

-  <!-- The receiver processes -->
+  <!-- The receiver actor -->

   <actor host="Ruby" function="receiver">
     <argument value="5"/>       <!-- Sleep_start_time -->
     <argument value="0.1"/>     <!-- Time for test -->
   <actor host="Ruby" function="receiver">
     <argument value="5"/>       <!-- Sleep_start_time -->
     <argument value="0.1"/>     <!-- Time for test -->

diff --git a/examples/c/async-wait/async-wait3_d.xml b/examples/c/async-wait/async-wait3_d.xml
index d5f3e5f..d2fb622 100644 (file)
--- a/examples/c/async-wait/async-wait3_d.xml
+++ b/examples/c/async-wait/async-wait3_d.xml
@@ -8,7 +8,7 @@
     <argument value="5"/>       <!-- Sleep_start_time -->
     <argument value="0"/>       <!-- Time for test -->
   </actor>
     <argument value="5"/>       <!-- Sleep_start_time -->
     <argument value="0"/>       <!-- Time for test -->
   </actor>

-  <!-- The receiver processes -->
+  <!-- The receiver actor -->

   <actor host="Ruby" function="receiver">
     <argument value="1"/>       <!-- Sleep_start_time -->
     <argument value="0"/>       <!-- Time for test -->
   <actor host="Ruby" function="receiver">
     <argument value="1"/>       <!-- Sleep_start_time -->
     <argument value="0"/>       <!-- Time for test -->

diff --git a/examples/c/async-wait/async-wait4_d.xml b/examples/c/async-wait/async-wait4_d.xml
index 10e2968..c34a269 100644 (file)
--- a/examples/c/async-wait/async-wait4_d.xml
+++ b/examples/c/async-wait/async-wait4_d.xml
@@ -8,7 +8,7 @@
     <argument value="1"/>       <!-- Sleep_start_time -->
     <argument value="0"/>       <!-- Time for test -->
   </actor>
     <argument value="1"/>       <!-- Sleep_start_time -->
     <argument value="0"/>       <!-- Time for test -->
   </actor>

-  <!-- The receiver processes -->
+  <!-- The receiver actor -->

   <actor host="Ruby" function="receiver">
     <argument value="5"/>       <!-- Sleep_start_time -->
     <argument value="0"/>       <!-- Time for test -->
   <actor host="Ruby" function="receiver">
     <argument value="5"/>       <!-- Sleep_start_time -->
     <argument value="0"/>       <!-- Time for test -->

diff --git a/examples/c/async-wait/async-wait_d.xml b/examples/c/async-wait/async-wait_d.xml
index 671064f..78012ae 100644 (file)
--- a/examples/c/async-wait/async-wait_d.xml
+++ b/examples/c/async-wait/async-wait_d.xml
@@ -8,7 +8,7 @@
     <argument value="5"/>     <!-- Sleep_start_time -->
     <argument value="0.1"/>   <!-- Time for test -->
   </actor>
     <argument value="5"/>     <!-- Sleep_start_time -->
     <argument value="0.1"/>   <!-- Time for test -->
   </actor>

-  <!-- The receiver processes -->
+  <!-- The receiver actor -->

   <actor host="Ruby" function="receiver">
     <argument value="1"/>       <!-- Sleep_start_time -->
     <argument value="0.1"/>     <!-- Time for test -->
   <actor host="Ruby" function="receiver">
     <argument value="1"/>       <!-- Sleep_start_time -->
     <argument value="0.1"/>     <!-- Time for test -->

diff --git a/examples/c/energy-exec-ptask/energy-exec-ptask.c b/examples/c/energy-exec-ptask/energy-exec-ptask.c
index 1078fbd..1f1a5da 100644 (file)
--- a/examples/c/energy-exec-ptask/energy-exec-ptask.c
+++ b/examples/c/energy-exec-ptask/energy-exec-ptask.c
@@ -90,7 +90,7 @@ int main(int argc, char* argv[])
 
   simgrid_load_platform(argv[1]);
 
 
   simgrid_load_platform(argv[1]);
 

-  /* Pick a process, no matter which, from the platform file */
+  /* Pick the first host from the platform file */

   sg_host_t* all_hosts = sg_host_list();
   sg_host_t first_host = all_hosts[0];
   free(all_hosts);
   sg_host_t* all_hosts = sg_host_list();
   sg_host_t first_host = all_hosts[0];
   free(all_hosts);

diff --git a/examples/c/exec-basic/exec-basic.tesh b/examples/c/exec-basic/exec-basic.tesh
index 0693772..0c308dd 100644 (file)
--- a/examples/c/exec-basic/exec-basic.tesh
+++ b/examples/c/exec-basic/exec-basic.tesh
@@ -1,6 +1,5 @@
 #!/usr/bin/env tesh
 
 #!/usr/bin/env tesh
 

-p Start remote processes 

 $ ${bindir:=.}/exec-basic-c ${platfdir}/small_platform.xml 
 > [Tremblay:privileged:(2) 0.001500] [exec_basic/INFO] Done.
 > [Tremblay:executor:(1) 0.002000] [exec_basic/INFO] Done.
 $ ${bindir:=.}/exec-basic-c ${platfdir}/small_platform.xml 
 > [Tremblay:privileged:(2) 0.001500] [exec_basic/INFO] Done.
 > [Tremblay:executor:(1) 0.002000] [exec_basic/INFO] Done.

diff --git a/examples/c/platform-failures/platform-failures.tesh b/examples/c/platform-failures/platform-failures.tesh
index e258993..3ab9c12 100644 (file)
--- a/examples/c/platform-failures/platform-failures.tesh
+++ b/examples/c/platform-failures/platform-failures.tesh
@@ -15,12 +15,12 @@ $ ${bindir:=.}/platform-failures-c --log=xbt_cfg.thres:critical --log=no_loc ${p
 > [  0.000000] (5:worker@Ginette) Waiting a message on worker-3
 > [  0.000000] (6:worker@Bourassa) Waiting a message on worker-4
 > [  0.010309] (1:master@Tremblay) Send a message to worker-1
 > [  0.000000] (5:worker@Ginette) Waiting a message on worker-3
 > [  0.000000] (6:worker@Bourassa) Waiting a message on worker-4
 > [  0.010309] (1:master@Tremblay) Send a message to worker-1

-> [  1.000000] (0:maestro@) Restart processes on host Fafard
+> [  1.000000] (0:maestro@) Restart actors on host Fafard

 > [  1.000000] (7:worker@Fafard) Waiting a message on worker-2
 > [  1.000000] (1:master@Tremblay) Mmh. The communication with 'worker-1' failed. Nevermind. Let's keep going!
 > [  1.000000] (1:master@Tremblay) Send a message to worker-2
 > [  2.000000] (1:master@Tremblay) Mmh. The communication with 'worker-2' failed. Nevermind. Let's keep going!
 > [  1.000000] (7:worker@Fafard) Waiting a message on worker-2
 > [  1.000000] (1:master@Tremblay) Mmh. The communication with 'worker-1' failed. Nevermind. Let's keep going!
 > [  1.000000] (1:master@Tremblay) Send a message to worker-2
 > [  2.000000] (1:master@Tremblay) Mmh. The communication with 'worker-2' failed. Nevermind. Let's keep going!

-> [  2.000000] (0:maestro@) Restart processes on host Jupiter
+> [  2.000000] (0:maestro@) Restart actors on host Jupiter

 > [  2.000000] (1:master@Tremblay) Send a message to worker-3
 > [  2.000000] (8:worker@Jupiter) Waiting a message on worker-1
 > [  2.010309] (2:worker@Tremblay) Execution complete.
 > [  2.000000] (1:master@Tremblay) Send a message to worker-3
 > [  2.000000] (8:worker@Jupiter) Waiting a message on worker-1
 > [  2.010309] (2:worker@Tremblay) Execution complete.


@@ -120,11 +120,11 @@ $ ${bindir:=.}/platform-failures-c --log=xbt_cfg.thres:critical --log=no_loc ${p
 > [  0.010825] (2:worker@Tremblay) Start execution...
 > [  0.010825] (1:master@Tremblay) Send to worker-0 completed
 > [  0.010825] (1:master@Tremblay) Send a message to worker-1
 > [  0.010825] (2:worker@Tremblay) Start execution...
 > [  0.010825] (1:master@Tremblay) Send to worker-0 completed
 > [  0.010825] (1:master@Tremblay) Send a message to worker-1

-> [  1.000000] (0:maestro@) Restart processes on host Fafard
+> [  1.000000] (0:maestro@) Restart actors on host Fafard

 > [  1.000000] (7:worker@Fafard) Waiting a message on worker-2
 > [  1.000000] (1:master@Tremblay) Mmh. The communication with 'worker-1' failed. Nevermind. Let's keep going!
 > [  1.000000] (1:master@Tremblay) Send a message to worker-2
 > [  1.000000] (7:worker@Fafard) Waiting a message on worker-2
 > [  1.000000] (1:master@Tremblay) Mmh. The communication with 'worker-1' failed. Nevermind. Let's keep going!
 > [  1.000000] (1:master@Tremblay) Send a message to worker-2

-> [  2.000000] (0:maestro@) Restart processes on host Jupiter
+> [  2.000000] (0:maestro@) Restart actors on host Jupiter

 > [  2.000000] (8:worker@Jupiter) Waiting a message on worker-1
 > [  2.000000] (1:master@Tremblay) Mmh. The communication with 'worker-2' failed. Nevermind. Let's keep going!
 > [  2.000000] (1:master@Tremblay) Send a message to worker-3
 > [  2.000000] (8:worker@Jupiter) Waiting a message on worker-1
 > [  2.000000] (1:master@Tremblay) Mmh. The communication with 'worker-2' failed. Nevermind. Let's keep going!
 > [  2.000000] (1:master@Tremblay) Send a message to worker-3

diff --git a/examples/c/plugin-hostload/plugin-hostload.c b/examples/c/plugin-hostload/plugin-hostload.c
index 2a6996d..18672ea 100644 (file)
--- a/examples/c/plugin-hostload/plugin-hostload.c
+++ b/examples/c/plugin-hostload/plugin-hostload.c
@@ -85,7 +85,7 @@ static void change_speed(XBT_ATTRIB_UNUSED int argc, XBT_ATTRIB_UNUSED char* arg
   sg_host_t host = sg_host_by_name("MyHost1");
   sg_actor_sleep_for(10.5);
   XBT_INFO("I slept until now, but now I'll change the speed of this host "
   sg_host_t host = sg_host_by_name("MyHost1");
   sg_actor_sleep_for(10.5);
   XBT_INFO("I slept until now, but now I'll change the speed of this host "

-           "while the other process is still computing! This should slow the computation down.");
+           "while the other actor is still computing! This should slow the computation down.");

   sg_host_set_pstate(host, 2);
 }
 
   sg_host_set_pstate(host, 2);
 }
 

diff --git a/examples/c/plugin-hostload/plugin-hostload.tesh b/examples/c/plugin-hostload/plugin-hostload.tesh
index a55ce0d..f3afba4 100644 (file)
--- a/examples/c/plugin-hostload/plugin-hostload.tesh
+++ b/examples/c/plugin-hostload/plugin-hostload.tesh
@@ -7,7 +7,7 @@ $ ${bindir:=.}/plugin-hostload-c ${platfdir}/energy_platform.xml "--log=root.fmt
 > [  0.000000] (1:load_test@MyHost1) Sleep for 10 seconds
 > [ 10.000000] (1:load_test@MyHost1) Done sleeping 10.00s; peak speed: 1E+08 flop/s; number of flops computed so far: 0E+00 (nothing should have changed)
 > [ 10.000000] (1:load_test@MyHost1) Run a task of 2E+08 flops at current speed of 1E+08 flop/s
 > [  0.000000] (1:load_test@MyHost1) Sleep for 10 seconds
 > [ 10.000000] (1:load_test@MyHost1) Done sleeping 10.00s; peak speed: 1E+08 flop/s; number of flops computed so far: 0E+00 (nothing should have changed)
 > [ 10.000000] (1:load_test@MyHost1) Run a task of 2E+08 flops at current speed of 1E+08 flop/s

-> [ 10.500000] (2:change_speed@MyHost1) I slept until now, but now I'll change the speed of this host while the other process is still computing! This should slow the computation down.
+> [ 10.500000] (2:change_speed@MyHost1) I slept until now, but now I'll change the speed of this host while the other actor is still computing! This should slow the computation down.

 > [ 18.000000] (1:load_test@MyHost1) Done working on my task; this took 8.00s; current peak speed: 2E+07 flop/s (when I started the computation, the speed was set to 1E+08 flop/s); number of flops computed so far: 2.00E+08, average load as reported by the HostLoad plugin: 0.04167 (should be 0.04167)
 > [ 18.000000] (1:load_test@MyHost1) ========= Requesting pstate 1 (speed should be of 5E+07 flop/s and is of 5E+07 flop/s, average load is 0.04167)
 > [ 18.000000] (1:load_test@MyHost1) Run a task of 1E+08 flops
 > [ 18.000000] (1:load_test@MyHost1) Done working on my task; this took 8.00s; current peak speed: 2E+07 flop/s (when I started the computation, the speed was set to 1E+08 flop/s); number of flops computed so far: 2.00E+08, average load as reported by the HostLoad plugin: 0.04167 (should be 0.04167)
 > [ 18.000000] (1:load_test@MyHost1) ========= Requesting pstate 1 (speed should be of 5E+07 flop/s and is of 5E+07 flop/s, average load is 0.04167)
 > [ 18.000000] (1:load_test@MyHost1) Run a task of 1E+08 flops

diff --git a/examples/s4u/actor-daemon/s4u-actor-daemon.cpp b/examples/s4u/actor-daemon/s4u-actor-daemon.cpp
index 1262f9f..c621095 100644 (file)
--- a/examples/s4u/actor-daemon/s4u-actor-daemon.cpp
+++ b/examples/s4u/actor-daemon/s4u-actor-daemon.cpp
@@ -7,7 +7,7 @@
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor_daemon, "Messages specific for this s4u example");
 
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor_daemon, "Messages specific for this s4u example");
 

-/* The worker process, working for a while before leaving */
+/* The worker actor, working for a while before leaving */

 static void worker()
 {
   XBT_INFO("Let's do some work (for 10 sec on Boivin).");
 static void worker()
 {
   XBT_INFO("Let's do some work (for 10 sec on Boivin).");


@@ -16,7 +16,7 @@ static void worker()
   XBT_INFO("I'm done now. I leave even if it makes the daemon die.");
 }
 
   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 */
+/* The daemon, displaying a message every 3 seconds until all other actors stop */

 static void my_daemon()
 {
   simgrid::s4u::Actor::self()->daemonize();
 static void my_daemon()
 {
   simgrid::s4u::Actor::self()->daemonize();


@@ -26,7 +26,7 @@ static void my_daemon()
     simgrid::s4u::this_actor::sleep_for(3.0);
   }
 
     simgrid::s4u::this_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[])
 }
 
 int main(int argc, char* argv[])

diff --git a/examples/s4u/actor-daemon/s4u-actor-daemon.tesh b/examples/s4u/actor-daemon/s4u-actor-daemon.tesh
index 82593d2..a4679ef 100644 (file)
--- a/examples/s4u/actor-daemon/s4u-actor-daemon.tesh
+++ b/examples/s4u/actor-daemon/s4u-actor-daemon.tesh
@@ -1,6 +1,6 @@
 #!/usr/bin/env tesh
 
 #!/usr/bin/env tesh
 

-p Testing the process daemonization feature
+p Testing the actor daemonization feature

 
 $ ${bindir:=.}/s4u-actor-daemon ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n"
 > [  0.000000] (worker@Boivin) Let's do some work (for 10 sec on Boivin).
 
 $ ${bindir:=.}/s4u-actor-daemon ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n"
 > [  0.000000] (worker@Boivin) Let's do some work (for 10 sec on Boivin).

diff --git a/examples/s4u/actor-kill/s4u-actor-kill.cpp b/examples/s4u/actor-kill/s4u-actor-kill.cpp
index a9ec98b..8f3d15a 100644 (file)
--- a/examples/s4u/actor-kill/s4u-actor-kill.cpp
+++ b/examples/s4u/actor-kill/s4u-actor-kill.cpp
@@ -25,7 +25,7 @@ static void victimB_fun()
 
 static void killer()
 {
 
 static void killer()
 {

-  XBT_INFO("Hello!"); /* - First start a victim process */
+  XBT_INFO("Hello!"); /* - First start a victim actor */

   simgrid::s4u::ActorPtr victimA =
       simgrid::s4u::Actor::create("victim A", simgrid::s4u::Host::by_name("Fafard"), victimA_fun);
   simgrid::s4u::ActorPtr victimB =
   simgrid::s4u::ActorPtr victimA =
       simgrid::s4u::Actor::create("victim A", simgrid::s4u::Host::by_name("Fafard"), victimA_fun);
   simgrid::s4u::ActorPtr victimB =


@@ -68,7 +68,7 @@ int main(int argc, char* argv[])
   xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s ../platforms/small_platform.xml\n", argv[0], argv[0]);
 
   e.load_platform(argv[1]); /* - Load the platform description */
   xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s ../platforms/small_platform.xml\n", argv[0], argv[0]);
 
   e.load_platform(argv[1]); /* - Load the platform description */

-  /* - Create and deploy killer process, that will create the victim actors  */
+  /* - Create and deploy killer actor, that will create the victim actors  */

   simgrid::s4u::Actor::create("killer", simgrid::s4u::Host::by_name("Tremblay"), killer);
 
   e.run(); /* - Run the simulation */
   simgrid::s4u::Actor::create("killer", simgrid::s4u::Host::by_name("Tremblay"), killer);
 
   e.run(); /* - Run the simulation */

diff --git a/examples/s4u/actor-lifetime/s4u-actor-lifetime.cpp b/examples/s4u/actor-lifetime/s4u-actor-lifetime.cpp
index 00c1ea4..5a945a4 100644 (file)
--- a/examples/s4u/actor-lifetime/s4u-actor-lifetime.cpp
+++ b/examples/s4u/actor-lifetime/s4u-actor-lifetime.cpp
@@ -16,7 +16,7 @@ public:
   explicit sleeper(std::vector<std::string> /*args*/)
   {
     simgrid::s4u::this_actor::on_exit([](bool /*failed*/) {
   explicit sleeper(std::vector<std::string> /*args*/)
   {
     simgrid::s4u::this_actor::on_exit([](bool /*failed*/) {

-      /* Executed on process termination, to display a message helping to understand the output */
+      /* Executed on actor termination, to display a message helping to understand the output */

       XBT_INFO("Exiting now (done sleeping or got killed).");
     });
   }
       XBT_INFO("Exiting now (done sleeping or got killed).");
     });
   }


@@ -39,7 +39,7 @@ int main(int argc, char* argv[])
 
   e.load_platform(argv[1]); /* Load the platform description */
   e.register_actor<sleeper>("sleeper");
 
   e.load_platform(argv[1]); /* Load the platform description */
   e.register_actor<sleeper>("sleeper");

-  e.load_deployment(argv[2]); /*  Deploy the sleeper processes with explicit start/kill times */
+  e.load_deployment(argv[2]); /*  Deploy the sleeper actors with explicit start/kill times */

 
   e.run(); /* - Run the simulation */
 
 
   e.run(); /* - Run the simulation */
 

diff --git a/examples/s4u/actor-migrate/s4u-actor-migrate.cpp b/examples/s4u/actor-migrate/s4u-actor-migrate.cpp
index 4cc22db..781d9a5 100644 (file)
--- a/examples/s4u/actor-migrate/s4u-actor-migrate.cpp
+++ b/examples/s4u/actor-migrate/s4u-actor-migrate.cpp
@@ -49,11 +49,11 @@ static void monitor()
 
   simgrid::s4u::this_actor::sleep_for(5);
 
 
   simgrid::s4u::this_actor::sleep_for(5);
 

-  XBT_INFO("After 5 seconds, move the process to %s", jacquelin->get_cname());
+  XBT_INFO("After 5 seconds, move the actor to %s", jacquelin->get_cname());

   actor->set_host(jacquelin);
 
   simgrid::s4u::this_actor::sleep_until(15);
   actor->set_host(jacquelin);
 
   simgrid::s4u::this_actor::sleep_until(15);

-  XBT_INFO("At t=15, move the process to %s and resume it.", fafard->get_cname());
+  XBT_INFO("At t=15, move the actor to %s and resume it.", fafard->get_cname());

   actor->set_host(fafard);
   actor->resume();
 }
   actor->set_host(fafard);
   actor->resume();
 }

diff --git a/examples/s4u/actor-migrate/s4u-actor-migrate.tesh b/examples/s4u/actor-migrate/s4u-actor-migrate.tesh
index 6b05f06..27ab0b7 100644 (file)
--- a/examples/s4u/actor-migrate/s4u-actor-migrate.tesh
+++ b/examples/s4u/actor-migrate/s4u-actor-migrate.tesh
@@ -4,8 +4,8 @@ p Testing the actor migration feature
 
 $ ${bindir:=.}/s4u-actor-migrate ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n"
 > [  0.000000] (worker@Fafard) Let's move to Boivin to execute 1177.14 Mflops (5sec on Boivin and 5sec on Jacquelin)
 
 $ ${bindir:=.}/s4u-actor-migrate ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n"
 > [  0.000000] (worker@Fafard) Let's move to Boivin to execute 1177.14 Mflops (5sec on Boivin and 5sec on Jacquelin)

-> [  5.000000] (monitor@Boivin) After 5 seconds, move the process to Jacquelin
+> [  5.000000] (monitor@Boivin) After 5 seconds, move the actor to Jacquelin

 > [ 10.000000] (worker@Jacquelin) I wake up on Jacquelin. Let's suspend a bit
 > [ 10.000000] (worker@Jacquelin) I wake up on Jacquelin. Let's suspend a bit

-> [ 15.000000] (monitor@Boivin) At t=15, move the process to Fafard and resume it.
+> [ 15.000000] (monitor@Boivin) At t=15, move the actor to Fafard and resume it.

 > [ 15.000000] (worker@Fafard) I wake up on Fafard
 > [ 15.000000] (worker@Fafard) Done
 > [ 15.000000] (worker@Fafard) I wake up on Fafard
 > [ 15.000000] (worker@Fafard) Done

diff --git a/examples/s4u/actor-suspend/s4u-actor-suspend.cpp b/examples/s4u/actor-suspend/s4u-actor-suspend.cpp
index b91a91a..c91a52b 100644 (file)
--- a/examples/s4u/actor-suspend/s4u-actor-suspend.cpp
+++ b/examples/s4u/actor-suspend/s4u-actor-suspend.cpp
@@ -7,7 +7,7 @@
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor_suspend, "Messages specific for this s4u example");
 
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor_suspend, "Messages specific for this s4u example");
 

-/* The Lazy guy only wants to sleep, but can be awaken by the dream_master process. */
+/* The Lazy guy only wants to sleep, but can be awaken by the dream_master actor. */

 static void lazy_guy()
 {
   XBT_INFO("Nobody's watching me ? Let's go to sleep.");
 static void lazy_guy()
 {
   XBT_INFO("Nobody's watching me ? Let's go to sleep.");


@@ -31,7 +31,7 @@ static void lazy_guy()
 /* The Dream master: */
 static void dream_master()
 {
 /* The Dream master: */
 static void dream_master()
 {

-  XBT_INFO("Let's create a lazy guy."); /* - Create a lazy_guy process */
+  XBT_INFO("Let's create a lazy guy."); /* - Create a lazy_guy actor */

   simgrid::s4u::ActorPtr lazy = simgrid::s4u::Actor::create("Lazy", simgrid::s4u::this_actor::get_host(), lazy_guy);
   XBT_INFO("Let's wait a little bit...");
   simgrid::s4u::this_actor::sleep_for(10); /* - Wait for 10 seconds */
   simgrid::s4u::ActorPtr lazy = simgrid::s4u::Actor::create("Lazy", simgrid::s4u::this_actor::get_host(), lazy_guy);
   XBT_INFO("Let's wait a little bit...");
   simgrid::s4u::this_actor::sleep_for(10); /* - Wait for 10 seconds */

diff --git a/examples/s4u/actor-yield/s4u-actor-yield.cpp b/examples/s4u/actor-yield/s4u-actor-yield.cpp
index 5574c8a..6abfa67 100644 (file)
--- a/examples/s4u/actor-yield/s4u-actor-yield.cpp
+++ b/examples/s4u/actor-yield/s4u-actor-yield.cpp
@@ -14,7 +14,7 @@
  * It can also be used to benchmark our context-switching mechanism.
  */
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor_yield, "Messages specific for this s4u example");
  * It can also be used to benchmark our context-switching mechanism.
  */
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor_yield, "Messages specific for this s4u example");

-/* Main function of the Yielder process */
+/* Main function of the Yielder actor */

 class yielder {
   long number_of_yields;
 
 class yielder {
   long number_of_yields;
 

diff --git a/examples/s4u/exec-basic/s4u-exec-basic.tesh b/examples/s4u/exec-basic/s4u-exec-basic.tesh
index b4bed5d..b2da893 100644 (file)
--- a/examples/s4u/exec-basic/s4u-exec-basic.tesh
+++ b/examples/s4u/exec-basic/s4u-exec-basic.tesh
@@ -1,6 +1,5 @@
 #!/usr/bin/env tesh
 
 #!/usr/bin/env tesh
 

-p Start remote processes 

 $ ${bindir:=.}/s4u-exec-basic ${platfdir}/small_platform.xml 
 > [Tremblay:privileged:(2) 0.001500] [s4u_test/INFO] Done.
 > [Tremblay:executor:(1) 0.002000] [s4u_test/INFO] Done.
 $ ${bindir:=.}/s4u-exec-basic ${platfdir}/small_platform.xml 
 > [Tremblay:privileged:(2) 0.001500] [s4u_test/INFO] Done.
 > [Tremblay:executor:(1) 0.002000] [s4u_test/INFO] Done.

diff --git a/examples/s4u/network-ns3/s4u-network-ns3.cpp b/examples/s4u/network-ns3/s4u-network-ns3.cpp
index 107c85e..71da8a0 100644 (file)
--- a/examples/s4u/network-ns3/s4u-network-ns3.cpp
+++ b/examples/s4u/network-ns3/s4u-network-ns3.cpp
@@ -7,7 +7,7 @@
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this s4u example");
 
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this s4u example");
 

-int timer_start; // set as 1 in the master process
+int timer_start; // set as 1 in the master actor

 
 #define NTASKS 1500
 double start_time;
 
 #define NTASKS 1500
 double start_time;

diff --git a/examples/s4u/platform-failures/s4u-platform-failures.tesh b/examples/s4u/platform-failures/s4u-platform-failures.tesh
index c6be682..9274a89 100644 (file)
--- a/examples/s4u/platform-failures/s4u-platform-failures.tesh
+++ b/examples/s4u/platform-failures/s4u-platform-failures.tesh
@@ -15,12 +15,12 @@ $ ${bindir:=.}/s4u-platform-failures --log=xbt_cfg.thres:critical --log=no_loc $
 > [  0.000000] (5:worker@Ginette) Waiting a message on worker-3
 > [  0.000000] (6:worker@Bourassa) Waiting a message on worker-4
 > [  0.010309] (1:master@Tremblay) Send a message to worker-1
 > [  0.000000] (5:worker@Ginette) Waiting a message on worker-3
 > [  0.000000] (6:worker@Bourassa) Waiting a message on worker-4
 > [  0.010309] (1:master@Tremblay) Send a message to worker-1

-> [  1.000000] (0:maestro@) Restart processes on host Fafard
+> [  1.000000] (0:maestro@) Restart actors on host Fafard

 > [  1.000000] (7:worker@Fafard) Waiting a message on worker-2
 > [  1.000000] (1:master@Tremblay) Mmh. The communication with 'worker-1' failed. Nevermind. Let's keep going!
 > [  1.000000] (1:master@Tremblay) Send a message to worker-2
 > [  2.000000] (1:master@Tremblay) Mmh. The communication with 'worker-2' failed. Nevermind. Let's keep going!
 > [  1.000000] (7:worker@Fafard) Waiting a message on worker-2
 > [  1.000000] (1:master@Tremblay) Mmh. The communication with 'worker-1' failed. Nevermind. Let's keep going!
 > [  1.000000] (1:master@Tremblay) Send a message to worker-2
 > [  2.000000] (1:master@Tremblay) Mmh. The communication with 'worker-2' failed. Nevermind. Let's keep going!

-> [  2.000000] (0:maestro@) Restart processes on host Jupiter
+> [  2.000000] (0:maestro@) Restart actors on host Jupiter

 > [  2.000000] (1:master@Tremblay) Send a message to worker-3
 > [  2.000000] (8:worker@Jupiter) Waiting a message on worker-1
 > [  2.010309] (2:worker@Tremblay) Execution complete.
 > [  2.000000] (1:master@Tremblay) Send a message to worker-3
 > [  2.000000] (8:worker@Jupiter) Waiting a message on worker-1
 > [  2.010309] (2:worker@Tremblay) Execution complete.


@@ -120,11 +120,11 @@ $ ${bindir:=.}/s4u-platform-failures --log=xbt_cfg.thres:critical --log=no_loc $
 > [  0.010825] (2:worker@Tremblay) Start execution...
 > [  0.010825] (1:master@Tremblay) Send to worker-0 completed
 > [  0.010825] (1:master@Tremblay) Send a message to worker-1
 > [  0.010825] (2:worker@Tremblay) Start execution...
 > [  0.010825] (1:master@Tremblay) Send to worker-0 completed
 > [  0.010825] (1:master@Tremblay) Send a message to worker-1

-> [  1.000000] (0:maestro@) Restart processes on host Fafard
+> [  1.000000] (0:maestro@) Restart actors on host Fafard

 > [  1.000000] (7:worker@Fafard) Waiting a message on worker-2
 > [  1.000000] (1:master@Tremblay) Mmh. The communication with 'worker-1' failed. Nevermind. Let's keep going!
 > [  1.000000] (1:master@Tremblay) Send a message to worker-2
 > [  1.000000] (7:worker@Fafard) Waiting a message on worker-2
 > [  1.000000] (1:master@Tremblay) Mmh. The communication with 'worker-1' failed. Nevermind. Let's keep going!
 > [  1.000000] (1:master@Tremblay) Send a message to worker-2

-> [  2.000000] (0:maestro@) Restart processes on host Jupiter
+> [  2.000000] (0:maestro@) Restart actors on host Jupiter

 > [  2.000000] (8:worker@Jupiter) Waiting a message on worker-1
 > [  2.000000] (1:master@Tremblay) Mmh. The communication with 'worker-2' failed. Nevermind. Let's keep going!
 > [  2.000000] (1:master@Tremblay) Send a message to worker-3
 > [  2.000000] (8:worker@Jupiter) Waiting a message on worker-1
 > [  2.000000] (1:master@Tremblay) Mmh. The communication with 'worker-2' failed. Nevermind. Let's keep going!
 > [  2.000000] (1:master@Tremblay) Send a message to worker-3

diff --git a/examples/s4u/platform-profile/s4u-platform-profile.cpp b/examples/s4u/platform-profile/s4u-platform-profile.cpp
index 6efe94a..d55200b 100644 (file)
--- a/examples/s4u/platform-profile/s4u-platform-profile.cpp
+++ b/examples/s4u/platform-profile/s4u-platform-profile.cpp
@@ -12,7 +12,7 @@
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_platform_profile, "Messages specific for this s4u example");
 
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_platform_profile, "Messages specific for this s4u example");
 

-/* Main function of the Yielder process */
+/* Main function of the Yielder actor */

 static void watcher()
 {
   const simgrid::s4u::Host* jupiter = simgrid::s4u::Host::by_name("Jupiter");
 static void watcher()
 {
   const simgrid::s4u::Host* jupiter = simgrid::s4u::Host::by_name("Jupiter");

diff --git a/examples/s4u/platform-properties/s4u-platform-properties.cpp b/examples/s4u/platform-properties/s4u-platform-properties.cpp
index 57d47cc..d3d173a 100644 (file)
--- a/examples/s4u/platform-properties/s4u-platform-properties.cpp
+++ b/examples/s4u/platform-properties/s4u-platform-properties.cpp
@@ -90,7 +90,7 @@ static void bob(std::vector<std::string> /*args*/)
   XBT_INFO("   Zone property: date -> %s", root->get_property("date"));
   XBT_INFO("   Zone property: author -> %s", root->get_property("author"));
 
   XBT_INFO("   Zone property: date -> %s", root->get_property("date"));
   XBT_INFO("   Zone property: author -> %s", root->get_property("author"));
 

-  /* Get the property list of current bob process */
+  /* Get the property list of current bob actor */

   const std::unordered_map<std::string, std::string>* props = simgrid::s4u::Actor::self()->get_properties();
   const char* noexist = "UnknownProcessProp";
   XBT_ATTRIB_UNUSED const char* value;
   const std::unordered_map<std::string, std::string>* props = simgrid::s4u::Actor::self()->get_properties();
   const char* noexist = "UnknownProcessProp";
   XBT_ATTRIB_UNUSED const char* value;

diff --git a/examples/s4u/plugin-hostload/s4u-plugin-hostload.cpp b/examples/s4u/plugin-hostload/s4u-plugin-hostload.cpp
index 33460b5..cfdb61f 100644 (file)
--- a/examples/s4u/plugin-hostload/s4u-plugin-hostload.cpp
+++ b/examples/s4u/plugin-hostload/s4u-plugin-hostload.cpp
@@ -78,7 +78,7 @@ static void change_speed()
   s4u_Host* host = simgrid::s4u::Host::by_name("MyHost1");
   simgrid::s4u::this_actor::sleep_for(10.5);
   XBT_INFO("I slept until now, but now I'll change the speed of this host "
   s4u_Host* host = simgrid::s4u::Host::by_name("MyHost1");
   simgrid::s4u::this_actor::sleep_for(10.5);
   XBT_INFO("I slept until now, but now I'll change the speed of this host "

-      "while the other process is still computing! This should slow the computation down.");
+           "while the other actor is still computing! This should slow the computation down.");

   host->set_pstate(2);
 }
 
   host->set_pstate(2);
 }
 

diff --git a/examples/s4u/plugin-hostload/s4u-plugin-hostload.tesh b/examples/s4u/plugin-hostload/s4u-plugin-hostload.tesh
index 0e7319b..044b5a7 100644 (file)
--- a/examples/s4u/plugin-hostload/s4u-plugin-hostload.tesh
+++ b/examples/s4u/plugin-hostload/s4u-plugin-hostload.tesh
@@ -7,7 +7,7 @@ $ ${bindir:=.}/s4u-plugin-hostload ${platfdir}/energy_platform.xml "--log=root.f
 > [  0.000000] (1:load_test@MyHost1) Sleep for 10 seconds
 > [ 10.000000] (1:load_test@MyHost1) Done sleeping 10.00s; peak speed: 1E+08 flop/s; number of flops computed so far: 0E+00 (nothing should have changed)
 > [ 10.000000] (1:load_test@MyHost1) Run a task of 2E+08 flops at current speed of 1E+08 flop/s
 > [  0.000000] (1:load_test@MyHost1) Sleep for 10 seconds
 > [ 10.000000] (1:load_test@MyHost1) Done sleeping 10.00s; peak speed: 1E+08 flop/s; number of flops computed so far: 0E+00 (nothing should have changed)
 > [ 10.000000] (1:load_test@MyHost1) Run a task of 2E+08 flops at current speed of 1E+08 flop/s

-> [ 10.500000] (2:change_speed@MyHost1) I slept until now, but now I'll change the speed of this host while the other process is still computing! This should slow the computation down.
+> [ 10.500000] (2:change_speed@MyHost1) I slept until now, but now I'll change the speed of this host while the other actor is still computing! This should slow the computation down.

 > [ 18.000000] (1:load_test@MyHost1) Done working on my task; this took 8.00s; current peak speed: 2E+07 flop/s (when I started the computation, the speed was set to 1E+08 flop/s); number of flops computed so far: 2.00E+08, average load as reported by the HostLoad plugin: 0.04167 (should be 0.04167)
 > [ 18.000000] (1:load_test@MyHost1) ========= Requesting pstate 1 (speed should be of 5E+07 flop/s and is of 5E+07 flop/s, average load is 0.04167)
 > [ 18.000000] (1:load_test@MyHost1) Run a task of 1E+08 flops
 > [ 18.000000] (1:load_test@MyHost1) Done working on my task; this took 8.00s; current peak speed: 2E+07 flop/s (when I started the computation, the speed was set to 1E+08 flop/s); number of flops computed so far: 2.00E+08, average load as reported by the HostLoad plugin: 0.04167 (should be 0.04167)
 > [ 18.000000] (1:load_test@MyHost1) ========= Requesting pstate 1 (speed should be of 5E+07 flop/s and is of 5E+07 flop/s, average load is 0.04167)
 > [ 18.000000] (1:load_test@MyHost1) Run a task of 1E+08 flops

diff --git a/examples/s4u/synchro-barrier/s4u-synchro-barrier.cpp b/examples/s4u/synchro-barrier/s4u-synchro-barrier.cpp
index d816f50..a23f264 100644 (file)
--- a/examples/s4u/synchro-barrier/s4u-synchro-barrier.cpp
+++ b/examples/s4u/synchro-barrier/s4u-synchro-barrier.cpp
@@ -16,16 +16,15 @@ static void worker(simgrid::s4u::BarrierPtr barrier)
     XBT_INFO("Bye");
 }
 
     XBT_INFO("Bye");
 }
 

-/// Spawn process_count-1 workers and do a barrier with them
-static void master(int process_count)
+/// Spawn actor_count-1 workers and do a barrier with them
+static void master(int actor_count)

 {
 {

-    simgrid::s4u::BarrierPtr barrier = simgrid::s4u::Barrier::create(process_count);
+  simgrid::s4u::BarrierPtr barrier = simgrid::s4u::Barrier::create(actor_count);

 
 

-    XBT_INFO("Spawning %d workers", process_count-1);
-    for (int i = 0; i < process_count-1; i++)
-    {
-        simgrid::s4u::Actor::create("worker", simgrid::s4u::Host::by_name("Jupiter"), worker, barrier);
-    }
+  XBT_INFO("Spawning %d workers", actor_count - 1);
+  for (int i = 0; i < actor_count - 1; i++) {
+    simgrid::s4u::Actor::create("worker", simgrid::s4u::Host::by_name("Jupiter"), worker, barrier);
+  }

 
     XBT_INFO("Waiting on the barrier");
     barrier->wait();
 
     XBT_INFO("Waiting on the barrier");
     barrier->wait();


@@ -37,13 +36,13 @@ int main(int argc, char **argv)
 {
   simgrid::s4u::Engine e(&argc, argv);
 
 {
   simgrid::s4u::Engine e(&argc, argv);
 

-  // Parameter: Number of processes in the barrier
-  xbt_assert(argc >= 2, "Usage: %s <process-count>\n", argv[0]);
-  int process_count = std::stoi(argv[1]);
-  xbt_assert(process_count > 0, "<process-count> must be greater than 0");
+  // Parameter: Number of actores in the barrier
+  xbt_assert(argc >= 2, "Usage: %s <actor-count>\n", argv[0]);
+  int actor_count = std::stoi(argv[1]);
+  xbt_assert(actor_count > 0, "<actor-count> must be greater than 0");

 
   e.load_platform("../../platforms/two_hosts.xml");
 
   e.load_platform("../../platforms/two_hosts.xml");

-  simgrid::s4u::Actor::create("master", simgrid::s4u::Host::by_name("Tremblay"), master, process_count);
+  simgrid::s4u::Actor::create("master", simgrid::s4u::Host::by_name("Tremblay"), master, actor_count);

   e.run();
 
   return 0;
   e.run();
 
   return 0;

diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp
index a526b56..557e549 100644 (file)
--- a/src/surf/cpu_cas01.cpp
+++ b/src/surf/cpu_cas01.cpp
@@ -133,7 +133,7 @@ void CpuCas01::apply_event(profile::Event* event, double value)
 
     if (value > 0) {
       if (not is_on()) {
 
     if (value > 0) {
       if (not is_on()) {

-        XBT_VERB("Restart processes on host %s", get_host()->get_cname());
+        XBT_VERB("Restart actors on host %s", get_host()->get_cname());

         get_host()->turn_on();
       }
     } else {
         get_host()->turn_on();
       }
     } else {

diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp
index 6810cf3..0e1e208 100644 (file)
--- a/src/surf/cpu_ti.cpp
+++ b/src/surf/cpu_ti.cpp
@@ -374,7 +374,7 @@ void CpuTi::apply_event(kernel::profile::Event* event, double value)
   } else if (event == state_event_) {
     if (value > 0) {
       if (not is_on()) {
   } else if (event == state_event_) {
     if (value > 0) {
       if (not is_on()) {

-        XBT_VERB("Restart processes on host %s", get_host()->get_cname());
+        XBT_VERB("Restart actors on host %s", get_host()->get_cname());

         get_host()->turn_on();
       }
     } else {
         get_host()->turn_on();
       }
     } else {

diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp
index c7c61cd..ea60e12 100644 (file)
--- a/src/surf/ptask_L07.cpp
+++ b/src/surf/ptask_L07.cpp
@@ -319,7 +319,7 @@ void CpuL07::apply_event(kernel::profile::Event* triggered, double value)
   } else if (triggered == state_event_) {
     if (value > 0) {
       if (not is_on()) {
   } else if (triggered == state_event_) {
     if (value > 0) {
       if (not is_on()) {

-        XBT_VERB("Restart processes on host %s", get_host()->get_cname());
+        XBT_VERB("Restart actors on host %s", get_host()->get_cname());

         get_host()->turn_on();
       }
     } else
         get_host()->turn_on();
       }
     } else