start to use s4u in simdag internally

diff --git a/src/simdag/instr_sd_task.cpp b/src/simdag/instr_sd_task.cpp
index 1b66741..f064e5f 100644 (file)
--- a/src/simdag/instr_sd_task.cpp
+++ b/src/simdag/instr_sd_task.cpp
@@ -42,7 +42,7 @@ void TRACE_sd_task_execute_start(SD_task_t task)
 //    int i;
 //    for (i = 0; i < task->workstation_nb; i++){
 //      container_t workstation_container =
 //    int i;
 //    for (i = 0; i < task->workstation_nb; i++){
 //      container_t workstation_container =

-//          PJ_container_get (SD_workstation_get_name(task->workstation_list[i]));
+//          PJ_container_get (sg_host_get_name(task->workstation_list[i]));

 //      char name[1024];
 //      type_t type = PJ_type_get ("power_used", workstation_container->type);
 //      sprintf(name, "%s_ws_%d", SD_task_get_name(task), i);
 //      char name[1024];
 //      type_t type = PJ_type_get ("power_used", workstation_container->type);
 //      sprintf(name, "%s_ws_%d", SD_task_get_name(task), i);


@@ -59,7 +59,7 @@ void TRACE_sd_task_execute_end(SD_task_t task)
 //    int i;
 //    for (i = 0; i < task->workstation_nb; i++){
 //      container_t workstation_container =
 //    int i;
 //    for (i = 0; i < task->workstation_nb; i++){
 //      container_t workstation_container =

-//          PJ_container_get (SD_workstation_get_name(task->workstation_list[i]));
+//          PJ_container_get (sg_host_get_name(task->workstation_list[i]));

 //      type_t type = PJ_type_get ("power_used", workstation_container->type);
 //      new_pajePopState (SD_get_clock(), workstation_container, type);
 //    }
 //      type_t type = PJ_type_get ("power_used", workstation_container->type);
 //      new_pajePopState (SD_get_clock(), workstation_container, type);
 //    }

diff --git a/src/simdag/sd_global.cpp b/src/simdag/sd_global.cpp
index 6fe06bd..c2ba350 100644 (file)
--- a/src/simdag/sd_global.cpp
+++ b/src/simdag/sd_global.cpp
@@ -177,8 +177,8 @@ void SD_create_environment(const char *platform_file)
       __SD_storage_create(surf_storage[SURF_STORAGE_LEVEL], NULL);
   }
 
       __SD_storage_create(surf_storage[SURF_STORAGE_LEVEL], NULL);
   }
 

-  XBT_DEBUG("Workstation number: %d, link number: %d",
-         SD_workstation_get_count(), sg_link_count());
+  XBT_DEBUG("Workstation number: %lu, link number: %d",
+         sg_host_count(), sg_link_count());

 #ifdef HAVE_JEDULE
   jedule_setup_platform();
 #endif
 #ifdef HAVE_JEDULE
   jedule_setup_platform();
 #endif

diff --git a/src/simdag/sd_task.cpp b/src/simdag/sd_task.cpp
index 655197b..1319ac4 100644 (file)
--- a/src/simdag/sd_task.cpp
+++ b/src/simdag/sd_task.cpp
@@ -1246,8 +1246,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),
   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]);
 
   }
           task->bytes_amount[2]);
 
   }


@@ -1257,7 +1257,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),
   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) {
           task->flops_amount[0]);
 
     xbt_dynar_foreach(task->tasks_before, cpt, dep) {


@@ -1271,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(before),
           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]);
         }
       }
                before->bytes_amount[2]);
         }
       }


@@ -1287,8 +1287,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),
           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]);
 
         }
                after->bytes_amount[2]);
 
         }


@@ -1344,8 +1344,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)",
               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;
                   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;

diff --git a/src/simdag/sd_workstation.cpp b/src/simdag/sd_workstation.cpp
index b617568..d037b79 100644 (file)
--- a/src/simdag/sd_workstation.cpp
+++ b/src/simdag/sd_workstation.cpp
@@ -58,11 +58,11 @@ SD_workstation_t SD_workstation_get_by_name(const char *name)
 /**
  * \brief Returns the workstation list
  *
 /**
  * \brief Returns the workstation list
  *

- * Use SD_workstation_get_number() to know the array size.
+ * Use SD_workstation_get_count() to know the array size.

  * 
  * \return an array of \ref SD_workstation_t containing all workstations
  * \remark The workstation order in the returned array is generally different from the workstation creation/declaration order in the XML platform (we use a hash table internally).
  * 
  * \return an array of \ref SD_workstation_t containing all workstations
  * \remark The workstation order in the returned array is generally different from the workstation creation/declaration order in the XML platform (we use a hash table internally).

- * \see SD_workstation_get_number()
+ * \see SD_workstation_get_count()

  */
 const SD_workstation_t *SD_workstation_get_list(void) {
   xbt_assert(SD_workstation_get_count() > 0, "There is no workstation!");
  */
 const SD_workstation_t *SD_workstation_get_list(void) {
   xbt_assert(SD_workstation_get_count() > 0, "There is no workstation!");


@@ -132,7 +132,7 @@ const char *SD_workstation_get_name(SD_workstation_t workstation)
 const char *SD_workstation_get_property_value(SD_workstation_t ws,
                                               const char *name)
 {
 const char *SD_workstation_get_property_value(SD_workstation_t ws,
                                               const char *name)
 {

-  return (const char*) xbt_dict_get_or_null(SD_workstation_get_properties(ws), name);
+  return (const char*) xbt_dict_get_or_null(sg_host_get_properties(ws), name);

 }
 
 
 }
 
 


@@ -155,10 +155,10 @@ void SD_workstation_dump(SD_workstation_t ws)
   xbt_dict_cursor_t cursor=NULL;
   char *key,*data;
 
   xbt_dict_cursor_t cursor=NULL;
   char *key,*data;
 

-  XBT_INFO("Displaying workstation %s", SD_workstation_get_name(ws));
-  XBT_INFO("  - speed: %.0f", SD_workstation_get_speed(ws));
-  XBT_INFO("  - available speed: %.2f", SD_workstation_get_available_speed(ws));
-  props = SD_workstation_get_properties(ws);
+  XBT_INFO("Displaying workstation %s", sg_host_get_name(ws));
+  XBT_INFO("  - speed: %.0f", ws->speed());
+  XBT_INFO("  - available speed: %.2f", surf_host_get_available_speed(ws));
+  props = sg_host_get_properties(ws);

   
   if (!xbt_dict_is_empty(props)){
     XBT_INFO("  - properties:");
   
   if (!xbt_dict_is_empty(props)){
     XBT_INFO("  - properties:");


@@ -258,7 +258,7 @@ double SD_workstation_get_computation_time(SD_workstation_t workstation,
 {
   xbt_assert(flops_amount >= 0,
               "flops_amount must be greater than or equal to zero");
 {
   xbt_assert(flops_amount >= 0,
               "flops_amount must be greater than or equal to zero");

-  return flops_amount / SD_workstation_get_speed(workstation);
+  return flops_amount / workstation->speed();

 }
 
 /**
 }
 
 /**