using a trace marker to register the end of each flow in the gtnets example

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

diff --git a/examples/msg/gtnets/gtnets.c b/examples/msg/gtnets/gtnets.c
index b8c0f20..d25c64f 100644 (file)
--- a/examples/msg/gtnets/gtnets.c
+++ b/examples/msg/gtnets/gtnets.c
@@ -56,17 +56,16 @@ int master(int argc, char *argv[])
   /* slave name */
   slavename = argv[2];
   id = atoi(argv[3]);
-  sprintf(id_alias, "%d", id);
+  sprintf(id_alias, "flow_%d", id);
   slavenames[id] = slavename;
-
-  TRACE_category (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);
-    TRACE_msg_set_task_category(todo,slavename);
+    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;
@@ -77,6 +76,7 @@ int master(int argc, char *argv[])
   }
 
   /* time measurement */
+  sprintf(id_alias, "%d", id);
   start_time = MSG_get_clock();
   MSG_task_send(todo, id_alias);
   end_time = MSG_get_clock();
@@ -98,6 +98,7 @@ int slave(int argc, char *argv[])
   m_task_t task = NULL;
   int a;
   int id = 0;
+  int limited_latency=0;
   double remaining = 0;
   char id_alias[10];
 
@@ -107,6 +108,7 @@ int slave(int argc, char *argv[])
 
   id = atoi(argv[1]);
   sprintf(id_alias, "%d", id);
+  int trace_id = id;
 
   a = MSG_task_receive(&(task), id_alias);
 
@@ -122,19 +124,32 @@ int slave(int argc, char *argv[])
     for (id = 0; id < NTASKS; id++) {
       if (gl_task_array[id] == NULL) {
       } else if (gl_task_array[id] == task) {
-        INFO5
+         limited_latency = MSG_task_is_latency_bounded(gl_task_array[id]);
+          if(limited_latency){
+                 INFO1("WARNING FLOW[%d] is limited by latency!!", id);
+          }
+         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);
       } else {
         remaining = MSG_task_get_remaining_communication(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);
+        }
         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);
       }
+
     }
   }  
+  char mark[100];
+  snprintf (mark, 100, "flow_%d_finished", trace_id);
+  TRACE_mark ("endmark", mark);
 
   MSG_task_destroy(task);
   return 0;
@@ -166,13 +181,15 @@ int main(int argc, char *argv[])
   MSG_error_t res = MSG_OK;
   bool_printed = 0;
 
-  TRACE_start ("z_gtnets.trace");
-
   MSG_global_init(&argc, argv);
   if (argc < 3) {
     printf("Usage: %s platform_file deployment_file\n", argv[0]);
     exit(1);
   }
+
+  TRACE_start ();
+  TRACE_declare_mark ("endmark");
+
   res = test_all(argv[1], argv[2]);
 
   MSG_clean();