merge the trace parser from file and the trace parser from memory (used when the...

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

diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index ce87967..ef35309 100644 (file)
--- a/src/surf/workstation.c
+++ b/src/surf/workstation.c
@@ -9,7 +9,6 @@
 #include "xbt/dict.h"
 #include "portable.h"
 #include "surf_private.h"
-#include "network_common.h"
 
 typedef struct workstation_CLM03 {
   s_surf_resource_t generic_resource; /* Must remain first to add this to a trace */
@@ -197,7 +196,7 @@ static surf_action_t communicate(void *workstation_src,
         size, rate);
 }
 
-static e_surf_cpu_state_t get_state(void *workstation)
+static e_surf_resource_state_t get_state(void *workstation)
 {
   return surf_cpu_model->extension.
     cpu.get_state(((workstation_CLM03_t) workstation)->cpu);
@@ -216,12 +215,6 @@ static double get_available_speed(void *workstation)
                              workstation)->cpu);
 }
 
-static xbt_dict_t get_properties(void *workstation)
-{
-  return surf_cpu_model->get_properties(((workstation_CLM03_t) workstation)->
-                                        cpu);
-}
-
 static surf_action_t execute_parallel_task(int workstation_nb,
                                            void **workstation_list,
                                            double *computation_amount,
@@ -261,6 +254,9 @@ static void finalize(void)
   surf_model_exit(surf_workstation_model);
   surf_workstation_model = NULL;
 }
+static xbt_dict_t get_properties(const void*ws){
+  return surf_resource_properties(((workstation_CLM03_t)ws)->cpu);
+}
 
 static void surf_workstation_model_init_internal(void)
 {
@@ -292,9 +288,6 @@ static void surf_workstation_model_init_internal(void)
   surf_workstation_model->extension.workstation.get_available_speed =
     get_available_speed;
 
-  /*manage the properties of the workstation */
-  surf_workstation_model->get_properties = get_properties;
-
   surf_workstation_model->extension.workstation.communicate = communicate;
   surf_workstation_model->extension.workstation.get_route = get_route;
   surf_workstation_model->extension.workstation.execute_parallel_task =
@@ -304,6 +297,7 @@ static void surf_workstation_model_init_internal(void)
   surf_workstation_model->extension.workstation.get_link_latency =
     get_link_latency;
   surf_workstation_model->extension.workstation.link_shared = link_shared;
+  surf_workstation_model->extension.workstation.get_properties = get_properties;
 }
 
 /********************************************************************/