static void cpu_define_callbacks(const char *file)
{
- surf_parse_reset_parser();
surfxml_add_callback(STag_surfxml_host_cb_list, parse_cpu_init);
surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_traces_cpu);
}
if (action->category)
xbt_free(action->category);
#endif
- free(action);
+ surf_action_free(&action);
return 1;
}
return 0;
lmm_variable_getvalue
(action->variable), now - delta,
delta);
+ TRACE_last_timestamp_to_dump = now-delta;
#endif
double_update(&(action->generic_action.remains),
lmm_variable_getvalue(action->variable) * delta);
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_t action = NULL;
cpu_Cas01_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_t), size,
surf_cpu_model,
action->generic_action.priority,
CPU->power_scale * CPU->power_peak, 1);
lmm_expand(cpu_maxmin_system, CPU->constraint, 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_t) cpu_execute(cpu, 1.0);
action->generic_action.max_duration = duration;
action->suspended = 2;
}
lmm_update_variable_weight(cpu_maxmin_system, action->variable, 0.0);
- XBT_OUT;
+ XBT_OUT();
return (surf_action_t) action;
}
static void cpu_action_suspend(surf_action_t action)
{
- XBT_IN1("(%p)", action);
+ XBT_IN("(%p)", action);
if (((surf_action_cpu_Cas01_t) action)->suspended != 2) {
lmm_update_variable_weight(cpu_maxmin_system,
((surf_action_cpu_Cas01_t)
action)->variable, 0.0);
((surf_action_cpu_Cas01_t) action)->suspended = 1;
}
- XBT_OUT;
+ XBT_OUT();
}
static void cpu_action_resume(surf_action_t action)
{
- XBT_IN1("(%p)", action);
+ XBT_IN("(%p)", action);
if (((surf_action_cpu_Cas01_t) action)->suspended != 2) {
lmm_update_variable_weight(cpu_maxmin_system,
((surf_action_cpu_Cas01_t)
action)->variable, action->priority);
((surf_action_cpu_Cas01_t) action)->suspended = 0;
}
- XBT_OUT;
+ XBT_OUT();
}
static int cpu_action_is_suspended(surf_action_t action)
static void cpu_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;
- XBT_OUT;
+ XBT_OUT();
}
static void cpu_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_maxmin_system,
((surf_action_cpu_Cas01_t) action)->variable,
priority);
- XBT_OUT;
+ XBT_OUT();
}
#ifdef HAVE_TRACING
static void cpu_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_action_get_remains(surf_action_t action)
{
- XBT_IN1("(%p)", action);
+ XBT_IN("(%p)", action);
return action->remains;
- XBT_OUT;
+ XBT_OUT();
}
static e_surf_resource_state_t cpu_get_state(void *cpu)