Further work on objectification of resources: use s_surf_resource_lmm_t in s_link_CM02_t

[simgrid.git] / src / include / surf / surf.h

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index fe6e62f..eb4ec5b 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -253,19 +253,23 @@ XBT_PUBLIC(int) find_model_description(s_surf_model_description_t * table,
        xbt_dict_t properties;
      } s_surf_resource_t, *surf_resource_t;
 
-     XBT_PUBLIC(const char*) surf_resource_name(const void *resource);
-XBT_PUBLIC(void) surf_resource_free(void* resource);
+
 
 /**
  * Resource which have a metric handled by a maxmin system
  */
+typedef struct {
+  double current;
+  double max;
+  tmgr_trace_event_t event;
+} s_surf_metric_t;
+
 typedef struct surf_resource_lmm {
   s_surf_resource_t generic_resource;
   lmm_constraint_t constraint;
   e_surf_resource_state_t state_current;
   tmgr_trace_event_t state_event;
-  double metric_current;
-  tmgr_trace_event_t metric_event;
+  s_surf_metric_t power;
 }s_surf_resource_lmm_t, *surf_resource_lmm_t;
 
 /**************************************/
@@ -607,6 +611,8 @@ XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_latency;
 
 XBT_PUBLIC(double) get_cpu_power(const char *power);
 
+#include "surf/surf_resource.h"
+#include "surf/surf_resource_lmm.h"
 
 SG_END_DECL()
 #endif /* _SURF_SURF_H */