X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6760cb07d6b57be16928d95339d71e57c4e24f36..4676d5e57abd98702608661750274226eb48e20e:/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 37c437c02f..4f7eb940f0 100644 --- a/src/include/surf/surf_resource_lmm.h +++ b/src/include/surf/surf_resource_lmm.h @@ -9,32 +9,46 @@ #define SURF_RESOURCE_LMM_H #include "surf/surf.h" #include "surf/trace_mgr.h" +#include "surf/surf_resource.h" -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_peak, tmgr_trace_t metric_trace) { - surf_resource_lmm_t res = (surf_resource_lmm_t)surf_resource_new(childsize,model,name,props); +static XBT_INLINE + 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, + int 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); 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.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; } -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 */