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

diff --git a/examples/msg/gtnets/gtnets.c b/examples/msg/gtnets/gtnets.c
index 22adcee44a..8c05e56453 100644
--- a/examples/msg/gtnets/gtnets.c
+++ b/examples/msg/gtnets/gtnets.c
@@ -15,7 +15,8 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
 
 int master(int argc, char *argv[]);
 int slave(int argc, char *argv[]);
-MSG_error_t test_all(const char *platform_file, const char *application_file);
+MSG_error_t test_all(const char *platform_file,
+                     const char *application_file);
 
 typedef enum {
   PORT_22 = 0,
@@ -46,26 +47,27 @@ 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];
   id = atoi(argv[3]);
   sprintf(id_alias, "flow_%d", id);
   slavenames[id] = slavename;
-  TRACE_category (id_alias);
+  TRACE_category(id_alias);
 
   masternames[id] = MSG_host_get_name(MSG_host_self());
 
   {                             /*  Task creation.  */
     char sprintf_buffer[64] = "Task_0";
     todo = MSG_task_create(sprintf_buffer, 0, task_comm_size, NULL);
-    TRACE_msg_set_task_category(todo,id_alias);
+    TRACE_msg_set_task_category(todo, id_alias);
     //keep track of running tasks
     gl_task_array[id] = todo;
     gl_data_size[id] = task_comm_size;
@@ -82,12 +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 */
 
@@ -99,13 +95,13 @@ int slave(int argc, char *argv[])
   int a;
   int id = 0;
 #ifdef HAVE_LATENCY_BOUND_TRACKING
-  int limited_latency=0;
+  int limited_latency = 0;
 #endif
   double remaining = 0;
   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]);
@@ -115,54 +111,58 @@ 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);
-          }
+        limited_latency = MSG_task_is_latency_bounded(gl_task_array[id]);
+        if (limited_latency) {
+          XBT_INFO("WARNING FLOW[%d] is limited by latency!!", id);
+        }
 #endif
-    	  INFO5
-          ("===> 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);
+        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);
       } else {
-        remaining = MSG_task_get_remaining_communication(gl_task_array[id]);
+        remaining =
+            MSG_task_get_remaining_communication(gl_task_array[id]);
 #ifdef HAVE_LATENCY_BOUND_TRACKING
-     	limited_latency = MSG_task_is_latency_bounded(gl_task_array[id]);
+        limited_latency = MSG_task_is_latency_bounded(gl_task_array[id]);
 
-        if(limited_latency){
-      	  INFO1("WARNING FLOW[%d] is limited by latency!!", id);
+        if (limited_latency) {
+          XBT_INFO("WARNING FLOW[%d] is limited by latency!!", id);
         }
 #endif
-        INFO5
-          ("===> 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);
+        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);
       }
 
     }
-  }  
+  }
   char mark[100];
-  snprintf (mark, 100, "flow_%d_finished", trace_id);
-  TRACE_mark ("endmark", mark);
+  snprintf(mark, 100, "flow_%d_finished", trace_id);
+  TRACE_mark("endmark", mark);
 
   MSG_task_destroy(task);
   return 0;
 }                               /* end_of_slave */
 
 /** Test function */
-MSG_error_t test_all(const char *platform_file, const char *application_file)
+MSG_error_t test_all(const char *platform_file,
+                     const char *application_file)
 {
   MSG_error_t res = MSG_OK;
 
@@ -172,6 +172,9 @@ MSG_error_t test_all(const char *platform_file, const char *application_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);
@@ -193,15 +196,10 @@ int main(int argc, char *argv[])
     exit(1);
   }
 
-  TRACE_start ();
-  TRACE_declare_mark ("endmark");
-
   res = test_all(argv[1], argv[2]);
 
   MSG_clean();
 
-  TRACE_end ();
-
   if (res == MSG_OK)
     return 0;
   else