XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf,
"Logging specific to the SURF CPU module");
-surf_cpu_resource_t surf_cpu_resource = NULL;
+surf_cpu_model_t surf_cpu_model = NULL;
lmm_system_t cpu_maxmin_system = NULL;
xbt_dict_t cpu_set = NULL;
{
cpu_Cas01_t cpu = xbt_new0(s_cpu_Cas01_t, 1);
- cpu->resource = (surf_resource_t) surf_cpu_resource;
+ cpu->model = (surf_model_t) surf_cpu_model;
cpu->name = name;
cpu->power_scale = power_scale;
xbt_assert0(cpu->power_scale > 0, "Power has to be >0");
return xbt_dict_get_or_null(cpu_set, name);
}
-static const char *get_resource_name(void *resource_id)
+static const char *get_model_name(void *model_id)
{
- return ((cpu_Cas01_t) resource_id)->name;
+ return ((cpu_Cas01_t) model_id)->name;
}
-static int resource_used(void *resource_id)
+static int model_used(void *model_id)
{
return lmm_constraint_used(cpu_maxmin_system,
- ((cpu_Cas01_t) resource_id)->constraint);
+ ((cpu_Cas01_t) model_id)->constraint);
}
static int action_free(surf_action_t action)
return;
}
-static double share_resources(double now)
+static double share_models(double now)
{
s_surf_action_cpu_Cas01_t action;
- return generic_maxmin_share_resources2(surf_cpu_resource->common_public->
+ return generic_maxmin_share_models2(surf_cpu_model->common_public->
states.running_action_set,
xbt_swag_offset(action, variable),
cpu_maxmin_system, lmm_solve);
surf_action_cpu_Cas01_t action = NULL;
surf_action_cpu_Cas01_t next_action = NULL;
xbt_swag_t running_actions =
- surf_cpu_resource->common_public->states.running_action_set;
+ surf_cpu_model->common_public->states.running_action_set;
/* FIXME: UNUSED
xbt_swag_t failed_actions =
- surf_cpu_resource->common_public->states.failed_action_set;
+ surf_cpu_model->common_public->states.failed_action_set;
*/
xbt_swag_foreach_safe(action, next_action, running_actions) {
(action->generic_action.max_duration <= 0)) {
action->generic_action.finish = surf_get_clock();
action_change_state((surf_action_t) action, SURF_ACTION_DONE);
- } else { /* Need to check that none of the resource has failed */
+ } else { /* Need to check that none of the model has failed */
lmm_constraint_t cnst = NULL;
int i = 0;
cpu_Cas01_t cpu = NULL;
return;
}
-static void update_resource_state(void *id,
+static void update_model_state(void *id,
tmgr_trace_event_t event_type,
double value)
{
action->generic_action.max_duration = NO_MAX_DURATION;
action->generic_action.start = surf_get_clock();
action->generic_action.finish = -1.0;
- action->generic_action.resource_type =
- (surf_resource_t) surf_cpu_resource;
+ action->generic_action.model_type =
+ (surf_model_t) surf_cpu_model;
action->suspended = 0; /* Should be useless because of the
calloc but it seems to help valgrind... */
if (CPU->state_current == SURF_CPU_ON)
action->generic_action.state_set =
- surf_cpu_resource->common_public->states.running_action_set;
+ surf_cpu_model->common_public->states.running_action_set;
else
action->generic_action.state_set =
- surf_cpu_resource->common_public->states.failed_action_set;
+ surf_cpu_model->common_public->states.failed_action_set;
xbt_swag_insert(action, action->generic_action.state_set);
action->variable = lmm_variable_new(cpu_maxmin_system, action,
static void finalize(void)
{
xbt_dict_free(&cpu_set);
- xbt_swag_free(surf_cpu_resource->common_public->states.ready_action_set);
- xbt_swag_free(surf_cpu_resource->common_public->states.
+ xbt_swag_free(surf_cpu_model->common_public->states.ready_action_set);
+ xbt_swag_free(surf_cpu_model->common_public->states.
running_action_set);
- xbt_swag_free(surf_cpu_resource->common_public->states.
+ xbt_swag_free(surf_cpu_model->common_public->states.
failed_action_set);
- xbt_swag_free(surf_cpu_resource->common_public->states.done_action_set);
- free(surf_cpu_resource->common_public);
- free(surf_cpu_resource->common_private);
- free(surf_cpu_resource->extension_public);
+ xbt_swag_free(surf_cpu_model->common_public->states.done_action_set);
+ free(surf_cpu_model->common_public);
+ free(surf_cpu_model->common_private);
+ free(surf_cpu_model->extension_public);
- free(surf_cpu_resource);
- surf_cpu_resource = NULL;
+ free(surf_cpu_model);
+ surf_cpu_model = NULL;
}
-static void surf_cpu_resource_init_internal(void)
+static void surf_cpu_model_init_internal(void)
{
s_surf_action_t action;
- surf_cpu_resource = xbt_new0(s_surf_cpu_resource_t, 1);
+ surf_cpu_model = xbt_new0(s_surf_cpu_model_t, 1);
- surf_cpu_resource->common_private =
- xbt_new0(s_surf_resource_private_t, 1);
- surf_cpu_resource->common_public = xbt_new0(s_surf_resource_public_t, 1);
+ surf_cpu_model->common_private =
+ xbt_new0(s_surf_model_private_t, 1);
+ surf_cpu_model->common_public = xbt_new0(s_surf_model_public_t, 1);
- surf_cpu_resource->extension_public =
- xbt_new0(s_surf_cpu_resource_extension_public_t, 1);
+ surf_cpu_model->extension_public =
+ xbt_new0(s_surf_cpu_model_extension_public_t, 1);
- surf_cpu_resource->common_public->states.ready_action_set =
+ surf_cpu_model->common_public->states.ready_action_set =
xbt_swag_new(xbt_swag_offset(action, state_hookup));
- surf_cpu_resource->common_public->states.running_action_set =
+ surf_cpu_model->common_public->states.running_action_set =
xbt_swag_new(xbt_swag_offset(action, state_hookup));
- surf_cpu_resource->common_public->states.failed_action_set =
+ surf_cpu_model->common_public->states.failed_action_set =
xbt_swag_new(xbt_swag_offset(action, state_hookup));
- surf_cpu_resource->common_public->states.done_action_set =
+ surf_cpu_model->common_public->states.done_action_set =
xbt_swag_new(xbt_swag_offset(action, state_hookup));
- surf_cpu_resource->common_public->name_service = name_service;
- surf_cpu_resource->common_public->get_resource_name = get_resource_name;
- surf_cpu_resource->common_public->action_get_state =
+ surf_cpu_model->common_public->name_service = name_service;
+ surf_cpu_model->common_public->get_model_name = get_model_name;
+ surf_cpu_model->common_public->action_get_state =
surf_action_get_state;
- surf_cpu_resource->common_public->action_get_start_time =
+ surf_cpu_model->common_public->action_get_start_time =
surf_action_get_start_time;
- surf_cpu_resource->common_public->action_get_finish_time =
+ surf_cpu_model->common_public->action_get_finish_time =
surf_action_get_finish_time;
- surf_cpu_resource->common_public->action_free = action_free;
- surf_cpu_resource->common_public->action_use = action_use;
- surf_cpu_resource->common_public->action_cancel = action_cancel;
- surf_cpu_resource->common_public->action_recycle = action_recycle;
- surf_cpu_resource->common_public->action_change_state =
+ surf_cpu_model->common_public->action_free = action_free;
+ surf_cpu_model->common_public->action_use = action_use;
+ surf_cpu_model->common_public->action_cancel = action_cancel;
+ surf_cpu_model->common_public->action_recycle = action_recycle;
+ surf_cpu_model->common_public->action_change_state =
action_change_state;
- surf_cpu_resource->common_public->action_set_data = surf_action_set_data;
- surf_cpu_resource->common_public->name = "CPU";
+ surf_cpu_model->common_public->action_set_data = surf_action_set_data;
+ surf_cpu_model->common_public->name = "CPU";
- surf_cpu_resource->common_private->resource_used = resource_used;
- surf_cpu_resource->common_private->share_resources = share_resources;
- surf_cpu_resource->common_private->update_actions_state =
+ surf_cpu_model->common_private->model_used = model_used;
+ surf_cpu_model->common_private->share_models = share_models;
+ surf_cpu_model->common_private->update_actions_state =
update_actions_state;
- surf_cpu_resource->common_private->update_resource_state =
- update_resource_state;
- surf_cpu_resource->common_private->finalize = finalize;
-
- surf_cpu_resource->common_public->suspend = action_suspend;
- surf_cpu_resource->common_public->resume = action_resume;
- surf_cpu_resource->common_public->is_suspended = action_is_suspended;
- surf_cpu_resource->common_public->set_max_duration =
+ surf_cpu_model->common_private->update_model_state =
+ update_model_state;
+ surf_cpu_model->common_private->finalize = finalize;
+
+ surf_cpu_model->common_public->suspend = action_suspend;
+ surf_cpu_model->common_public->resume = action_resume;
+ surf_cpu_model->common_public->is_suspended = action_is_suspended;
+ surf_cpu_model->common_public->set_max_duration =
action_set_max_duration;
- surf_cpu_resource->common_public->set_priority = action_set_priority;
- surf_cpu_resource->extension_public->execute = execute;
- surf_cpu_resource->extension_public->sleep = action_sleep;
+ surf_cpu_model->common_public->set_priority = action_set_priority;
+ surf_cpu_model->extension_public->execute = execute;
+ surf_cpu_model->extension_public->sleep = action_sleep;
- surf_cpu_resource->extension_public->get_state = get_state;
- surf_cpu_resource->extension_public->get_speed = get_speed;
- surf_cpu_resource->extension_public->get_available_speed =
+ surf_cpu_model->extension_public->get_state = get_state;
+ surf_cpu_model->extension_public->get_speed = get_speed;
+ surf_cpu_model->extension_public->get_available_speed =
get_available_speed;
cpu_set = xbt_dict_new();
/* note = "Available at */
/* \url{http://grail.sdsc.edu/papers/simgrid_ccgrid01.ps.gz}." */
/* } */
-void surf_cpu_resource_init_Cas01(const char *filename)
+void surf_cpu_model_init_Cas01(const char *filename)
{
- if (surf_cpu_resource)
+ if (surf_cpu_model)
return;
- surf_cpu_resource_init_internal();
+ surf_cpu_model_init_internal();
parse_file(filename);
- xbt_dynar_push(resource_list, &surf_cpu_resource);
+ xbt_dynar_push(model_list, &surf_cpu_model);
}