-/* $Id$ */
-
-/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 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. */
xbt_dict_set(surf_model_resource_set(surf_cpu_model), name, cpu,
surf_resource_free);
#ifdef HAVE_TRACING
- TRACE_surf_cpu_new (name, cpu->power_scale * cpu->power_peak);
+ TRACE_surf_host_declaration (name, cpu->power_scale * cpu->power_peak);
#endif
return cpu;
xbt_swag_foreach_safe(action, next_action, running_actions) {
#ifdef HAVE_TRACING
- TRACE_surf_update_action_state (action, action->generic_action.data,
- lmm_variable_getvalue(action->variable), "PowerUsed", now-delta, delta);
cpu_Cas01_t x = lmm_constraint_id(lmm_get_cnst_from_var (cpu_maxmin_system, action->variable, 0));
- TRACE_surf_update_action_state_cpu_resource (x->generic_resource.name,
+ TRACE_surf_host_set_utilization (x->generic_resource.name,
action->generic_action.data, lmm_variable_getvalue(action->variable), now-delta, delta);
#endif
double_update(&(action->generic_action.remains),
lmm_update_constraint_bound(cpu_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
if (tmgr_trace_event_free(event_type))
cpu->power_event = NULL;
return ((cpu_Cas01_t) cpu)->power_scale;
}
+static void cpu_create_resource(char *name, double power_peak,
+ double power_scale,
+ tmgr_trace_t power_trace,
+ e_surf_resource_state_t state_initial,
+ tmgr_trace_t state_trace,
+ xbt_dict_t cpu_properties)
+{
+ cpu_new(name,power_peak,power_scale,power_trace,
+ state_initial,state_trace,cpu_properties);
+}
+
static void cpu_finalize(void)
{
lmm_system_free(cpu_maxmin_system);
surf_cpu_model->extension.cpu.get_state = cpu_get_state;
surf_cpu_model->extension.cpu.get_speed = cpu_get_speed;
surf_cpu_model->extension.cpu.get_available_speed = cpu_get_available_speed;
+ surf_cpu_model->extension.cpu.create_resource = cpu_create_resource;
+ surf_cpu_model->extension.cpu.add_traces = add_traces_cpu;
if (!cpu_maxmin_system)
cpu_maxmin_system = lmm_system_new();