typedef struct surf_action_cpu_cas01 {
s_surf_action_lmm_t generic_lmm_action;
- s_xbt_swag_hookup_t action_list_hookup;
- int index_heap;
- double last_update;
- enum heap_action_type hat;
} s_surf_action_cpu_Cas01_t, *surf_action_cpu_Cas01_t;
typedef struct cpu_Cas01 {
static xbt_swag_t
cpu_running_action_set_that_does_not_need_being_checked = NULL;
-/* added to manage the communication action's heap */
-static void net_action_update_index_heap(void *action, int i)
-{
- ((surf_action_cpu_Cas01_t) action)->index_heap = i;
-}
-
-/* insert action on heap using a given key and a hat (heap_action_type)
- * a hat can be of three types for communications:
- *
- * NORMAL = this is a normal heap entry stating the date to finish transmitting
- * LATENCY = this is a heap entry to warn us when the latency is payed
- * MAX_DURATION =this is a heap entry to warn us when the max_duration limit is reached
- */
-static void heap_insert(surf_action_cpu_Cas01_t action, double key,
- enum heap_action_type hat)
-{
- action->hat = hat;
- xbt_heap_push(cpu_action_heap, action, key);
-}
-
-static void heap_remove(surf_action_cpu_Cas01_t action)
-{
- action->hat = NOTSET;
- if (((surf_action_cpu_Cas01_t) action)->index_heap >= 0) {
- xbt_heap_remove(cpu_action_heap, action->index_heap);
- }
-}
static void *cpu_create_resource(const char *name, double power_peak,
double power_scale,
((surf_action_lmm_t) action)->variable);
if (cpu_update_mechanism == UM_LAZY) {
/* remove from heap */
- heap_remove((surf_action_cpu_Cas01_t) action);
+ surf_action_lmm_heap_remove(cpu_action_heap,(surf_action_lmm_t)action);
xbt_swag_remove(action, cpu_modified_set);
}
#ifdef HAVE_TRACING
surf_action_state_set(action, SURF_ACTION_FAILED);
if (cpu_update_mechanism == UM_LAZY) {
xbt_swag_remove(action, cpu_modified_set);
- heap_remove((surf_action_cpu_Cas01_t) action);
+ surf_action_lmm_heap_remove(cpu_action_heap,(surf_action_lmm_t)action);
}
return;
}
return;
}
-static void update_action_remaining_lazy(double now)
+static void cpu_update_action_remaining_lazy(double now)
{
surf_action_cpu_Cas01_t action;
double delta = 0.0;
if (GENERIC_ACTION(action).priority <= 0)
continue;
- delta = now - action->last_update;
+ delta = now - GENERIC_LMM_ACTION(action).last_update;
if (GENERIC_ACTION(action).remains > 0) {
double_update(&(GENERIC_ACTION(action).remains),
#ifdef HAVE_TRACING
if (TRACE_is_enabled()) {
+ cpu_Cas01_t cpu =
+ lmm_constraint_id(lmm_get_cnst_from_var
+ (cpu_maxmin_system,
+ GENERIC_LMM_ACTION(action).variable, 0));
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);
+ ((surf_action_t)action)->category,
+ lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable),
+ GENERIC_LMM_ACTION(action).last_update,
+ now - GENERIC_LMM_ACTION(action).last_update);
}
#endif
XBT_DEBUG("Update action(%p) remains %lf", action,
GENERIC_ACTION(action).remains);
}
- action->last_update = now;
+ GENERIC_LMM_ACTION(action).last_update = now;
}
}
XBT_DEBUG
("Before share resources, the size of modified actions set is %d",
xbt_swag_size(cpu_modified_set));
- update_action_remaining_lazy(now);
+ cpu_update_action_remaining_lazy(now);
lmm_solve(cpu_maxmin_system);
GENERIC_ACTION(action).max_duration);
if (min != -1) {
- heap_remove(action);
- heap_insert(action, min, max_dur_flag ? MAX_DURATION : NORMAL);
+ surf_action_lmm_heap_remove(cpu_action_heap,(surf_action_lmm_t)action);
+ surf_action_lmm_heap_insert(cpu_action_heap,(surf_action_lmm_t)action, min, max_dur_flag ? MAX_DURATION : NORMAL);
XBT_DEBUG("Insert at heap action(%p) min %lf now %lf", action, min,
now);
} else DIE_IMPOSSIBLE;
action = xbt_heap_pop(cpu_action_heap);
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
if (TRACE_is_enabled()) {
- cpu_Cas01_t cpu = ((cpu_Cas01_t) (action->cpu));
+ cpu_Cas01_t cpu =
+ lmm_constraint_id(lmm_get_cnst_from_var
+ (cpu_maxmin_system,
+ GENERIC_LMM_ACTION(action).variable, 0));
TRACE_surf_host_set_utilization(cpu->generic_resource.name,
- GENERIC_LMM_ACTION(action).
- generic_action.data,
- (surf_action_t) action,
- lmm_variable_getvalue
- (GENERIC_LMM_ACTION(action).
- variable), cpu->last_update,
- now - cpu->last_update);
+ ((surf_action_t)action)->category,
+ lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable),
+ GENERIC_LMM_ACTION(action).last_update,
+ now - GENERIC_LMM_ACTION(action).last_update);
}
#endif
+ /* set the remains to 0 due to precision problems when updating the remaining amount */
GENERIC_ACTION(action).remains = 0;
cpu_action_state_set((surf_action_t) action, SURF_ACTION_DONE);
-// heap_remove(action); //FIXME heap
+ surf_action_lmm_heap_remove(cpu_action_heap,(surf_action_lmm_t)action);
}
#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_t cpu;
- xbt_lib_cursor_t cursor;
- char *key;
double smaller = -1;
- xbt_lib_foreach(host_lib, cursor, key, data) {
- if (data[SURF_CPU_LEVEL]) {
- cpu = data[SURF_CPU_LEVEL];
+ xbt_swag_t running_actions = surf_cpu_model->states.running_action_set;
+ xbt_swag_foreach(action, running_actions) {
if (smaller < 0) {
- smaller = cpu->last_update;
+ smaller = GENERIC_LMM_ACTION(action).last_update;
continue;
}
- if (cpu->last_update < smaller) {
- smaller = cpu->last_update;
+ if (GENERIC_LMM_ACTION(action).last_update < smaller) {
+ smaller = GENERIC_LMM_ACTION(action).last_update;
}
- }
}
if (smaller > 0) {
TRACE_last_timestamp_to_dump = smaller;
GENERIC_LMM_ACTION(action).variable, 0));
TRACE_surf_host_set_utilization(x->generic_resource.name,
- GENERIC_ACTION(action).data,
- (surf_action_t) action,
- lmm_variable_getvalue
- (GENERIC_LMM_ACTION(action).
- variable), now - delta, delta);
+ ((surf_action_t)action)->category,
+ lmm_variable_getvalue(GENERIC_LMM_ACTION(action).
+ variable),
+ now - delta,
+ delta);
TRACE_last_timestamp_to_dump = now - delta;
}
#endif
GENERIC_ACTION(action).priority,
CPU->power_scale * CPU->power_peak, 1);
if (cpu_update_mechanism == UM_LAZY) {
- action->index_heap = -1;
- action->last_update = surf_get_clock();
+ GENERIC_LMM_ACTION(action).index_heap = -1;
+ GENERIC_LMM_ACTION(action).last_update = surf_get_clock();
}
lmm_expand(cpu_maxmin_system, CPU->constraint,
GENERIC_LMM_ACTION(action).variable, 1.0);
lmm_update_variable_weight(cpu_maxmin_system,
GENERIC_LMM_ACTION(action).variable, 0.0);
- if (cpu_update_mechanism == UM_LAZY) // remove action from the heap
- heap_remove((surf_action_cpu_Cas01_t) action);
+ if (cpu_update_mechanism == UM_LAZY) { // remove action from the heap
+ surf_action_lmm_heap_remove(cpu_action_heap,(surf_action_lmm_t)action);
+ // this is necessary for a variable with weight 0 since such
+ // variables are ignored in lmm and we need to set its max_duration
+ // correctly at the next call to share_resources
+ xbt_swag_insert_at_head(action,cpu_modified_set);
+ }
XBT_OUT();
return (surf_action_t) action;
0.0);
((surf_action_lmm_t) action)->suspended = 1;
if (cpu_update_mechanism == UM_LAZY)
- heap_remove((surf_action_cpu_Cas01_t) action);
+ surf_action_lmm_heap_remove(cpu_action_heap,(surf_action_lmm_t)action);
}
XBT_OUT();
}
action->priority);
((surf_action_lmm_t) action)->suspended = 0;
if (cpu_update_mechanism == UM_LAZY)
- heap_remove((surf_action_cpu_Cas01_t) action);
+ surf_action_lmm_heap_remove(cpu_action_heap,(surf_action_lmm_t)action);
}
XBT_OUT();
}
XBT_IN("(%p,%g)", action, duration);
action->max_duration = duration;
- /* insert cpu in modified_cpu set to notice the max duration change */
if (cpu_update_mechanism == UM_LAZY)
- heap_remove((surf_action_cpu_Cas01_t) action);
+ surf_action_lmm_heap_remove(cpu_action_heap,(surf_action_lmm_t)action);
XBT_OUT();
}
priority);
if (cpu_update_mechanism == UM_LAZY)
- heap_remove((surf_action_cpu_Cas01_t) action);
+ surf_action_lmm_heap_remove(cpu_action_heap,(surf_action_lmm_t)action);
XBT_OUT();
}
XBT_IN("(%p)", action);
/* update remains before return it */
if (cpu_update_mechanism == UM_LAZY)
- update_action_remaining_lazy(surf_get_clock());
+ cpu_update_action_remaining_lazy(surf_get_clock());
XBT_OUT();
return action->remains;
}
return ((cpu_Cas01_t) cpu)->power_scale;
}
-static void cpu_action_update_index_heap(void *action, int i)
-{
- ((surf_action_cpu_Cas01_t) action)->index_heap = i;
-}
-
static void cpu_finalize(void)
{
lmm_system_free(cpu_maxmin_system);
if (cpu_update_mechanism == UM_LAZY) {
cpu_action_heap = xbt_heap_new(8, NULL);
xbt_heap_set_update_callback(cpu_action_heap,
- cpu_action_update_index_heap);
+ surf_action_lmm_update_index_heap);
cpu_modified_set =
- xbt_swag_new(xbt_swag_offset(comp, action_list_hookup));
+ xbt_swag_new(xbt_swag_offset(comp, generic_lmm_action.action_list_hookup));
cpu_maxmin_system->keep_track = cpu_modified_set;
}
}
