SimDag Revolution: SD_workstation becomes sg_host

[simgrid.git] / src / simdag / sd_dotloader.cpp

diff --git a/src/simdag/sd_dotloader.cpp b/src/simdag/sd_dotloader.cpp
index 314ca14..9333294 100644 (file)
--- a/src/simdag/sd_dotloader.cpp
+++ b/src/simdag/sd_dotloader.cpp
@@ -45,18 +45,6 @@ static void dot_task_p_free(void *task) {
   SD_task_destroy(*t);
 }
 
-static void TRACE_sd_dotloader (SD_task_t task, const char *category) {
-  if (category && strlen (category)){
-    if (task->category)
-      XBT_DEBUG("Change the category of %s from %s to %s",
-          task->name, task->category, category);
-    else
-      XBT_DEBUG("Set the category of %s to %s",task->name, category);
-    TRACE_category (category);
-    TRACE_sd_set_task_category(task, category);
-  }
-}
-
 /** @brief loads a DOT file describing a DAG
  * 
  * See http://www.graphviz.org/doc/info/lang.html
@@ -88,7 +76,7 @@ xbt_dynar_t SD_dotload_with_sched(const char *filename) {
     xbt_dynar_t computer = NULL;
     xbt_dict_cursor_t dict_cursor;
     char *computer_name;
-    const SD_workstation_t *workstations = SD_workstation_get_list ();
+    const sg_host_t *workstations = sg_host_list ();
     xbt_dict_foreach(computers,dict_cursor,computer_name,computer){
       int count_computer = atoi(computer_name);
       unsigned int count=0;
@@ -190,11 +178,10 @@ xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par){
       } else {
         task = SD_task_create_comp_par_amdahl(name, NULL , amount, alpha);
       }
-      TRACE_sd_dotloader (task, agget (node, (char*)"category"));
       xbt_dict_set(jobs, name, task, NULL);
       if (!strcmp(name, "root")){
       /* by design the root task is always SCHEDULABLE */
-      __SD_task_set_state(task, SD_SCHEDULABLE);
+      SD_task_set_state(task, SD_SCHEDULABLE);
       /* Put it at the beginning of the dynar */
         xbt_dynar_insert_at(result, 0, &task);
       } else {
@@ -275,7 +262,7 @@ xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par){
     else
       root = SD_task_create_comp_par_amdahl("root", NULL, 0, 0);
     /* by design the root task is always SCHEDULABLE */
-    __SD_task_set_state(root, SD_SCHEDULABLE);
+    SD_task_set_state(root, SD_SCHEDULABLE);
     /* Put it at the beginning of the dynar */
       xbt_dynar_insert_at(result, 0, &root);
   }
@@ -329,7 +316,6 @@ xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par){
             task = SD_task_create_comm_e2e(name, NULL , size);
           else
             task = SD_task_create_comm_par_mxn_1d_block(name, NULL , size);
-          TRACE_sd_dotloader (task, agget (node, (char*)"category"));
           SD_task_dependency_add(NULL, NULL, src, task);
           SD_task_dependency_add(NULL, NULL, task, dst);
           xbt_dict_set(jobs, name, task, NULL);