X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/48a6c50a85f2d0d71990bd4a57d23fb6d763f64a..f2df13795e01302813a6aef10825ec7e922ce530:/examples/msg/suspend/suspend.c

diff --git a/examples/msg/suspend/suspend.c b/examples/msg/suspend/suspend.c
index e1e2ba87a6..b12fbf4a1e 100644
--- a/examples/msg/suspend/suspend.c
+++ b/examples/msg/suspend/suspend.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2007, 2009-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -12,6 +12,16 @@
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
                              "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!");   \
+  else                                                  \
+    (void)0
+
+/** @addtogroup MSG_examples
+ * 
+ * - <b>suspend/suspend.c</b>: Demonstrates how to suspend and resume processes using @ref MSG_process_suspend and @ref MSG_process_resume.
+ */
 
 /** Lazy guy function. This process suspends itself asap.  */
 static int lazy_guy(int argc, char *argv[])
@@ -19,6 +29,15 @@ 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());
   XBT_INFO("Uuuh ? Did somebody call me ?");
+
+  XBT_INFO("Going to sleep...");
+  SLEEP(10.0);
+  XBT_INFO("Mmm... waking up.");
+
+  XBT_INFO("Going to sleep one more time...");
+  SLEEP(10.0);
+  XBT_INFO("Waking up once for all!");
+
   XBT_INFO("Mmmh, goodbye now.");
   return 0;
 }                               /* end_of_lazy_guy */
@@ -27,23 +46,40 @@ static int lazy_guy(int argc, char *argv[])
     resumes it 10 seconds later. */
 static int dream_master(int argc, char *argv[])
 {
-  m_process_t lazy = NULL;
+  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 wait a little bit...");
-  MSG_process_sleep(10.0);
+  SLEEP(10.0);
   XBT_INFO("Let's wake the lazy guy up! >:) BOOOOOUUUHHH!!!!");
   MSG_process_resume(lazy);
+
+  SLEEP(5.0);
+  XBT_INFO("Suspend the lazy guy while he's sleeping...");
+  MSG_process_suspend(lazy);
+  XBT_INFO("Let him finish his siesta.");
+  SLEEP(10.0);
+  XBT_INFO("Wake up, lazy guy!");
+  MSG_process_resume(lazy);
+
+  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);
+  XBT_INFO("Wake up, lazy guy!");
+  MSG_process_resume(lazy);
+
   XBT_INFO("OK, goodbye now.");
   return 0;
 }                               /* end_of_dram_master */
 
 /** Test function */
-static MSG_error_t test_all(const char *platform_file,
+static msg_error_t test_all(const char *platform_file,
                             const char *application_file)
 {
-  MSG_error_t res = MSG_OK;
+  msg_error_t res = MSG_OK;
 
   {                             /*  Simulation setting */
     MSG_create_environment(platform_file);
@@ -62,9 +98,9 @@ static MSG_error_t test_all(const char *platform_file,
 /** Main function */
 int main(int argc, char *argv[])
 {
-  MSG_error_t res = MSG_OK;
+  msg_error_t res = MSG_OK;
 
-  MSG_global_init(&argc, argv);
+  MSG_init(&argc, argv);
   if (argc < 3) {
     XBT_CRITICAL("Usage: %s platform_file deployment_file\n", argv[0]);
     XBT_CRITICAL("example: %s msg_platform.xml msg_deployment_suspend.xml\n",
@@ -72,7 +108,6 @@ int main(int argc, char *argv[])
     exit(1);
   }
   test_all(argv[1], argv[2]);
-  res = MSG_clean();
 
   if (res == MSG_OK)
     return 0;