Actually implement surf_resource_properties so that it links (sorry)

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

diff --git a/src/surf/cpu.c b/src/surf/cpu.c
index 7f26a7c..ca63f90 100644 (file)
--- a/src/surf/cpu.c
+++ b/src/surf/cpu.c
@@ -5,23 +5,35 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "cpu_private.h"
+#include "surf_private.h"
+
+typedef struct surf_action_cpu_Cas01 {
+  s_surf_action_t generic_action;
+  lmm_variable_t variable;
+  int suspended;
+} s_surf_action_cpu_Cas01_t, *surf_action_cpu_Cas01_t;
+
+typedef struct cpu_Cas01 {
+  s_surf_resource_t generic_resource;
+  double power_scale;
+  double power_current;
+  tmgr_trace_event_t power_event;
+  e_surf_cpu_state_t state_current;
+  tmgr_trace_event_t state_event;
+  lmm_constraint_t constraint;
+} s_cpu_Cas01_t, *cpu_Cas01_t;
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf,
                                 "Logging specific to the SURF CPU module");
 
+
+
 surf_model_t surf_cpu_model = NULL;
 lmm_system_t cpu_maxmin_system = NULL;
 
 
 static xbt_swag_t running_action_set_that_does_not_need_being_checked = NULL;
 
-static void cpu_free(void *cpu)
-{
-  xbt_dict_free(&(((cpu_Cas01_t) cpu)->properties));
-  surf_resource_free(cpu);
-}
-
 static cpu_Cas01_t cpu_new(char *name, double power_scale,
                            double power_initial,
                            tmgr_trace_t power_trace,
@@ -34,6 +46,7 @@ static cpu_Cas01_t cpu_new(char *name, double power_scale,
               "Host '%s' declared several times in the platform file", name);
   cpu->generic_resource.model = surf_cpu_model;
   cpu->generic_resource.name = name;
+  current_property_set = cpu->generic_resource.properties = cpu_properties;
   cpu->power_scale = power_scale;
   xbt_assert0(cpu->power_scale > 0, "Power has to be >0");
   cpu->power_current = power_initial;
@@ -50,12 +63,7 @@ static cpu_Cas01_t cpu_new(char *name, double power_scale,
     lmm_constraint_new(cpu_maxmin_system, cpu,
                        cpu->power_current * cpu->power_scale);
 
-  /*add the property set */
-  cpu->properties = cpu_properties;
-
-  current_property_set = cpu_properties;
-
-  xbt_dict_set(surf_model_resource_set(surf_cpu_model), name, cpu, cpu_free);
+  xbt_dict_set(surf_model_resource_set(surf_cpu_model), name, cpu, surf_resource_free);
 
   return cpu;
 }
@@ -249,7 +257,7 @@ static surf_action_t execute(void *cpu, double size)
   surf_action_cpu_Cas01_t action = NULL;
   cpu_Cas01_t CPU = cpu;
 
-  XBT_IN2("(%s,%g)", CPU->name, size);
+  XBT_IN2("(%s,%g)", CPU->generic_resource.name, size);
   action = xbt_new0(s_surf_action_cpu_Cas01_t, 1);
 
   action->generic_action.refcount = 1;
@@ -287,7 +295,7 @@ static surf_action_t action_sleep(void *cpu, double duration)
   if (duration > 0)
     duration = MAX(duration, MAXMIN_PRECISION);
 
-  XBT_IN2("(%s,%g)", ((cpu_Cas01_t) cpu)->name, duration);
+  XBT_IN2("(%s,%g)", ((cpu_Cas01_t) cpu)->generic_resource.name, duration);
   action = (surf_action_cpu_Cas01_t) execute(cpu, 1.0);
   action->generic_action.max_duration = duration;
   action->suspended = 2;
@@ -368,11 +376,6 @@ static double get_available_speed(void *cpu)
   return ((cpu_Cas01_t) cpu)->power_current;
 }
 
-static xbt_dict_t get_properties(void *cpu)
-{
-  return ((cpu_Cas01_t) cpu)->properties;
-}
-
 static void finalize(void)
 {
   lmm_system_free(cpu_maxmin_system);
@@ -418,8 +421,6 @@ static void surf_cpu_model_init_internal(void)
   surf_cpu_model->extension.cpu.get_state = get_state;
   surf_cpu_model->extension.cpu.get_speed = get_speed;
   surf_cpu_model->extension.cpu.get_available_speed = get_available_speed;
-  /*manage the properties of the cpu */
-  surf_cpu_model->get_properties = get_properties;
 
   if (!cpu_maxmin_system)
     cpu_maxmin_system = lmm_system_new();