static xbt_swag_t
cpu_im_running_action_set_that_does_not_need_being_checked = NULL;
-static cpu_Cas01_im_t cpu_im_new(char *name, double power_peak,
+static void* cpu_im_create_resource(const char *name, double power_peak,
double power_scale,
tmgr_trace_t power_trace,
int core,
{
cpu_Cas01_im_t cpu = NULL;
s_surf_action_cpu_Cas01_im_t action;
- cpu = xbt_new0(s_cpu_Cas01_im_t, 1);
- xbt_assert1(!surf_model_resource_by_name(surf_cpu_model, name),
+ xbt_assert(!surf_cpu_resource_by_name(name),
"Host '%s' declared several times in the platform file",
name);
- cpu->generic_resource.model = surf_cpu_model;
- cpu->generic_resource.name = name;
- cpu->generic_resource.properties = cpu_properties;
+ cpu = (cpu_Cas01_im_t) surf_resource_new(sizeof(s_cpu_Cas01_im_t),
+ surf_cpu_model, name,cpu_properties);
cpu->power_peak = power_peak;
- xbt_assert0(cpu->power_peak > 0, "Power has to be >0");
+ xbt_assert(cpu->power_peak > 0, "Power has to be >0");
cpu->power_scale = power_scale;
if (power_trace)
cpu->power_event =
tmgr_history_add_trace(history, power_trace, 0.0, 0, cpu);
cpu->core = core;
- xbt_assert1(core>0,"Invalid number of cores %d",core);
+ xbt_assert(core>0,"Invalid number of cores %d",core);
cpu->state_current = state_initial;
if (state_trace)
lmm_constraint_new(cpu_im_maxmin_system, cpu,
cpu->core * cpu->power_scale * cpu->power_peak);
- xbt_dict_set(surf_model_resource_set(surf_cpu_model), name, cpu,
- surf_resource_free);
+ xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, cpu);
cpu->action_set = xbt_swag_new(xbt_swag_offset(action, cpu_list_hookup));
return cpu;
}
-static void parse_cpu_im_init(void)
+static void parse_cpu_im_init(surf_parsing_host_arg_t host)
{
- double power_peak = 0.0;
- double power_scale = 0.0;
- int core = 0;
- tmgr_trace_t power_trace = NULL;
- e_surf_resource_state_t state_initial = SURF_RESOURCE_OFF;
- tmgr_trace_t state_trace = NULL;
-
- power_peak = get_cpu_power(A_surfxml_host_power);
- surf_parse_get_double(&power_scale, A_surfxml_host_availability);
- power_trace = tmgr_trace_new(A_surfxml_host_availability_file);
- surf_parse_get_int(&core, A_surfxml_host_core);
-
- xbt_assert0((A_surfxml_host_state == A_surfxml_host_state_ON) ||
- (A_surfxml_host_state == A_surfxml_host_state_OFF),
- "Invalid state");
- if (A_surfxml_host_state == A_surfxml_host_state_ON)
- state_initial = SURF_RESOURCE_ON;
- if (A_surfxml_host_state == A_surfxml_host_state_OFF)
- state_initial = SURF_RESOURCE_OFF;
- state_trace = tmgr_trace_new(A_surfxml_host_state_file);
-
- cpu_im_new(xbt_strdup(A_surfxml_host_id), power_peak, power_scale,
- power_trace, core, state_initial, state_trace,
- current_property_set);
- current_property_set = NULL;
-
+ cpu_im_create_resource(host->V_host_id,
+ host->V_host_power_peak,
+ host->V_host_power_scale,
+ host->V_host_power_trace,
+ host->V_host_core,
+ host->V_host_state_initial,
+ host->V_host_state_trace,
+ current_property_set);
+ current_property_set = NULL;
}
static void cpu_im_add_traces_cpu(void)
/* connect all traces relative to hosts */
xbt_dict_foreach(trace_connect_list_host_avail, cursor, trace_name, elm) {
tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
- cpu_Cas01_im_t host = surf_model_resource_by_name(surf_cpu_model, elm);
+ cpu_Cas01_im_t host = surf_cpu_resource_by_name(elm);
- xbt_assert1(host, "Host %s undefined", elm);
- xbt_assert1(trace, "Trace %s undefined", trace_name);
+ xbt_assert(host, "Host %s undefined", elm);
+ xbt_assert(trace, "Trace %s undefined", trace_name);
host->state_event =
tmgr_history_add_trace(history, trace, 0.0, 0, host);
xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) {
tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
- cpu_Cas01_im_t host = surf_model_resource_by_name(surf_cpu_model, elm);
+ cpu_Cas01_im_t host = surf_cpu_resource_by_name(elm);
- xbt_assert1(host, "Host %s undefined", elm);
- xbt_assert1(trace, "Trace %s undefined", trace_name);
+ xbt_assert(host, "Host %s undefined", elm);
+ xbt_assert(trace, "Trace %s undefined", trace_name);
host->power_event =
tmgr_history_add_trace(history, trace, 0.0, 0, host);
}
}
-static void cpu_im_define_callbacks(const char *file)
+static void cpu_im_define_callbacks()
{
- surfxml_add_callback(ETag_surfxml_host_cb_list, parse_cpu_im_init);
+ surf_parse_host_add_cb(parse_cpu_im_init);
surfxml_add_callback(ETag_surfxml_platform_cb_list,
&cpu_im_add_traces_cpu);
}
-static int cpu_im_resource_used(void *resource_id)
+static int cpu_im_resource_used(void *resource)
{
return lmm_constraint_used(cpu_im_maxmin_system,
- ((cpu_Cas01_im_t) resource_id)->constraint);
+ ((cpu_Cas01_im_t) resource)->constraint);
}
static int cpu_im_action_unref(surf_action_t action)
(action).variable) * (now -
cpu->last_update));
#ifdef HAVE_TRACING
- TRACE_surf_host_set_utilization(cpu->generic_resource.name,
- action->
- generic_lmm_action.generic_action.
- data, (surf_action_t) action,
- lmm_variable_getvalue
- (GENERIC_LMM_ACTION
- (action).variable),
- cpu->last_update,
- now - cpu->last_update);
+ if (TRACE_is_enabled()) {
+ TRACE_surf_host_set_utilization(cpu->generic_resource.name,
+ action->
+ generic_lmm_action.generic_action.
+ data, (surf_action_t) action,
+ lmm_variable_getvalue
+ (GENERIC_LMM_ACTION
+ (action).variable),
+ cpu->last_update,
+ now - cpu->last_update);
+ }
#endif
XBT_DEBUG("Update action(%p) remains %lf", action,
GENERIC_ACTION(action).remains);
GENERIC_ACTION(action).finish = surf_get_clock();
/* set the remains to 0 due to precision problems when updating the remaining amount */
#ifdef HAVE_TRACING
- {
+ if (TRACE_is_enabled()) {
cpu_Cas01_im_t cpu = ((cpu_Cas01_im_t)(action->cpu));
TRACE_surf_host_set_utilization(cpu->generic_resource.name,
action->generic_lmm_action.generic_action.data,
cpu_im_update_remains(action->cpu, surf_get_clock());
}
#ifdef HAVE_TRACING
- {
+ if (TRACE_is_enabled()) {
//defining the last timestamp that we can safely dump to trace file
//without losing the event ascending order (considering all CPU's)
+ void **data;
cpu_Cas01_im_t cpu;
- xbt_dict_cursor_t cursor;
+ xbt_lib_cursor_t cursor;
char *key;
double smaller = -1;
- xbt_dict_foreach(surf_model_resource_set(surf_cpu_model), cursor, key, cpu){
- if (smaller < 0){
- smaller = cpu->last_update;
- continue;
- }
- if (cpu->last_update < smaller){
- smaller = cpu->last_update;
+ xbt_lib_foreach(host_lib, cursor, key, data){
+ if(data[SURF_CPU_LEVEL]){
+ cpu = data[SURF_CPU_LEVEL];
+ if (smaller < 0){
+ smaller = cpu->last_update;
+ continue;
+ }
+ if (cpu->last_update < smaller){
+ smaller = cpu->last_update;
+ }
}
}
if (smaller > 0) {
((surf_action_cpu_Cas01_im_t) action)->index_heap = i;
}
-static void cpu_im_create_resource(char *name, double power_peak,
- double power_scale,
- tmgr_trace_t power_trace,
- int core,
- e_surf_resource_state_t state_initial,
- tmgr_trace_t state_trace,
- xbt_dict_t cpu_properties)
-{
- cpu_im_new(name, power_peak, power_scale, power_trace, core,
- state_initial, state_trace, cpu_properties);
-}
-
static void cpu_im_finalize(void)
{
- void *cpu;
- xbt_dict_cursor_t cursor;
+ void **cpu;
+ xbt_lib_cursor_t cursor;
char *key;
- xbt_dict_foreach(surf_model_resource_set(surf_cpu_model), cursor, key,
- cpu) {
- cpu_Cas01_im_t CPU = cpu;
- xbt_swag_free(CPU->action_set);
+
+ xbt_lib_foreach(host_lib, cursor, key, cpu){
+ if(cpu[SURF_CPU_LEVEL])
+ {
+ cpu_Cas01_im_t CPU = cpu[SURF_CPU_LEVEL];
+ xbt_swag_free(CPU->action_set);
+ }
}
lmm_system_free(cpu_im_maxmin_system);
/* note = "Available at */
/* \url{http://grail.sdsc.edu/papers/simgrid_ccgrid01.ps.gz}." */
/* } */
-void surf_cpu_model_init_Cas01_im(const char *filename)
+void surf_cpu_model_init_Cas01_im()
{
if (surf_cpu_model)
return;
surf_cpu_im_model_init_internal();
- cpu_im_define_callbacks(filename);
+ cpu_im_define_callbacks();
xbt_dynar_push(model_list, &surf_cpu_model);
}
