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->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;
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) ||
+ xbt_assert((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_OFF;
state_trace = tmgr_trace_new(A_surfxml_host_state_file);
- current_property_set = xbt_dict_new();
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;
}
/* 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)
{
- surfxml_add_callback(STag_surfxml_host_cb_list, parse_cpu_im_init);
+ surfxml_add_callback(ETag_surfxml_host_cb_list, parse_cpu_im_init);
surfxml_add_callback(ETag_surfxml_platform_cb_list,
&cpu_im_add_traces_cpu);
}
cpu->last_update,
now - cpu->last_update);
#endif
- DEBUG2("Update action(%p) remains %lf", action,
+ XBT_DEBUG("Update action(%p) remains %lf", action,
GENERIC_ACTION(action).remains);
}
}
GENERIC_ACTION(action).start +
GENERIC_ACTION(action).max_duration;
- DEBUG4("Action(%p) Start %lf Finish %lf Max_duration %lf", action,
+ XBT_DEBUG("Action(%p) Start %lf Finish %lf Max_duration %lf", action,
GENERIC_ACTION(action).start, now + value,
GENERIC_ACTION(action).max_duration);
}
if (min != -1) {
xbt_heap_push(cpu_im_action_heap, action, min);
- DEBUG2("Insert at heap action(%p) min %lf", action, min);
+ XBT_DEBUG("Insert at heap action(%p) min %lf", action, min);
}
}
xbt_swag_remove(cpu, cpu_im_modified_cpu);
while ((xbt_heap_size(cpu_im_action_heap) > 0)
&& (double_equals(xbt_heap_maxkey(cpu_im_action_heap), now))) {
action = xbt_heap_pop(cpu_im_action_heap);
- DEBUG1("Action %p: finish", action);
+ XBT_DEBUG("Action %p: finish", 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
{
//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) {
if (tmgr_trace_event_free(event_type))
cpu->state_event = NULL;
} else {
- CRITICAL0("Unknown event ! \n");
+ XBT_CRITICAL("Unknown event ! \n");
xbt_abort();
}
surf_action_cpu_Cas01_im_t action = NULL;
cpu_Cas01_im_t CPU = cpu;
- XBT_IN2("(%s,%g)", surf_resource_name(CPU), size);
+ XBT_IN("(%s,%g)", surf_resource_name(CPU), size);
action =
surf_action_new(sizeof(s_surf_action_cpu_Cas01_im_t), size,
surf_cpu_model,
xbt_swag_insert(action, CPU->action_set);
lmm_expand(cpu_im_maxmin_system, CPU->constraint,
GENERIC_LMM_ACTION(action).variable, 1.0);
- XBT_OUT;
+ XBT_OUT();
return (surf_action_t) action;
}
if (duration > 0)
duration = MAX(duration, MAXMIN_PRECISION);
- XBT_IN2("(%s,%g)", surf_resource_name(cpu), duration);
+ XBT_IN("(%s,%g)", surf_resource_name(cpu), duration);
action = (surf_action_cpu_Cas01_im_t) cpu_im_execute(cpu, 1.0);
GENERIC_ACTION(action).max_duration = duration;
GENERIC_LMM_ACTION(action).suspended = 2;
lmm_update_variable_weight(cpu_im_maxmin_system,
GENERIC_LMM_ACTION(action).variable, 0.0);
xbt_swag_insert(cpu, cpu_im_modified_cpu);
- XBT_OUT;
+ XBT_OUT();
return (surf_action_t) action;
}
static void cpu_im_action_suspend(surf_action_t action)
{
- XBT_IN1("(%p)", action);
+ XBT_IN("(%p)", action);
if (((surf_action_lmm_t) action)->suspended != 2) {
lmm_update_variable_weight(cpu_im_maxmin_system,
((surf_action_lmm_t) action)->variable,
((surf_action_cpu_Cas01_im_t) action)->index_heap);
xbt_swag_insert(ACTION_GET_CPU(action), cpu_im_modified_cpu);
}
- XBT_OUT;
+ XBT_OUT();
}
static void cpu_im_action_resume(surf_action_t action)
{
- XBT_IN1("(%p)", action);
+ XBT_IN("(%p)", action);
if (((surf_action_lmm_t) action)->suspended != 2) {
lmm_update_variable_weight(cpu_im_maxmin_system,
((surf_action_lmm_t) action)->variable,
((surf_action_lmm_t) action)->suspended = 0;
xbt_swag_insert(ACTION_GET_CPU(action), cpu_im_modified_cpu);
}
- XBT_OUT;
+ XBT_OUT();
}
static int cpu_im_action_is_suspended(surf_action_t action)
static void cpu_im_action_set_max_duration(surf_action_t action,
double duration)
{
- XBT_IN2("(%p,%g)", action, duration);
+ XBT_IN("(%p,%g)", action, duration);
action->max_duration = duration;
/* insert cpu in modified_cpu set to notice the max duration change */
xbt_swag_insert(ACTION_GET_CPU(action), cpu_im_modified_cpu);
- XBT_OUT;
+ XBT_OUT();
}
static void cpu_im_action_set_priority(surf_action_t action,
double priority)
{
- XBT_IN2("(%p,%g)", action, priority);
+ XBT_IN("(%p,%g)", action, priority);
action->priority = priority;
lmm_update_variable_weight(cpu_im_maxmin_system,
((surf_action_lmm_t) action)->variable,
priority);
xbt_swag_insert(ACTION_GET_CPU(action), cpu_im_modified_cpu);
- XBT_OUT;
+ XBT_OUT();
}
#ifdef HAVE_TRACING
static void cpu_im_action_set_category(surf_action_t action,
const char *category)
{
- XBT_IN2("(%p,%s)", action, category);
+ XBT_IN("(%p,%s)", action, category);
action->category = xbt_strdup (category);
- XBT_OUT;
+ XBT_OUT();
}
#endif
static double cpu_im_action_get_remains(surf_action_t action)
{
- XBT_IN1("(%p)", action);
+ XBT_IN("(%p)", action);
/* update remains before return it */
cpu_im_update_remains(ACTION_GET_CPU(action), surf_get_clock());
return action->remains;
- XBT_OUT;
+ XBT_OUT();
}
static e_surf_resource_state_t cpu_im_get_state(void *cpu)
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);
