Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[simgrid.git] / 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 d4e79ba..19184ef 100644 (file)
--- a/examples/msg/process-suspend/process-suspend.c
+++ b/examples/msg/process-suspend/process-suspend.c
@@ -19,21 +19,24 @@ static int lazy_guy(int argc, char *argv[])
   MSG_process_sleep(10.0);
   XBT_INFO("Mmm... waking up.");
 
-  XBT_INFO("Going to sleep one more time...");
+  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;
 }
 
 /* The Dream master: */
 static int dream_master(int argc, char *argv[])
 {
-  msg_process_t lazy = NULL;
-
   XBT_INFO("Let's create a lazy guy."); /* - Create a lazy_guy process */
-  lazy = MSG_process_create("Lazy", lazy_guy, NULL, MSG_host_self());
+  msg_process_t lazy = MSG_process_create("Lazy", lazy_guy, NULL, MSG_host_self());
   XBT_INFO("Let's wait a little bit...");
   MSG_process_sleep(10.0);              /* - Wait for 10 seconds */
   XBT_INFO("Let's wake the lazy guy up! >:) BOOOOOUUUHHH!!!!");
@@ -55,14 +58,19 @@ static int dream_master(int argc, char *argv[])
   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;
 }
 
 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]);
 
@@ -71,8 +79,7 @@ int main(int argc, char *argv[])
   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();                 /* - Run the simulation */
+  msg_error_t res = MSG_main(); /* - Run the simulation */
 
-  XBT_INFO("Simulation time %g", MSG_get_clock());
   return res != MSG_OK;
 }