FAQ updated with tracing options, change on the trace interface

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

diff --git a/examples/msg/gtnets/gtnets.c b/examples/msg/gtnets/gtnets.c
index fe661af..b8c0f20 100644 (file)
--- a/examples/msg/gtnets/gtnets.c
+++ b/examples/msg/gtnets/gtnets.c
@@ -1,3 +1,9 @@
+/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include "msg/msg.h"
@@ -53,11 +59,14 @@ int master(int argc, char *argv[])
   sprintf(id_alias, "%d", id);
   slavenames[id] = slavename;
 
+  TRACE_category (slavename);
+
   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);
     //keep track of running tasks
     gl_task_array[id] = todo;
     gl_data_size[id] = task_comm_size;
@@ -70,13 +79,15 @@ int master(int argc, char *argv[])
   /* time measurement */
   start_time = MSG_get_clock();
   MSG_task_send(todo, id_alias);
-
   end_time = MSG_get_clock();
-  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));
 
+
+  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 */
 
@@ -123,17 +134,9 @@ int slave(int argc, char *argv[])
            slavenames[id], remaining);
       }
     }
-    exit(0);
-  }
-
-  for (id = 0; id < NTASKS; id++) {
-    if (gl_task_array[id] == task) {
-      MSG_task_destroy(task);
-      gl_task_array[id] = NULL;
-      return 0;
-    }
-  }
+  }  
 
+  MSG_task_destroy(task);
   return 0;
 }                               /* end_of_slave */
 
@@ -163,6 +166,8 @@ 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]);
@@ -172,6 +177,8 @@ int main(int argc, char *argv[])
 
   MSG_clean();
 
+  TRACE_end ();
+
   if (res == MSG_OK)
     return 0;
   else