X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6760cb07d6b57be16928d95339d71e57c4e24f36..8c3cc1fe798afef50589651b016317b4d5abb74a:/examples/msg/suspend/suspend.c

diff --git a/examples/msg/suspend/suspend.c b/examples/msg/suspend/suspend.c
index c8e045af3f..13db39fea6 100644
--- a/examples/msg/suspend/suspend.c
+++ b/examples/msg/suspend/suspend.c
@@ -1,87 +1,86 @@
-/* Copyright (c) 2007, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2007, 2009-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "msg/msg.h"            /* Yeah! If you want to use msg, you need to include msg/msg.h */
-#include "xbt/sysdep.h"         /* calloc */
+#include "simgrid/msg.h"
 
-/* Create a log channel to have nice outputs. */
-#include "xbt/log.h"
-XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
-                             "Messages specific for this msg example");
+XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
 
-typedef enum {
-  PORT_22 = 0,
-  MAX_CHANNEL
-} channel_t;
+#define SLEEP(duration)                                 \
+  if (MSG_process_sleep(duration) != MSG_OK)            \
+    xbt_die("What's going on??? I failed to sleep!");
 
+/** @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[])
 {
-  INFO0("Nobody's watching me ? Let's go to sleep.");
+  XBT_INFO("Nobody's watching me ? Let's go to sleep.");
   MSG_process_suspend(MSG_process_self());
-  INFO0("Uuuh ? Did somebody call me ?");
-  INFO0("Mmmh, goodbye now.");
+  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 */
 
-/** Dream master function. This process creates a lazy_guy process and
-    resumes it 10 seconds later. */
+/** Dream master function. This process creates a lazy_guy process and resumes it 10 seconds later. */
 static int dream_master(int argc, char *argv[])
 {
-  m_process_t lazy = NULL;
+  msg_process_t lazy = NULL;
 
-  INFO0("Let's create a lazy guy.");
+  XBT_INFO("Let's create a lazy guy.");
   lazy = MSG_process_create("Lazy", lazy_guy, NULL, MSG_host_self());
-  INFO0("Let's wait a little bit...");
-  MSG_process_sleep(10.0);
-  INFO0("Let's wake the lazy guy up! >:) BOOOOOUUUHHH!!!!");
+  XBT_INFO("Let's wait a little bit...");
+  SLEEP(10.0);
+  XBT_INFO("Let's wake the lazy guy up! >:) BOOOOOUUUHHH!!!!");
   MSG_process_resume(lazy);
-  INFO0("OK, goodbye now.");
-  return 0;
-}                               /* end_of_dram_master */
 
-/** Test function */
-static MSG_error_t test_all(const char *platform_file,
-                            const char *application_file)
-{
-  MSG_error_t res = MSG_OK;
-
-  {                             /*  Simulation setting */
-    MSG_set_channel_number(MAX_CHANNEL);
-    MSG_create_environment(platform_file);
-  }
-  {                             /*   Application deployment */
-    MSG_function_register("dream_master", dream_master);
-    MSG_launch_application(application_file);
-  }
-  res = MSG_main();
+  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);
 
-  INFO1("Simulation time %g", MSG_get_clock());
-  return res;
-}                               /* end_of_test_all */
+  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_dream_master */
 
-/** Main function */
 int main(int argc, char *argv[])
 {
-  MSG_error_t res = MSG_OK;
-
-  MSG_global_init(&argc, argv);
-  if (argc < 3) {
-    CRITICAL1("Usage: %s platform_file deployment_file\n", argv[0]);
-    CRITICAL1("example: %s msg_platform.xml msg_deployment_suspend.xml\n",
-              argv[0]);
-    exit(1);
-  }
-  test_all(argv[1], argv[2]);
-  res = MSG_clean();
-
-  if (res == MSG_OK)
-    return 0;
-  else
-    return 1;
-}                               /* end_of_main */
+  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_process_create("dream_master", dream_master, NULL, xbt_dynar_getfirst_as(MSG_hosts_as_dynar(), msg_host_t));
+  res = MSG_main();
+
+  XBT_INFO("Simulation time %g", MSG_get_clock());
+  return res != MSG_OK;
+}