Getting rid of network_links.

[simgrid.git] / src / surf / workstation.c

diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index 5bcf287..733aac7 100644 (file)
--- a/src/surf/workstation.c
+++ b/src/surf/workstation.c
@@ -10,7 +10,10 @@
 #include "portable.h"
 #include "workstation_private.h"
 #include "cpu_private.h"
-#include "network_private.h"
+#include "network_common.h"
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_workstation, surf,
+                               "Logging specific to the SURF workstation module");
 
 surf_workstation_model_t surf_workstation_model = NULL;
 xbt_dict_t workstation_set = NULL;
@@ -34,7 +37,7 @@ static void workstation_free(void *workstation)
   free(workstation);
 }
 
-static void create_workstations(void)
+void create_workstations(void)
 {
   xbt_dict_cursor_t cursor = NULL;
   char *name = NULL;
@@ -63,7 +66,6 @@ static const char *get_resource_name(void *resource_id)
 static int resource_used(void *resource_id)
 {
   THROW_IMPOSSIBLE;  /* This model does not implement parallel tasks */
-  return 0;
 }
 
 static void parallel_action_cancel(surf_action_t action)
@@ -74,7 +76,6 @@ static void parallel_action_cancel(surf_action_t action)
 static int parallel_action_free(surf_action_t action)
 {
   THROW_UNIMPLEMENTED;  /* This model does not implement parallel tasks */
-  return 0;
 }
 
 static void parallel_action_use(surf_action_t action)
@@ -161,7 +162,6 @@ static void update_resource_state(void *id,
                                  double value)
 {
   THROW_IMPOSSIBLE; /* This model does not implement parallel tasks */
-  return;
 }
 
 static surf_action_t execute(void *workstation, double size)
@@ -254,6 +254,12 @@ static double get_available_speed(void *workstation)
       get_available_speed(((workstation_CLM03_t) workstation)->cpu);
 }
 
+static xbt_dict_t get_properties(void *workstation)
+{
+  return surf_cpu_model->common_public->
+      get_properties(((workstation_CLM03_t) workstation)->cpu);
+}
+
 static surf_action_t execute_parallel_task(int workstation_nb,
                                           void **workstation_list,
                                           double *computation_amount,
@@ -262,7 +268,6 @@ static surf_action_t execute_parallel_task(int workstation_nb,
                                           double rate)
 {
   THROW_UNIMPLEMENTED;  /* This model does not implement parallel tasks */
-  return NULL;
 }
 
 
@@ -387,6 +392,10 @@ static void surf_workstation_model_init_internal(void)
   surf_workstation_model->extension_public->get_speed = get_speed;
   surf_workstation_model->extension_public->get_available_speed =
       get_available_speed;
+
+  /*manage the properties of the workstation*/
+  surf_workstation_model->common_public->get_properties = get_properties;
+
   surf_workstation_model->extension_public->communicate = communicate;
   surf_workstation_model->extension_public->execute_parallel_task =
       execute_parallel_task;
@@ -418,7 +427,6 @@ void surf_workstation_model_init_CLM03(const char *filename)
   surf_workstation_model_init_internal();
   surf_cpu_model_init_Cas01(filename);
   surf_network_model_init_CM02(filename);
-  create_workstations();
   update_model_description(surf_workstation_model_description,
                              surf_workstation_model_description_size,
                              "CLM03",
@@ -432,7 +440,6 @@ void surf_workstation_model_init_compound(const char *filename)
   xbt_assert0(surf_cpu_model, "No CPU model defined yet!");
   xbt_assert0(surf_network_model, "No network model defined yet!");
   surf_workstation_model_init_internal();
-  create_workstations();
 
   update_model_description(surf_workstation_model_description,
                              surf_workstation_model_description_size,