-/* Copyright (c) 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2009-2011. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "surf_private.h"
+#include "surf/surf_resource.h"
+
+surf_model_t surf_cpu_model = NULL;
+lmm_system_t cpu_maxmin_system = NULL;
+
+typedef enum {
+ UM_FULL,
+ UM_LAZY,
+ UM_UNDEFINED,
+} e_UM_t;
+
+e_UM_t update_mechanism = UM_LAZY;
#undef GENERIC_LMM_ACTION
#undef GENERIC_ACTION
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_im, surf,
"Logging specific to the SURF CPU IMPROVED module");
-
lmm_system_t cpu_im_maxmin_system = NULL;
static xbt_swag_t cpu_im_modified_cpu = NULL;
static xbt_heap_t cpu_im_action_heap = NULL;
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_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_assert(cpu->power_peak > 0, "Power has to be >0");
cpu->power_scale = power_scale;
+ cpu->core = core;
+ xbt_assert(core>0,"Invalid number of cores %d",core);
+
if (power_trace)
cpu->power_event =
tmgr_history_add_trace(history, power_trace, 0.0, 0, cpu);
- cpu->core = core;
- xbt_assert(core>0,"Invalid number of cores %d",core);
cpu->state_current = state_initial;
if (state_trace)
cpu->core * cpu->power_scale * cpu->power_peak);
xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, cpu);
- cpu->action_set = xbt_swag_new(xbt_swag_offset(action, cpu_list_hookup));
+ if(update_mechanism == UM_FULL)
+ 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(sg_platf_host_cbarg_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_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_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->id,
+ host->power_peak,
+ host->power_scale,
+ host->power_trace,
+ host->core_amount,
+ host->initial_state,
+ host->state_trace,
+ host->properties);
}
static void cpu_im_add_traces_cpu(void)
}
}
-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);
- surfxml_add_callback(ETag_surfxml_platform_cb_list,
- &cpu_im_add_traces_cpu);
+ sg_platf_host_add_cb(parse_cpu_im_init);
+ sg_platf_postparse_add_cb(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)
if (((surf_action_lmm_t) action)->variable)
lmm_variable_free(cpu_im_maxmin_system,
((surf_action_lmm_t) action)->variable);
+ if(update_mechanism == UM_FULL){
/* remove from heap */
xbt_heap_remove(cpu_im_action_heap,
((surf_action_cpu_Cas01_im_t) action)->index_heap);
xbt_swag_remove(action,
((cpu_Cas01_im_t) ACTION_GET_CPU(action))->action_set);
xbt_swag_insert(ACTION_GET_CPU(action), cpu_im_modified_cpu);
+ }
#ifdef HAVE_TRACING
- if (action->category)
- xbt_free(action->category);
+ xbt_free(action->category);
#endif
surf_action_free(&action);
return 1;
static void cpu_im_action_cancel(surf_action_t action)
{
surf_action_state_set(action, SURF_ACTION_FAILED);
+ if(update_mechanism == UM_FULL){
xbt_heap_remove(cpu_im_action_heap,
((surf_action_cpu_Cas01_im_t) action)->index_heap);
xbt_swag_remove(action,
((cpu_Cas01_im_t) ACTION_GET_CPU(action))->action_set);
+ }
return;
}
static void cpu_im_update_actions_state(double now, double delta)
{
surf_action_cpu_Cas01_im_t action;
-
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);
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,
+ GENERIC_LMM_ACTION(action).generic_action.data,
(surf_action_t) action,
lmm_variable_getvalue (GENERIC_LMM_ACTION(action).variable),
cpu->last_update,
while ((var = lmm_get_var_from_cnst
(cpu_im_maxmin_system, cpu->constraint, &elem))) {
surf_action_cpu_Cas01_im_t action = lmm_variable_id(var);
- lmm_update_variable_bound(cpu_im_maxmin_system, action->generic_lmm_action.variable,
+ lmm_update_variable_bound(cpu_im_maxmin_system, GENERIC_LMM_ACTION(action).variable,
cpu->power_scale * cpu->power_peak);
}
- xbt_swag_insert(cpu, cpu_im_modified_cpu);
+ if(update_mechanism == UM_FULL)
+ xbt_swag_insert(cpu, cpu_im_modified_cpu);
if (tmgr_trace_event_free(event_type))
cpu->power_event = NULL;
} else if (event_type == cpu->state_event) {
GENERIC_LMM_ACTION(action).variable =
lmm_variable_new(cpu_im_maxmin_system, action,
GENERIC_ACTION(action).priority, CPU->power_scale * CPU->power_peak, 1);
- action->index_heap = -1;
- action->cpu = CPU;
- xbt_swag_insert(CPU, cpu_im_modified_cpu);
- xbt_swag_insert(action, CPU->action_set);
+ if(update_mechanism == UM_FULL){
+ action->index_heap = -1;
+ action->cpu = CPU;
+ xbt_swag_insert(CPU, cpu_im_modified_cpu);
+ xbt_swag_insert(action, CPU->action_set);
+ }
lmm_expand(cpu_im_maxmin_system, CPU->constraint,
GENERIC_LMM_ACTION(action).variable, 1.0);
XBT_OUT();
lmm_update_variable_weight(cpu_im_maxmin_system,
GENERIC_LMM_ACTION(action).variable, 0.0);
- xbt_swag_insert(cpu, cpu_im_modified_cpu);
+ if(update_mechanism == UM_FULL)
+ xbt_swag_insert(cpu, cpu_im_modified_cpu);
XBT_OUT();
return (surf_action_t) action;
}
((surf_action_lmm_t) action)->variable,
0.0);
((surf_action_lmm_t) action)->suspended = 1;
- xbt_heap_remove(cpu_im_action_heap,
- ((surf_action_cpu_Cas01_im_t) action)->index_heap);
- xbt_swag_insert(ACTION_GET_CPU(action), cpu_im_modified_cpu);
+ if(update_mechanism == UM_FULL){
+ xbt_heap_remove(cpu_im_action_heap,
+ ((surf_action_cpu_Cas01_im_t) action)->index_heap);
+ xbt_swag_insert(ACTION_GET_CPU(action), cpu_im_modified_cpu);
+ }
}
XBT_OUT();
}
((surf_action_lmm_t) action)->variable,
action->priority);
((surf_action_lmm_t) action)->suspended = 0;
- xbt_swag_insert(ACTION_GET_CPU(action), cpu_im_modified_cpu);
+ if(update_mechanism == UM_FULL)
+ xbt_swag_insert(ACTION_GET_CPU(action), cpu_im_modified_cpu);
}
XBT_OUT();
}
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);
+ if(update_mechanism == UM_FULL)
+ xbt_swag_insert(ACTION_GET_CPU(action), cpu_im_modified_cpu);
XBT_OUT();
}
((surf_action_lmm_t) action)->variable,
priority);
- xbt_swag_insert(ACTION_GET_CPU(action), cpu_im_modified_cpu);
+ if(update_mechanism == UM_FULL)
+ xbt_swag_insert(ACTION_GET_CPU(action), cpu_im_modified_cpu);
XBT_OUT();
}
{
XBT_IN("(%p)", action);
/* update remains before return it */
- cpu_im_update_remains(ACTION_GET_CPU(action), surf_get_clock());
+ if(update_mechanism == UM_FULL)
+ cpu_im_update_remains(ACTION_GET_CPU(action), surf_get_clock());
return action->remains;
XBT_OUT();
}
((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;
char *key;
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);
- }
+ 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);
xbt_swag_free
(cpu_im_running_action_set_that_does_not_need_being_checked);
cpu_im_running_action_set_that_does_not_need_being_checked = NULL;
- xbt_heap_free(cpu_im_action_heap);
- xbt_swag_free(cpu_im_modified_cpu);
+ if(cpu_im_action_heap) xbt_heap_free(cpu_im_action_heap);
+ if(cpu_im_modified_cpu) xbt_swag_free(cpu_im_modified_cpu);
}
-static void surf_cpu_im_model_init_internal(void)
+static void surf_cpu_im_model_init_internal(const char* name)
{
s_surf_action_t action;
s_cpu_Cas01_im_t cpu;
cpu_im_running_action_set_that_does_not_need_being_checked =
xbt_swag_new(xbt_swag_offset(action, state_hookup));
- surf_cpu_model->name = "CPU_IM";
+ surf_cpu_model->name = name;
surf_cpu_model->action_unref = cpu_im_action_unref;
surf_cpu_model->action_cancel = cpu_im_action_cancel;
surf_cpu_model->action_state_set = cpu_im_cpu_action_state_set;
surf_cpu_model->model_private->resource_used = cpu_im_resource_used;
- surf_cpu_model->model_private->share_resources = cpu_im_share_resources;
+ surf_cpu_model->model_private->share_resources = generic_share_resources;
surf_cpu_model->model_private->update_actions_state =
- cpu_im_update_actions_state;
+ generic_update_actions_state;//ok
surf_cpu_model->model_private->update_resource_state =
- cpu_im_update_resource_state;
+ cpu_im_update_resource_state;//ok
surf_cpu_model->model_private->finalize = cpu_im_finalize;
surf_cpu_model->suspend = cpu_im_action_suspend;
sg_maxmin_selective_update = 1;
cpu_im_maxmin_system = lmm_system_new();
}
- cpu_im_action_heap = xbt_heap_new(8, NULL);
- xbt_heap_set_update_callback(cpu_im_action_heap,
- cpu_im_action_update_index_heap);
- cpu_im_modified_cpu =
- xbt_swag_new(xbt_swag_offset(cpu, modified_cpu_hookup));
+ if(update_mechanism == UM_FULL){
+ cpu_im_action_heap = xbt_heap_new(8, NULL);
+ xbt_heap_set_update_callback(cpu_im_action_heap,
+ cpu_im_action_update_index_heap);
+ cpu_im_modified_cpu =
+ xbt_swag_new(xbt_swag_offset(cpu, modified_cpu_hookup));
+ }
}
/*********************************************************************/
/* 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()
{
+ char* name;
+ if( strcmp(xbt_cfg_get_string(_surf_cfg_set, "cpu/model"),"Cas01"))
+ update_mechanism = UM_FULL;
+ else
+ update_mechanism = UM_LAZY;
+
if (surf_cpu_model)
return;
- surf_cpu_im_model_init_internal();
- cpu_im_define_callbacks(filename);
+ surf_cpu_im_model_init_internal("CPU");
+ cpu_im_define_callbacks();
xbt_dynar_push(model_list, &surf_cpu_model);
}
+
+double generic_share_resources(double now)
+{
+ surf_action_cpu_Cas01_im_t action;
+ if(update_mechanism == UM_FULL)
+ return cpu_im_share_resources(now);
+ else if (update_mechanism == UM_LAZY)
+ {
+ return generic_maxmin_share_resources(surf_cpu_model->states.running_action_set,
+ xbt_swag_offset(*action, generic_lmm_action.variable),
+ cpu_im_maxmin_system, lmm_solve);
+ } else {
+ xbt_die("Invalide update mechanism!");
+ return 0;
+ }
+}
+
+static void cpu_update_actions_state(double now, double delta)
+{
+ surf_action_cpu_Cas01_im_t action = NULL;
+ surf_action_cpu_Cas01_im_t next_action = NULL;
+ xbt_swag_t running_actions = surf_cpu_model->states.running_action_set;
+ xbt_swag_foreach_safe(action, next_action, running_actions) {
+#ifdef HAVE_TRACING
+ if (TRACE_is_enabled()) {
+ cpu_Cas01_im_t x =
+ lmm_constraint_id(lmm_get_cnst_from_var
+ (cpu_maxmin_system, 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);
+ TRACE_last_timestamp_to_dump = now-delta;
+ }
+#endif
+ double_update(&(GENERIC_ACTION(action).remains),
+ lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable) * delta);
+ if (GENERIC_LMM_ACTION(action).generic_action.max_duration != NO_MAX_DURATION)
+ double_update(&(GENERIC_ACTION(action).max_duration), delta);
+ if ((GENERIC_ACTION(action).remains <= 0) &&
+ (lmm_get_variable_weight(GENERIC_LMM_ACTION(action).variable) > 0)) {
+ GENERIC_ACTION(action).finish = surf_get_clock();
+ cpu_im_cpu_action_state_set((surf_action_t) action, SURF_ACTION_DONE);
+ } else if ((GENERIC_ACTION(action).max_duration != NO_MAX_DURATION) &&
+ (GENERIC_ACTION(action).max_duration <= 0)) {
+ GENERIC_ACTION(action).finish = surf_get_clock();
+ cpu_im_cpu_action_state_set((surf_action_t) action, SURF_ACTION_DONE);
+ }
+ }
+
+ return;
+}
+
+void generic_update_actions_state(double now, double delta)
+{
+ if(update_mechanism == UM_FULL)
+ cpu_im_update_actions_state(now, delta);
+ else if(update_mechanism == UM_LAZY)
+ {
+ cpu_update_actions_state(now, delta);
+ }
+ else
+ xbt_die("Not recognized surf cpu model!");
+}
