X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2d84fcdff740a04c83fa4db136db739ca4f130fe..4fb3673da5b0ac154b2f70e40ccd11cf8993da32:/src/simdag/sd_task.cpp

diff --git a/src/simdag/sd_task.cpp b/src/simdag/sd_task.cpp
index 655197b69f..ec7cc997c5 100644
--- a/src/simdag/sd_task.cpp
+++ b/src/simdag/sd_task.cpp
@@ -87,8 +87,6 @@ SD_task_t SD_task_create(const char *name, void *data, double amount)
 
   sd_global->task_number++;
 
-  TRACE_sd_task_create(task);
-
   return task;
 }
 
@@ -121,9 +119,6 @@ SD_task_t SD_task_create_comm_e2e(const char *name, void *data,
   res->bytes_amount[2] = amount;
   res->kind = SD_TASK_COMM_E2E;
 
-  TRACE_category("COMM_E2E");
-  TRACE_sd_set_task_category(res, "COMM_E2E");
-
   return res;
 }
 
@@ -149,9 +144,6 @@ SD_task_t SD_task_create_comp_seq(const char *name, void *data,
   res->flops_amount[0] = flops_amount;
   res->kind = SD_TASK_COMP_SEQ;
 
-  TRACE_category("COMP_SEQ");
-  TRACE_sd_set_task_category(res, "COMP_SEQ");
-
   return res;
 }
 
@@ -182,9 +174,6 @@ SD_task_t SD_task_create_comp_par_amdahl(const char *name, void *data,
   res->alpha = alpha;
   res->kind = SD_TASK_COMP_PAR_AMDAHL;
 
-  TRACE_category("COMP_PAR_AMDAHL");
-  TRACE_sd_set_task_category(res, "COMP_PAR_AMDAHL");
-
   return res;
 }
 
@@ -214,9 +203,6 @@ SD_task_t SD_task_create_comm_par_mxn_1d_block(const char *name, void *data,
   res->workstation_list=NULL;
   res->kind = SD_TASK_COMM_PAR_MXN_1D_BLOCK;
 
-  TRACE_category("COMM_PAR_MXN_1D_BLOCK");
-  TRACE_sd_set_task_category(res, "COMM_PAR_MXN_1D_BLOCK");
-
   return res;
 }
 
@@ -252,8 +238,6 @@ void SD_task_destroy(SD_task_t task)
   xbt_free(task->bytes_amount);
   xbt_free(task->flops_amount);
 
-  TRACE_sd_task_destroy(task);
-
   xbt_mallocator_release(sd_global->task_mallocator,task);
   sd_global->task_number--;
 
@@ -1246,8 +1230,8 @@ void SD_task_schedulev(SD_task_t task, int count,
   if (task->kind == SD_TASK_COMM_E2E) {
     XBT_VERB("Schedule comm task %s between %s -> %s. It costs %.f bytes",
           SD_task_get_name(task),
-          SD_workstation_get_name(task->workstation_list[0]),
-          SD_workstation_get_name(task->workstation_list[1]),
+          sg_host_get_name(task->workstation_list[0]),
+          sg_host_get_name(task->workstation_list[1]),
           task->bytes_amount[2]);
 
   }
@@ -1257,7 +1241,7 @@ void SD_task_schedulev(SD_task_t task, int count,
   if (task->kind == SD_TASK_COMP_SEQ) {
     XBT_VERB("Schedule computation task %s on %s. It costs %.f flops",
           SD_task_get_name(task),
-          SD_workstation_get_name(task->workstation_list[0]),
+          sg_host_get_name(task->workstation_list[0]),
           task->flops_amount[0]);
 
     xbt_dynar_foreach(task->tasks_before, cpt, dep) {
@@ -1271,8 +1255,8 @@ void SD_task_schedulev(SD_task_t task, int count,
           XBT_VERB
               ("Auto-Schedule comm task %s between %s -> %s. It costs %.f bytes",
                SD_task_get_name(before),
-               SD_workstation_get_name(before->workstation_list[0]),
-               SD_workstation_get_name(before->workstation_list[1]),
+               sg_host_get_name(before->workstation_list[0]),
+               sg_host_get_name(before->workstation_list[1]),
                before->bytes_amount[2]);
         }
       }
@@ -1287,8 +1271,8 @@ void SD_task_schedulev(SD_task_t task, int count,
           XBT_VERB
               ("Auto-Schedule comm task %s between %s -> %s. It costs %.f bytes",
                SD_task_get_name(after),
-               SD_workstation_get_name(after->workstation_list[0]),
-               SD_workstation_get_name(after->workstation_list[1]),
+               sg_host_get_name(after->workstation_list[0]),
+               sg_host_get_name(after->workstation_list[1]),
                after->bytes_amount[2]);
 
         }
@@ -1344,8 +1328,8 @@ void SD_task_schedulev(SD_task_t task, int count,
               dst_start = j*before->amount/dst_nb;
               dst_end = dst_start + before->amount/dst_nb;
               XBT_VERB("(%s->%s): (%.2f, %.2f)-> (%.2f, %.2f)",
-                  SD_workstation_get_name(before->workstation_list[i]),
-                  SD_workstation_get_name(before->workstation_list[src_nb+j]),
+                  sg_host_get_name(before->workstation_list[i]),
+                  sg_host_get_name(before->workstation_list[src_nb+j]),
                   src_start, src_end, dst_start, dst_end);
               if ((src_end <= dst_start) || (dst_end <= src_start)) {
                 before->bytes_amount[i*(src_nb+dst_nb)+src_nb+j]=0.0;