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 5cc8bfc..9333294 100644 (file)
--- a/src/simdag/sd_dotloader.cpp
+++ b/src/simdag/sd_dotloader.cpp
@@ -41,22 +41,10 @@ static Agraph_t *dag_dot;
 static bool schedule = true;
 
 static void dot_task_p_free(void *task) {
-  SD_task_t *t = task;
+  SD_task_t *t = (SD_task_t *)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;
@@ -184,17 +172,16 @@ xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par){
           name, amount, alpha);
     }
 
-    if (!(task = xbt_dict_get_or_null(jobs, name))) {
+    if (!(task = (SD_task_t)xbt_dict_get_or_null(jobs, name))) {
       if (seq_or_par == sequential){
         task = SD_task_create_comp_seq(name, NULL , amount);
       } 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 {
@@ -226,7 +213,7 @@ xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par){
         xbt_dynar_t computer = NULL;
         if(performer != -1 && order != -1){
           /* required parameters are given */
-          computer = xbt_dict_get_or_null(computers, char_performer);
+          computer = (xbt_dynar_t)xbt_dict_get_or_null(computers, char_performer);
           if(computer == NULL){
             computer = xbt_dynar_new(sizeof(SD_task_t), NULL);
             xbt_dict_set(computers, char_performer, computer, NULL);
@@ -234,8 +221,8 @@ xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par){
           if(performer < xbt_dict_length(host_list)){
             /* the wanted computer is available */
             SD_task_t *task_test = NULL;
-            if(order < computer->used)
-              task_test = xbt_dynar_get_ptr(computer,order);
+            if((unsigned int)order < computer->used)
+              task_test = (SD_task_t *)xbt_dynar_get_ptr(computer,order);
             if(task_test != NULL && *task_test != NULL && *task_test != task){
               /* the user gives the same order to several tasks */
               schedule = false;
@@ -269,18 +256,18 @@ xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par){
    * Check if 'root' and 'end' nodes have been explicitly declared.
    * If not, create them.
    */
-  if (!(root = xbt_dict_get_or_null(jobs, "root"))){
+  if (!(root = (SD_task_t)xbt_dict_get_or_null(jobs, "root"))){
     if (seq_or_par == sequential)
       root = SD_task_create_comp_seq("root", NULL, 0);
     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);
   }
 
-  if (!(end = xbt_dict_get_or_null(jobs, "end"))){
+  if (!(end = (SD_task_t)xbt_dict_get_or_null(jobs, "end"))){
     if (seq_or_par == sequential)
       end = SD_task_create_comp_seq("end", NULL, 0);
     else
@@ -317,20 +304,18 @@ xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par){
       char *dst_name=agnameof(aghead(edge));
       double size = atof(agget(edge, (char *) "size"));
 
-      src = xbt_dict_get_or_null(jobs, src_name);
-      dst  = xbt_dict_get_or_null(jobs, dst_name);
+      src = (SD_task_t)xbt_dict_get_or_null(jobs, src_name);
+      dst = (SD_task_t)xbt_dict_get_or_null(jobs, dst_name);
 
       if (size > 0) {
-        char *name =
-            xbt_malloc((strlen(src_name)+strlen(dst_name)+6)*sizeof(char));
+        char *name = (char*)xbt_malloc((strlen(src_name)+strlen(dst_name)+6)*sizeof(char));
         sprintf(name, "%s->%s", src_name, dst_name);
         XBT_DEBUG("See <transfer id=%s amount = %.0f>", name, size);
-        if (!(task = xbt_dict_get_or_null(jobs, name))) {
+        if (!(task = (SD_task_t)xbt_dict_get_or_null(jobs, name))) {
           if (seq_or_par == sequential)
             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);