X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6760cb07d6b57be16928d95339d71e57c4e24f36..1a042c3771c14fdc9ec1a98ca60fc70ed933dc17:/examples/msg/masterslave/masterslave_mailbox.c

diff --git a/examples/msg/masterslave/masterslave_mailbox.c b/examples/msg/masterslave/masterslave_mailbox.c
index f6ac5cb607..80497e5aba 100644
--- a/examples/msg/masterslave/masterslave_mailbox.c
+++ b/examples/msg/masterslave/masterslave_mailbox.c
@@ -26,8 +26,6 @@ int master(int argc, char *argv[])
   double task_comm_size = atof(argv[3]);
   long slaves_count = atol(argv[4]);
 
-  TRACE_host_variable_set ("is_master", 1);
-
   int i;
 
   INFO2("Got %ld slaves and %ld tasks to process", slaves_count,number_of_tasks);
@@ -40,8 +38,6 @@ int master(int argc, char *argv[])
     sprintf(mailbox,"slave-%ld",i % slaves_count);
     sprintf(sprintf_buffer, "Task_%d", i);
     task = MSG_task_create(sprintf_buffer, task_comp_size, task_comm_size, NULL);
-    TRACE_host_variable_set ("task_creation", i);
-    TRACE_msg_set_task_category (task, "compute");
     if (number_of_tasks<10000 || i%10000 == 0) 
       INFO3("Sending \"%s\" (of %ld) to mailbox \"%s\"", task->name, number_of_tasks, mailbox);
      
@@ -54,7 +50,6 @@ int master(int argc, char *argv[])
     
      sprintf(mailbox,"slave-%ld",i % slaves_count); 
      m_task_t finalize = MSG_task_create ("finalize", 0, 0, 0);
-     TRACE_msg_set_task_category(finalize, "finalize");
      MSG_task_send(finalize, mailbox);
    } 
   
@@ -70,8 +65,6 @@ int slave(int argc, char *argv[])
   int id = -1;
   char mailbox[80];
 
-  TRACE_host_variable_set ("is_slave", 1);
-
   xbt_assert1(sscanf(argv[1],"%d", &id),
 	 "Invalid argument %s\n",argv[1]);
 
@@ -88,7 +81,6 @@ int slave(int argc, char *argv[])
     }
      
 //    INFO1("Processing \"%s\"", MSG_task_get_name(task));
-    TRACE_host_variable_add ("task_computation", MSG_task_get_compute_duration(task));
     MSG_task_execute(task);
 //    INFO1("\"%s\" done", MSG_task_get_name(task));
     MSG_task_destroy(task);
@@ -125,26 +117,6 @@ MSG_error_t test_all(const char *platform_file,
 int main(int argc, char *argv[])
 {
   MSG_error_t res = MSG_OK;
-  int is_tracing = 0;
-  int i;
-
-  for (i = 0; i < argc; i++){
-    if (!strcmp (argv[i], "--trace")){
-      is_tracing = 1;
-    }
-  }
-
-  if (is_tracing){
-    //if TRACE_start is not called, all other tracing
-    //functions will be disabled
-    TRACE_start ("simulation.trace");
-  }
-  TRACE_host_variable_declare ("is_slave");
-  TRACE_host_variable_declare ("is_master");
-  TRACE_host_variable_declare ("task_creation");
-  TRACE_host_variable_declare ("task_computation");
-  TRACE_category ("compute");
-  TRACE_category ("finalize");
 
   MSG_global_init(&argc,argv);
   if (argc < 3) {
@@ -156,10 +128,6 @@ int main(int argc, char *argv[])
    SIMIX_message_sizes_output("toto.txt");
   MSG_clean();
 
-  if (is_tracing){
-    TRACE_end();
-  }
-
   if(res==MSG_OK)
     return 0;
   else