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);
if (action->category)
xbt_free(action->category);
#endif
- free(action);
+ surf_action_free(&action);
return 1;
}
return 0;
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
- TRACE_surf_host_set_utilization(((cpu_Cas01_im_t)
- (action->cpu))->generic_resource.name,
- action->
- generic_lmm_action.generic_action.data,
- (surf_action_t) action,
- 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);
+ {
+ 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,
+ (surf_action_t) action,
+ lmm_variable_getvalue (GENERIC_LMM_ACTION(action).variable),
+ cpu->last_update,
+ now - cpu->last_update);
+ }
#endif
GENERIC_ACTION(action).remains = 0;
cpu_im_cpu_action_state_set((surf_action_t) action, SURF_ACTION_DONE);
cpu_im_update_remains(action->cpu, surf_get_clock());
}
+#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)
+ cpu_Cas01_im_t cpu;
+ xbt_dict_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;
+ }
+ }
+ if (smaller > 0) {
+ TRACE_last_timestamp_to_dump = smaller;
+ }
+ }
+#endif
return;
}
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)
