smooth differences between tests before merge

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

diff --git a/examples/msg/gtnets/gtnets.c b/examples/msg/gtnets/gtnets.c
index 83758ac..59884be 100644 (file)
--- a/examples/msg/gtnets/gtnets.c
+++ b/examples/msg/gtnets/gtnets.c
@@ -28,32 +28,24 @@ int count_finished = 0;
 
 static int master(int argc, char *argv[])
 {
-  char *slavename = NULL;
-  double task_comm_size = 0;
   msg_task_t todo;
-  char id_alias[10];
-  //unique id to control statistics
-  int id = -1;
 
   xbt_assert(argc == 4, "Strange number of arguments expected 3 got %d", argc - 1);
 
   /* data size */
-  int read;
-  read = sscanf(argv[1], "%lg", &task_comm_size);
-  xbt_assert(read, "Invalid argument %s\n", argv[1]);
+  double task_comm_size = xbt_str_parse_double(argv[1], "Invalid task communication size: %s");
 
   /* slave name */
-  slavename = argv[2];
-  id = atoi(argv[3]);
-  sprintf(id_alias, "flow_%d", id);
+  char *slavename = argv[2];
+  int id = xbt_str_parse_int(argv[3], "Invalid ID as argument 3: %s");   //unique id to control statistics
+  char *id_alias = bprintf("flow_%d", id);
   slavenames[id] = slavename;
   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);
+    todo = MSG_task_create("Task_0", 0, task_comm_size, NULL);
     MSG_task_set_category(todo, id_alias);
     //keep track of running tasks
     gl_task_array[id] = todo;
@@ -68,25 +60,23 @@ static int master(int argc, char *argv[])
   MSG_task_send(todo, id_alias);
   end_time = MSG_get_clock();
 
+  xbt_free(id_alias);
   return 0;
 }
 
 static int slave(int argc, char *argv[])
 {
   msg_task_t task = NULL;
-#ifdef HAVE_LATENCY_BOUND_TRACKING
-  int limited_latency = 0;
-#endif
   double remaining = 0;
   char id_alias[10];
 
   xbt_assert(argc == 2, "Strange number of arguments expected 1 got %d", argc - 1);
 
-  int id = atoi(argv[1]);
+  int id = xbt_str_parse_int(argv[1], "Invalid id: %s");
   sprintf(id_alias, "%d", id);
   int trace_id = id;
 
-  int a = MSG_task_receive(&(task), id_alias);
+  msg_error_t a = MSG_task_receive(&(task), id_alias);
 
   count_finished--;
   if(count_finished == 0){
@@ -103,25 +93,12 @@ static int slave(int argc, char *argv[])
     for (id = 0; id < NTASKS; id++) {
       if (gl_task_array[id] == NULL) continue;
       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) {
-          XBT_INFO("WARNING FLOW[%d] is limited by latency!!", id);
-        }
-#endif
         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);
         MSG_task_destroy(gl_task_array[id]);
         gl_task_array[id]=NULL;
       } else {
         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]);
-
-        if (limited_latency) {
-          XBT_INFO("WARNING FLOW[%d] is limited by latency!!", id);
-        }
-#endif
         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);
         if(remaining==0) {
@@ -151,7 +128,6 @@ int main(int argc, char *argv[])
              "\tExample: %s platform.xml deployment.xml\n", argv[0], argv[0]);
 
   MSG_create_environment(argv[1]);
-
   TRACE_declare_mark("endmark");
 
   MSG_function_register("master", master);