SURF: Unify the types of models in a uniq s_surf_model_t (using an union) +reindent...

[simgrid.git] / src / simdag / sd_workstation.c

diff --git a/src/simdag/sd_workstation.c b/src/simdag/sd_workstation.c
index 686bc0a..608fbc6 100644 (file)
--- a/src/simdag/sd_workstation.c
+++ b/src/simdag/sd_workstation.c
@@ -199,15 +199,17 @@ const SD_link_t *SD_route_get_list(SD_workstation_t src, SD_workstation_t dst)
   surf_dst = dst->surf_workstation;
 
   surf_route =
-    surf_workstation_model->extension_public->get_route(surf_src, surf_dst);
+    surf_workstation_model->extension.workstation.get_route(surf_src,
+                                                            surf_dst);
   route_size =
-    surf_workstation_model->extension_public->get_route_size(surf_src,
-                                                             surf_dst);
+    surf_workstation_model->extension.workstation.get_route_size(surf_src,
+                                                                 surf_dst);
 
 
   for (i = 0; i < route_size; i++) {
     link_name =
-      surf_workstation_model->extension_public->get_link_name(surf_route[i]);
+      surf_workstation_model->extension.
+      workstation.get_link_name(surf_route[i]);
     sd_global->recyclable_route[i] =
       xbt_dict_get(sd_global->links, link_name);
   }
@@ -226,10 +228,10 @@ const SD_link_t *SD_route_get_list(SD_workstation_t src, SD_workstation_t dst)
 int SD_route_get_size(SD_workstation_t src, SD_workstation_t dst)
 {
   SD_CHECK_INIT_DONE();
-  return surf_workstation_model->extension_public->get_route_size(src->
-                                                                  surf_workstation,
-                                                                  dst->
-                                                                  surf_workstation);
+  return surf_workstation_model->extension.workstation.get_route_size(src->
+                                                                      surf_workstation,
+                                                                      dst->
+                                                                      surf_workstation);
 }
 
 /**
@@ -243,9 +245,9 @@ double SD_workstation_get_power(SD_workstation_t workstation)
 {
   SD_CHECK_INIT_DONE();
   xbt_assert0(workstation != NULL, "Invalid parameter");
-  return surf_workstation_model->extension_public->get_speed(workstation->
-                                                             surf_workstation,
-                                                             1.0);
+  return surf_workstation_model->extension.workstation.get_speed(workstation->
+                                                                 surf_workstation,
+                                                                 1.0);
 }
 
 /**
@@ -259,7 +261,7 @@ double SD_workstation_get_available_power(SD_workstation_t workstation)
 {
   SD_CHECK_INIT_DONE();
   xbt_assert0(workstation != NULL, "Invalid parameter");
-  return surf_workstation_model->extension_public->
+  return surf_workstation_model->extension.workstation.
     get_available_speed(workstation->surf_workstation);
 }
 
@@ -451,15 +453,15 @@ void SD_workstation_set_access_mode(SD_workstation_t workstation,
 }
 
 /* Returns whether a task can start now on a workstation.
-                      *//*
-               int __SD_workstation_can_start(SD_workstation_t workstation, SD_task_t task) {
-               SD_CHECK_INIT_DONE();
-               xbt_assert0(workstation != NULL && task != NULL, "Invalid parameter");
-
-               return !__SD_workstation_is_busy(workstation) &&
-               (xbt_fifo_size(workstation->task_fifo) == 0) || xbt_fifo_get_first_item(workstation->task_fifo) == task);
-               }
-             */
+                                                                                              *//*
+                                                   int __SD_workstation_can_start(SD_workstation_t workstation, SD_task_t task) {
+                                                   SD_CHECK_INIT_DONE();
+                                                   xbt_assert0(workstation != NULL && task != NULL, "Invalid parameter");
+
+                                                   return !__SD_workstation_is_busy(workstation) &&
+                                                   (xbt_fifo_size(workstation->task_fifo) == 0) || xbt_fifo_get_first_item(workstation->task_fifo) == task);
+                                                   }
+                                                 */
 
 /* Returns whether a workstation is busy. A workstation is busy is it is
  * in sequential mode and a task is running on it or the fifo is not empty.