[trace] Fix tests: tracing-ms, and tracing-categories.

[simgrid.git] / examples / msg / masterslave / masterslave_failure.c

diff --git a/examples/msg/masterslave/masterslave_failure.c b/examples/msg/masterslave/masterslave_failure.c
index 901d08c..58d0e4a 100644 (file)
--- a/examples/msg/masterslave/masterslave_failure.c
+++ b/examples/msg/masterslave/masterslave_failure.c
@@ -35,16 +35,15 @@ int master(int argc, char *argv[])
   int number_of_tasks = 0;
   double task_comp_size = 0;
   double task_comm_size = 0;
-
-
   int i;
+  int read;
 
-  xbt_assert1(sscanf(argv[1], "%d", &number_of_tasks),
-              "Invalid argument %s\n", argv[1]);
-  xbt_assert1(sscanf(argv[2], "%lg", &task_comp_size),
-              "Invalid argument %s\n", argv[2]);
-  xbt_assert1(sscanf(argv[3], "%lg", &task_comm_size),
-              "Invalid argument %s\n", argv[3]);
+  read = sscanf(argv[1], "%d", &number_of_tasks);
+  xbt_assert(read, "Invalid argument %s\n", argv[1]);
+  read = sscanf(argv[2], "%lg", &task_comp_size);
+  xbt_assert(read, "Invalid argument %s\n", argv[2]);
+  read = sscanf(argv[3], "%lg", &task_comm_size);
+  xbt_assert(read, "Invalid argument %s\n", argv[3]);
 
   {                             /* Process organisation */
     slaves_count = argc - 4;
@@ -96,7 +95,7 @@ int master(int argc, char *argv[])
       MSG_task_destroy(task);
     } else {
       XBT_INFO("Hey ?! What's up ? ");
-      xbt_assert0(0, "Unexpected behavior");
+      xbt_die( "Unexpected behavior");
     }
   }
 
@@ -124,8 +123,7 @@ int master(int argc, char *argv[])
       MSG_task_destroy(task);
     } else {
       XBT_INFO("Hey ?! What's up ? ");
-      xbt_assert2(0, "Unexpected behavior with '%s': %d", slaves[i]->name,
-                  a);
+      xbt_die("Unexpected behavior with '%s': %d", slaves[i]->name, a);
     }
   }
 
@@ -166,7 +164,7 @@ int slave(int argc, char *argv[])
         return 0;
       } else {
         XBT_INFO("Hey ?! What's up ? ");
-        xbt_assert0(0, "Unexpected behavior");
+        xbt_die("Unexpected behavior");
       }
     } else if (a == MSG_HOST_FAILURE) {
       XBT_INFO
@@ -176,7 +174,7 @@ int slave(int argc, char *argv[])
       XBT_INFO("Mmh. Something went wrong. Nevermind. Let's keep going!");
     } else {
       XBT_INFO("Hey ?! What's up ? ");
-      xbt_assert0(0, "Unexpected behavior");
+      xbt_die("Unexpected behavior");
     }
   }
   XBT_INFO("I'm done. See you!");