X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/115b8b236b116bdc9f9dccd0d893448719cdd7fc..1943ca63ab0af58abc75c70054783d962737f3e9:/src/include/surf/surf_resource_lmm.h

diff --git a/src/include/surf/surf_resource_lmm.h b/src/include/surf/surf_resource_lmm.h
index d4740eef83..b0d7e33df7 100644
--- a/src/include/surf/surf_resource_lmm.h
+++ b/src/include/surf/surf_resource_lmm.h
@@ -1,5 +1,6 @@
 
-/* Copyright (c) 2009 The SimGrid Team. All rights reserved.                */
+/* Copyright (c) 2009-2014. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* 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. */
@@ -8,31 +9,46 @@
 #define SURF_RESOURCE_LMM_H
 #include "surf/surf.h"
 #include "surf/trace_mgr.h"
+#include "surf/surf_resource.h"
 
+#ifdef TOMATO
 static XBT_INLINE
-surf_resource_lmm_t surf_resource_lmm_new(size_t childsize,
-    /* for superclass */ surf_model_t model, char *name, xbt_dict_t props,
-    lmm_system_t system, double constraint_value,
-    tmgr_history_t history,
-    int state_init, tmgr_trace_t state_trace,
-    double metric_init, tmgr_trace_t metric_trace) {
-
-  surf_resource_lmm_t res = (surf_resource_lmm_t)surf_resource_new(childsize,model,name,props);
+    surf_resource_lmm_t surf_resource_lmm_new(size_t childsize,
+                                              /* for superclass */
+                                              surf_model_t model,
+                                              const char *name, xbt_dict_t props,
+                                              lmm_system_t system,
+                                              double constraint_value,
+                                              tmgr_history_t history,
+                                              e_surf_resource_state_t state_init,
+                                              tmgr_trace_t state_trace,
+                                              double metric_peak,
+                                              tmgr_trace_t metric_trace)
+{
+
+  surf_resource_lmm_t res =
+      (surf_resource_lmm_t) surf_resource_new(childsize, model, name,
+                                              props, NULL);
 
   res->constraint = lmm_constraint_new(system, res, constraint_value);
   res->state_current = state_init;
   if (state_trace)
-    res->state_event = tmgr_history_add_trace(history, state_trace, 0.0, 0, res);
+    res->state_event =
+        tmgr_history_add_trace(history, state_trace, 0.0, 0, res);
 
-  res->power.current = metric_init;
+  res->power.scale = 1.0;
+  res->power.peak = metric_peak;
   if (metric_trace)
-    res->power.event = tmgr_history_add_trace(history, metric_trace, 0.0, 0, res);
+    res->power.event =
+        tmgr_history_add_trace(history, metric_trace, 0.0, 0, res);
   return res;
 }
+#endif
 
-
-static XBT_INLINE e_surf_resource_state_t surf_resource_lmm_get_state(void *r) {
-  surf_resource_lmm_t resource = (surf_resource_lmm_t)r;
+static XBT_INLINE e_surf_resource_state_t surf_resource_lmm_get_state(void
+                                                                      *r)
+{
+  surf_resource_lmm_t resource = (surf_resource_lmm_t) r;
   return (resource)->state_current;
 }
-#endif /* SURF_RESOURCE_LMM_H */
+#endif                          /* SURF_RESOURCE_LMM_H */