X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e88ddfbe862c7c5e5fffb64d9cfd64fa147fdffd..6c5a944539f235e71f1fadb8568c093f96fcfe34:/examples/msg/gtnets/gtnets.c

diff --git a/examples/msg/gtnets/gtnets.c b/examples/msg/gtnets/gtnets.c
index da319d8d83..8c05e56453 100644
--- a/examples/msg/gtnets/gtnets.c
+++ b/examples/msg/gtnets/gtnets.c
@@ -47,12 +47,13 @@ int master(int argc, char *argv[])
   int id = -1;
 
   if (argc != 4) {
-    INFO1("Strange number of arguments expected 3 got %d", argc - 1);
+    XBT_INFO("Strange number of arguments expected 3 got %d", argc - 1);
   }
 
   /* data size */
-  xbt_assert1(sscanf(argv[1], "%lg", &task_comm_size),
-              "Invalid argument %s\n", argv[1]);
+  int read;
+  read = sscanf(argv[1], "%lg", &task_comm_size);
+  xbt_assert(read, "Invalid argument %s\n", argv[1]);
 
   /* slave name */
   slavename = argv[2];
@@ -83,14 +84,6 @@ int master(int argc, char *argv[])
   end_time = MSG_get_clock();
 
 
-  if (!bool_printed) {
-    INFO3
-        ("Send completed (to %s). Transfer time: %f\t Agregate bandwidth: %f",
-         slave->name, (end_time - start_time),
-         task_comm_size / (end_time - start_time));
-    INFO2("Completed peer: %s time: %f", slave->name,
-          (end_time - start_time));
-  }
   return 0;
 }                               /* end_of_master */
 
@@ -108,7 +101,7 @@ int slave(int argc, char *argv[])
   char id_alias[10];
 
   if (argc != 2) {
-    INFO1("Strange number of arguments expected 1 got %d", argc - 1);
+    XBT_INFO("Strange number of arguments expected 1 got %d", argc - 1);
   }
 
   id = atoi(argv[1]);
@@ -118,24 +111,26 @@ int slave(int argc, char *argv[])
   a = MSG_task_receive(&(task), id_alias);
 
   if (a != MSG_OK) {
-    INFO0("Hey?! What's up?");
-    xbt_assert0(0, "Unexpected behavior.");
+    XBT_INFO("Hey?! What's up?");
+    xbt_die("Unexpected behavior.");
   }
 
   elapsed_time = MSG_get_clock() - start_time;
-
+  
+  
   if (!bool_printed) {
     bool_printed = 1;
+    
     for (id = 0; id < NTASKS; id++) {
       if (gl_task_array[id] == NULL) {
       } else if (gl_task_array[id] == task) {
 #ifdef HAVE_LATENCY_BOUND_TRACKING
         limited_latency = MSG_task_is_latency_bounded(gl_task_array[id]);
         if (limited_latency) {
-          INFO1("WARNING FLOW[%d] is limited by latency!!", id);
+          XBT_INFO("WARNING FLOW[%d] is limited by latency!!", id);
         }
 #endif
-        INFO5
+        XBT_INFO
             ("===> Estimated Bw of FLOW[%d] : %f ;  message from %s to %s  with remaining : %f",
              id, gl_data_size[id] / elapsed_time, masternames[id],
              slavenames[id], 0.0);
@@ -146,10 +141,10 @@ int slave(int argc, char *argv[])
         limited_latency = MSG_task_is_latency_bounded(gl_task_array[id]);
 
         if (limited_latency) {
-          INFO1("WARNING FLOW[%d] is limited by latency!!", id);
+          XBT_INFO("WARNING FLOW[%d] is limited by latency!!", id);
         }
 #endif
-        INFO5
+        XBT_INFO
             ("===> Estimated Bw of FLOW[%d] : %f ;  message from %s to %s  with remaining : %f",
              id, (gl_data_size[id] - remaining) / elapsed_time,
              masternames[id], slavenames[id], remaining);
@@ -177,6 +172,9 @@ MSG_error_t test_all(const char *platform_file,
     MSG_set_channel_number(MAX_CHANNEL);
     MSG_create_environment(platform_file);
   }
+
+  TRACE_declare_mark("endmark");
+
   {                             /*   Application deployment */
     MSG_function_register("master", master);
     MSG_function_register("slave", slave);
@@ -198,8 +196,6 @@ int main(int argc, char *argv[])
     exit(1);
   }
 
-  TRACE_declare_mark("endmark");
-
   res = test_all(argv[1], argv[2]);
 
   MSG_clean();