-/* $Id$ */
-
-/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */
+/* Copyright (c) 2009, 2010. 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. */
tmgr_trace_t state_trace,
xbt_dict_t cpu_properties)
{
-#ifdef HAVE_TRACING
- TRACE_surf_cpu_new (name, power_scale * power_peak);
-#endif
-
- cpu_Cas01_im_t cpu = xbt_new0(s_cpu_Cas01_im_t, 1);
+ cpu_Cas01_im_t cpu = NULL;
s_surf_action_cpu_Cas01_im_t action;
+ cpu = xbt_new0(s_cpu_Cas01_im_t, 1);
+
+ #ifdef HAVE_TRACING
+ TRACE_surf_host_declaration (name, power_scale * power_peak);
+ #endif
+
xbt_assert1(!surf_model_resource_by_name(surf_cpu_model, name),
"Host '%s' declared several times in the platform file", name);
cpu->generic_resource.model = surf_cpu_model;
static void cpu_im_define_callbacks(const char *file)
{
+
surf_parse_reset_parser();
surfxml_add_callback(STag_surfxml_host_cb_list, parse_cpu_im_init);
surfxml_add_callback(ETag_surfxml_platform_cb_list, &cpu_im_add_traces_cpu);
(action).variable) * (now -
cpu->last_update));
#ifdef HAVE_TRACING
- TRACE_surf_update_action_state (action, action->generic_lmm_action.generic_action.data,
- lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable), "PowerUsed", cpu->last_update, now-cpu->last_update);
- TRACE_surf_update_action_state_cpu_resource (cpu->generic_resource.name,
+ TRACE_surf_host_set_utilization (cpu->generic_resource.name,
action->generic_lmm_action.generic_action.data, lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable), cpu->last_update, now-cpu->last_update);
#endif
DEBUG2("Update action(%p) remains %lf", action,
GENERIC_ACTION(action).finish = surf_get_clock();
/* set the remains to 0 due to precision problems when updating the remaining amount */
#ifdef HAVE_TRACING
- TRACE_surf_update_action_state (action, action->generic_lmm_action.generic_action.data,
- lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable), "PowerUsed", ((cpu_Cas01_im_t)(action->cpu))->last_update, now - ((cpu_Cas01_im_t)(action->cpu))->last_update);
- TRACE_surf_update_action_state_cpu_resource (((cpu_Cas01_im_t)(action->cpu))->generic_resource.name,
+ TRACE_surf_host_set_utilization (((cpu_Cas01_im_t)(action->cpu))->generic_resource.name,
action->generic_lmm_action.generic_action.data, lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable), ((cpu_Cas01_im_t)(action->cpu))->last_update, now-((cpu_Cas01_im_t)(action->cpu))->last_update);
#endif
GENERIC_ACTION(action).remains = 0;
lmm_update_constraint_bound(cpu_im_maxmin_system, cpu->constraint,
cpu->power_scale * cpu->power_peak);
#ifdef HAVE_TRACING
- TRACE_surf_cpu_set_power (date, cpu->generic_resource.name, cpu->power_scale * cpu->power_peak);
+ TRACE_surf_host_set_power (date, cpu->generic_resource.name, cpu->power_scale * cpu->power_peak);
#endif
xbt_swag_insert(cpu, cpu_im_modified_cpu);
if (tmgr_trace_event_free(event_type))
static void cpu_im_action_resume(surf_action_t action)
{
+
XBT_IN1("(%p)", action);
if (((surf_action_lmm_t) action)->suspended != 2) {
lmm_update_variable_weight(cpu_im_maxmin_system,
cpu_im_define_callbacks(filename);
xbt_dynar_push(model_list, &surf_cpu_model);
}
+
+void surf_cpu_im_init_bypass(char* id,double power)
+{
+ /* FIXME
+ * the hard coded value must be passed as argument of the lua function
+ * depending on the number of arguments the user pass to function
+ * we'd affect it to the corresponding value
+ */
+ double power_peak = 0.0;
+ double power_scale = 0.0;
+ tmgr_trace_t power_trace = NULL;
+ //FIXME : hard coded value
+ e_surf_resource_state_t state_initial = SURF_RESOURCE_ON;
+ tmgr_trace_t state_trace = NULL;
+ power_peak = power;
+ //FIXME : hard coded value !!!
+ surf_parse_get_double(&power_scale, "1.0");
+ power_trace = tmgr_trace_new("");
+
+ //state_trace = tmgr_trace_new(A_surfxml_host_state_file);
+ current_property_set = xbt_dict_new();
+ cpu_im_new(xbt_strdup(id), power_peak, power_scale,
+ power_trace, state_initial, state_trace, current_property_set);
+
+ }