X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7f28b71736be6dcc0140ed1f121168440f8f74d1..8579400ae5e0389b237a2b52e9ea62bebbe1f4d9:/examples/msg/process-suspend/process-suspend.c

diff --git a/examples/msg/process-suspend/process-suspend.c b/examples/msg/process-suspend/process-suspend.c
index b7fc14a1bb..19184ef69a 100644
--- a/examples/msg/process-suspend/process-suspend.c
+++ b/examples/msg/process-suspend/process-suspend.c
@@ -6,83 +6,80 @@
 
 #include "simgrid/msg.h"
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
+XBT_LOG_NEW_DEFAULT_CATEGORY(msg_process_suspend, "Messages specific for this msg example");
 
-#define SLEEP(duration)                                 \
-  if (MSG_process_sleep(duration) != MSG_OK)            \
-    xbt_die("What's going on??? I failed to sleep!");
-
-/** @addtogroup MSG_examples
- * 
- * - <b>process-suspend/process-suspend.c: Process Suspend/Resume example</b>. Demonstrates how to suspend and resume
- *   processes using the @ref MSG_process_suspend and @ref MSG_process_resume functions.
- */
-
-/** Lazy guy function. This process suspends itself asap.  */
+/* The Lazy guy only wants to sleep, but can be awaken by the dream_master process. */
 static int lazy_guy(int argc, char *argv[])
 {
   XBT_INFO("Nobody's watching me ? Let's go to sleep.");
-  MSG_process_suspend(MSG_process_self());
+  MSG_process_suspend(MSG_process_self());       /* - Start by suspending itself */
   XBT_INFO("Uuuh ? Did somebody call me ?");
 
-  XBT_INFO("Going to sleep...");
-  SLEEP(10.0);
+  XBT_INFO("Going to sleep...");                 /* - Then repetitively go to sleep, but got awaken */
+  MSG_process_sleep(10.0);
   XBT_INFO("Mmm... waking up.");
 
-  XBT_INFO("Going to sleep one more time...");
-  SLEEP(10.0);
+  XBT_INFO("Going to sleep one more time (for 10 sec)...");
+  MSG_process_sleep(10.0);
   XBT_INFO("Waking up once for all!");
 
-  XBT_INFO("Mmmh, goodbye now.");
+  XBT_INFO("Ok, let's do some work, then (for 10 sec on Boivin).");
+  msg_task_t task = MSG_task_create("easy work", 980.95e6, 0, NULL);
+  MSG_task_execute(task);
+  MSG_task_destroy(task);
+
+  XBT_INFO("Mmmh, I'm done now. Goodbye.");
   return 0;
 }
 
-/** Dream master function. This process creates a lazy_guy process and resumes it 10 seconds later. */
+/* The Dream master: */
 static int dream_master(int argc, char *argv[])
 {
-  msg_process_t lazy = NULL;
-
-  XBT_INFO("Let's create a lazy guy.");
-  lazy = MSG_process_create("Lazy", lazy_guy, NULL, MSG_host_self());
+  XBT_INFO("Let's create a lazy guy."); /* - Create a lazy_guy process */
+  msg_process_t lazy = MSG_process_create("Lazy", lazy_guy, NULL, MSG_host_self());
   XBT_INFO("Let's wait a little bit...");
-  SLEEP(10.0);
+  MSG_process_sleep(10.0);              /* - Wait for 10 seconds */
   XBT_INFO("Let's wake the lazy guy up! >:) BOOOOOUUUHHH!!!!");
-  MSG_process_resume(lazy);
+  MSG_process_resume(lazy);             /* - Then wake up the lazy_guy */
 
-  SLEEP(5.0);
+  MSG_process_sleep(5.0);               /* Repeat two times: */
   XBT_INFO("Suspend the lazy guy while he's sleeping...");
-  MSG_process_suspend(lazy);
+  MSG_process_suspend(lazy);            /* - Suspend the lazy_guy while he's asleep */
   XBT_INFO("Let him finish his siesta.");
-  SLEEP(10.0);
+  MSG_process_sleep(10.0);              /* - Wait for 10 seconds */
   XBT_INFO("Wake up, lazy guy!");
-  MSG_process_resume(lazy);
+  MSG_process_resume(lazy);             /* - Then wake up the lazy_guy again */
 
-  SLEEP(5.0);
+  MSG_process_sleep(5.0);
   XBT_INFO("Suspend again the lazy guy while he's sleeping...");
   MSG_process_suspend(lazy);
   XBT_INFO("This time, don't let him finish his siesta.");
-  SLEEP(2.0);
+  MSG_process_sleep(2.0);
   XBT_INFO("Wake up, lazy guy!");
   MSG_process_resume(lazy);
 
-  XBT_INFO("OK, goodbye now.");
+  MSG_process_sleep(5.0);
+  XBT_INFO("Give a 2 seconds break to the lazy guy while he's working...");
+  MSG_process_suspend(lazy);
+  MSG_process_sleep(2.0);
+  XBT_INFO("Back to work, lazy guy!");
+  MSG_process_resume(lazy);
+
+  XBT_INFO("OK, I'm done here.");
   return 0;
-}                               /* end_of_dream_master */
+}
 
 int main(int argc, char *argv[])
 {
-  msg_error_t res = MSG_OK;
-
   MSG_init(&argc, argv);
   xbt_assert(argc > 1, "Usage: %s platform_file\n\tExample: %s msg_platform.xml\n", argv[0], argv[0]);
 
-  MSG_create_environment(argv[1]);
-  MSG_function_register("dream_master", dream_master);
+  MSG_create_environment(argv[1]);  /* - Load the platform description */
+  MSG_function_register("dream_master", dream_master); /* - Create and deploy the dream_master */
   xbt_dynar_t hosts = MSG_hosts_as_dynar();
   MSG_process_create("dream_master", dream_master, NULL, xbt_dynar_getfirst_as(hosts, msg_host_t));
   xbt_dynar_free(&hosts);
-  res = MSG_main();
+  msg_error_t res = MSG_main(); /* - Run the simulation */
 
-  XBT_INFO("Simulation time %g", MSG_get_clock());
   return res != MSG_OK;
 }