X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/16bbb8a8212497d9c44c81333ed2c0e689e0c5af..2a5be1efbd30fcf80a06645c196fcec50b19e665:/examples/msg/suspend/suspend.c

diff --git a/examples/msg/suspend/suspend.c b/examples/msg/suspend/suspend.c
index a36254ae65..84da0a8b30 100644
--- a/examples/msg/suspend/suspend.c
+++ b/examples/msg/suspend/suspend.c
@@ -4,23 +4,18 @@
 /* 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 "simgrid/msg.h"            /* Yeah! If you want to use msg, you need to include simgrid/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");
 
 #define SLEEP(duration)                                 \
   if (MSG_process_sleep(duration) != MSG_OK)            \
-    xbt_die("What's going on??? I failed to sleep!");   \
-  else                                                  \
-    (void)0
+    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.
+ * - <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.  */
@@ -42,8 +37,7 @@ static int lazy_guy(int argc, char *argv[])
   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[])
 {
   msg_process_t lazy = NULL;
@@ -73,39 +67,22 @@ static int dream_master(int argc, char *argv[])
 
   XBT_INFO("OK, goodbye now.");
   return 0;
-}                               /* end_of_dram_master */
+}                               /* end_of_dream_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_create_environment(platform_file);
-  }
-  {                             /*   Application deployment */
-    MSG_function_register("dream_master", dream_master);
-    MSG_launch_application(application_file);
-  }
-  res = MSG_main();
-
-  XBT_INFO("Simulation time %g", MSG_get_clock());
-  return res;
-}                               /* end_of_test_all */
-
-
-/** Main function */
 int main(int argc, char *argv[])
 {
   msg_error_t res = MSG_OK;
 
   MSG_init(&argc, argv);
-  xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n"
-            "\tExample: %s msg_platform.xml msg_deployment_suspend.xml\n", 
-            argv[0], argv[0]);
+  xbt_assert(argc > 1, "Usage: %s platform_file\n\tExample: %s msg_platform.xml\n", argv[0], argv[0]);
 
-  test_all(argv[1], argv[2]);
+  MSG_create_environment(argv[1]);
+  MSG_function_register("dream_master", 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();
 
+  XBT_INFO("Simulation time %g", MSG_get_clock());
   return res != MSG_OK;
 }