X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3c3d12f53cae1413d15899def85f47a6b7318795..693f30b46244c152cd79cdf3ad35d4a79b866c9c:/examples/msg/priority/priority.c

diff --git a/examples/msg/priority/priority.c b/examples/msg/priority/priority.c
index 63162cfab8..8690ec57ed 100644
--- a/examples/msg/priority/priority.c
+++ b/examples/msg/priority/priority.c
@@ -1,6 +1,5 @@
-/* 	$Id$	 */
-
-/* Copyright (c) 2002,2003,2004 Arnaud Legrand. All rights reserved.        */
+/* Copyright (c) 2007, 2008, 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. */
@@ -15,27 +14,34 @@
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
                              "Messages specific for this msg example");
 
+/** @addtogroup MSG_examples
+ * 
+ * - <b>priority/priority.c</b>: Demonstrates the use of @ref
+ *   MSG_task_set_priority to change the computation priority of a
+ *   given task.
+ *
+ */
+
 static int test(int argc, char *argv[])
 {
   double computation_amount = 0.0;
   double priority = 1.0;
   m_task_t task = NULL;
 
+  _XBT_GNUC_UNUSED int res = sscanf(argv[1], "%lg", &computation_amount);
+  xbt_assert(res, "Invalid argument %s\n", argv[1]);
+  res = sscanf(argv[2], "%lg", &priority);
+  xbt_assert(res, "Invalid argument %s\n", argv[2]);
 
-  xbt_assert1(sscanf(argv[1], "%lg", &computation_amount),
-              "Invalid argument %s\n", argv[1]);
-  xbt_assert1(sscanf(argv[2], "%lg", &priority),
-              "Invalid argument %s\n", argv[2]);
-
-  INFO2("Hello! Running a task of size %g with priority %g",
+  XBT_INFO("Hello! Running a task of size %g with priority %g",
         computation_amount, priority);
   task = MSG_task_create("Task", computation_amount, 0.0, NULL);
   MSG_task_set_priority(task, priority);
 
   MSG_task_execute(task);
+  MSG_task_destroy(task);
 
-
-  INFO0("Goodbye now!");
+  XBT_INFO("Goodbye now!");
   return 0;
 }
 
@@ -45,7 +51,6 @@ static MSG_error_t test_all(const char *platform_file,
   MSG_error_t res = MSG_OK;
 
   {                             /*  Simulation setting */
-    MSG_set_channel_number(1);
     MSG_create_environment(platform_file);
   }
   {                             /*   Application deployment */
@@ -54,7 +59,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;
 }
 
@@ -63,11 +68,12 @@ int main(int argc, char *argv[])
   MSG_error_t res = MSG_OK;
 
 #ifdef _MSC_VER
-  unsigned int prev_exponent_format = _set_output_format(_TWO_DIGIT_EXPONENT);
+  unsigned int prev_exponent_format =
+      _set_output_format(_TWO_DIGIT_EXPONENT);
 #endif
 
 
-  MSG_global_init(&argc, argv);
+  MSG_init(&argc, argv);
   if (argc < 3) {
     printf("Usage: %s platform_file deployment_file\n", argv[0]);
     printf("example: %s msg_platform.xml msg_deployment.xml\n", argv[0]);