Use msg_process_t instead of m_process_t

[simgrid.git] / examples / msg / suspend / suspend.c

diff --git a/examples/msg/suspend/suspend.c b/examples/msg/suspend/suspend.c
index 0f0ca9c..60fe071 100644 (file)
--- a/examples/msg/suspend/suspend.c
+++ b/examples/msg/suspend/suspend.c
@@ -1,6 +1,5 @@
-/*     $Id$     */
-
-/* Copyright (c) 2005 Arnaud Legrand. All rights reserved.        */
+/* Copyright (c) 2007, 2009, 2010. 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. */
@@ -13,19 +12,18 @@
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
                              "Messages specific for this msg example");
 
-typedef enum {
-  PORT_22 = 0,
-  MAX_CHANNEL
-} channel_t;
-
+/** @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("Mmmh, goodbye now.");
   return 0;
 }                               /* end_of_lazy_guy */
 
@@ -33,15 +31,15 @@ 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;
 
-  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...");
+  XBT_INFO("Let's wait a little bit...");
   MSG_process_sleep(10.0);
-  INFO0("Let's wake the lazy guy up! >:) BOOOOOUUUHHH!!!!");
+  XBT_INFO("Let's wake the lazy guy up! >:) BOOOOOUUUHHH!!!!");
   MSG_process_resume(lazy);
-  INFO0("OK, goodbye now.");
+  XBT_INFO("OK, goodbye now.");
   return 0;
 }                               /* end_of_dram_master */
 
@@ -52,8 +50,6 @@ static MSG_error_t test_all(const char *platform_file,
   MSG_error_t res = MSG_OK;
 
   {                             /*  Simulation setting */
-    MSG_set_channel_number(MAX_CHANNEL);
-    MSG_paje_output("msg_test.trace");
     MSG_create_environment(platform_file);
   }
   {                             /*   Application deployment */
@@ -62,7 +58,7 @@ static MSG_error_t test_all(const char *platform_file,
   }
   res = MSG_main();
 
-  INFO1("Simulation time %g", MSG_get_clock());
+  XBT_INFO("Simulation time %g", MSG_get_clock());
   return res;
 }                               /* end_of_test_all */
 
@@ -72,10 +68,10 @@ int main(int argc, char *argv[])
 {
   MSG_error_t res = MSG_OK;
 
-  MSG_global_init(&argc, argv);
+  MSG_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",
+    XBT_CRITICAL("Usage: %s platform_file deployment_file\n", argv[0]);
+    XBT_CRITICAL("example: %s msg_platform.xml msg_deployment_suspend.xml\n",
               argv[0]);
     exit(1);
   }