Remove usage of xbt_assert[0-9].

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

diff --git a/examples/msg/priority/priority.c b/examples/msg/priority/priority.c
index 8eaf731..9c5eb23 100644 (file)
--- 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. */
@@ -21,21 +20,20 @@ static int test(int argc, char *argv[])
   double priority = 1.0;
   m_task_t task = NULL;
 
+  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;
 }
 
@@ -46,7 +44,6 @@ static MSG_error_t test_all(const char *platform_file,
 
   {                             /*  Simulation setting */
     MSG_set_channel_number(1);
-    MSG_paje_output("msg_test.trace");
     MSG_create_environment(platform_file);
   }
   {                             /*   Application deployment */
@@ -55,7 +52,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;
 }
 
@@ -64,7 +61,8 @@ 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