-/* $Id$ */
-
-/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. 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 "cpu_private.h"
+#include "surf_private.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(cpu, surf,
- "Logging specific to the SURF CPU module");
+typedef s_surf_action_lmm_t s_surf_action_cpu_Cas01_t,
+ *surf_action_cpu_Cas01_t;
-surf_cpu_resource_t surf_cpu_resource = NULL;
+typedef struct cpu_Cas01 {
+ s_surf_resource_t generic_resource;
+ double power_peak;
+ double power_scale;
+ int core;
+ tmgr_trace_event_t power_event;
+ e_surf_resource_state_t state_current;
+ tmgr_trace_event_t state_event;
+ lmm_constraint_t constraint;
+} s_cpu_Cas01_t, *cpu_Cas01_t;
-xbt_dict_t cpu_set = NULL;
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf,
+ "Logging specific to the SURF CPU module");
-static void cpu_free(void *cpu)
-{
- free(((cpu_Cas01_t)cpu)->name);
- free(cpu);
-}
-static cpu_Cas01_t cpu_new(char *name, double power_scale,
- double power_initial,
- tmgr_trace_t power_trace,
- e_surf_cpu_state_t state_initial,
- tmgr_trace_t state_trace)
+
+surf_model_t surf_cpu_model = NULL;
+lmm_system_t cpu_maxmin_system = NULL;
+
+
+static xbt_swag_t cpu_running_action_set_that_does_not_need_being_checked =
+ NULL;
+
+static void* cpu_create_resource(const 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_Cas01_t cpu = xbt_new0(s_cpu_Cas01_t, 1);
- cpu->resource = (surf_resource_t) surf_cpu_resource;
- cpu->name = name;
+ cpu_Cas01_t cpu = NULL;
+ xbt_assert(!surf_cpu_resource_by_name(name),
+ "Host '%s' declared several times in the platform file",
+ name);
+ cpu = (cpu_Cas01_t) surf_resource_new(sizeof(s_cpu_Cas01_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;
- xbt_assert0(cpu->power_scale>0,"Power has to be >0");
- cpu->power_current = power_initial;
+ 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);
+ tmgr_history_add_trace(history, power_trace, 0.0, 0, cpu);
cpu->state_current = state_initial;
if (state_trace)
cpu->state_event =
- tmgr_history_add_trace(history, state_trace, 0.0, 0, cpu);
+ tmgr_history_add_trace(history, state_trace, 0.0, 0, cpu);
cpu->constraint =
- lmm_constraint_new(maxmin_system, cpu,
- cpu->power_current * cpu->power_scale);
+ lmm_constraint_new(cpu_maxmin_system, cpu,
+ cpu->core * cpu->power_scale * cpu->power_peak);
- xbt_dict_set(cpu_set, name, cpu, cpu_free);
+ xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, cpu);
return cpu;
}
-static void parse_cpu(void)
-{
- char *name = NULL;
- double power_scale = 0.0;
- double power_initial = 0.0;
- tmgr_trace_t power_trace = NULL;
- e_surf_cpu_state_t state_initial = SURF_CPU_OFF;
- tmgr_trace_t state_trace = NULL;
-
- name = xbt_strdup(A_cpu_name);
- surf_parse_get_double(&power_scale,A_cpu_power);
- surf_parse_get_double(&power_initial,A_cpu_availability);
- surf_parse_get_trace(&power_trace,A_cpu_availability_file);
-
- xbt_assert0((A_cpu_state==A_cpu_state_ON)||(A_cpu_state==A_cpu_state_OFF),
- "Invalid state");
- if (A_cpu_state==A_cpu_state_ON) state_initial = SURF_CPU_ON;
- if (A_cpu_state==A_cpu_state_OFF) state_initial = SURF_CPU_OFF;
- surf_parse_get_trace(&state_trace,A_cpu_state_file);
-
- cpu_new(name, power_scale, power_initial, power_trace, state_initial,
- state_trace);
-}
-static void parse_file(const char *file)
+static void parse_cpu_init(sg_platf_host_cbarg_t host)
{
- surf_parse_reset_parser();
- ETag_cpu_fun=parse_cpu;
- surf_parse_open(file);
- xbt_assert1((!surf_parse()),"Parse error in %s",file);
- surf_parse_close();
+ if(strcmp(host->V_host_coord,"")) xbt_die("Coordinates not implemented yet!");
+
+ cpu_create_resource(host->V_host_id,
+ host->V_host_power_peak,
+ host->V_host_power_scale,
+ host->V_host_power_trace,
+ host->V_host_core,
+ host->V_host_state_initial,
+ host->V_host_state_trace,
+ host->properties);
}
-static void *name_service(const char *name)
+static void add_traces_cpu(void)
{
- return xbt_dict_get_or_null(cpu_set, name);
+ xbt_dict_cursor_t cursor = NULL;
+ char *trace_name, *elm;
+
+ static int called = 0;
+
+ if (called)
+ return;
+ called = 1;
+
+
+ /* connect all traces relative to hosts */
+ xbt_dict_foreach(trace_connect_list_host_avail, cursor, trace_name, elm) {
+ tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
+ cpu_Cas01_t host = surf_cpu_resource_by_name(elm);
+
+ xbt_assert(host, "Host %s undefined", elm);
+ xbt_assert(trace, "Trace %s undefined", trace_name);
+
+ host->state_event =
+ tmgr_history_add_trace(history, trace, 0.0, 0, host);
+ }
+
+ xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) {
+ tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
+ cpu_Cas01_t host = surf_cpu_resource_by_name(elm);
+
+ xbt_assert(host, "Host %s undefined", elm);
+ xbt_assert(trace, "Trace %s undefined", trace_name);
+
+ host->power_event =
+ tmgr_history_add_trace(history, trace, 0.0, 0, host);
+ }
}
-static const char *get_resource_name(void *resource_id)
+static void cpu_define_callbacks(void)
{
- return ((cpu_Cas01_t) resource_id)->name;
+ sg_platf_host_add_cb(parse_cpu_init);
+ surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_traces_cpu);
}
-static int resource_used(void *resource_id)
+static int cpu_resource_used(void *resource_id)
{
- return lmm_constraint_used(maxmin_system,
- ((cpu_Cas01_t) resource_id)->constraint);
+ return lmm_constraint_used(cpu_maxmin_system,
+ ((cpu_Cas01_t) resource_id)->constraint);
}
-static int action_free(surf_action_t action)
+static int cpu_action_unref(surf_action_t action)
{
- action->using--;
- if(!action->using) {
+ action->refcount--;
+ if (!action->refcount) {
xbt_swag_remove(action, action->state_set);
- if(((surf_action_cpu_Cas01_t)action)->variable)
- lmm_variable_free(maxmin_system, ((surf_action_cpu_Cas01_t)action)->variable);
- free(action);
+ if (((surf_action_cpu_Cas01_t) action)->variable)
+ lmm_variable_free(cpu_maxmin_system,
+ ((surf_action_cpu_Cas01_t) action)->variable);
+#ifdef HAVE_TRACING
+ if (action->category)
+ xbt_free(action->category);
+#endif
+ surf_action_free(&action);
return 1;
}
return 0;
}
-static void action_use(surf_action_t action)
-{
- action->using++;
-}
-
-static void action_cancel(surf_action_t action)
-{
- surf_action_change_state(action, SURF_ACTION_FAILED);
- return;
-}
-
-static void action_recycle(surf_action_t action)
+static void cpu_action_cancel(surf_action_t action)
{
+ surf_action_state_set(action, SURF_ACTION_FAILED);
return;
}
-static void action_change_state(surf_action_t action,
- e_surf_action_state_t state)
+static void cpu_action_state_set(surf_action_t action,
+ e_surf_action_state_t state)
{
/* if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) */
/* if(((surf_action_cpu_Cas01_t)action)->variable) { */
-/* lmm_variable_disable(maxmin_system, ((surf_action_cpu_Cas01_t)action)->variable); */
+/* lmm_variable_disable(cpu_maxmin_system, ((surf_action_cpu_Cas01_t)action)->variable); */
/* ((surf_action_cpu_Cas01_t)action)->variable = NULL; */
/* } */
- surf_action_change_state(action, state);
+ surf_action_state_set(action, state);
return;
}
-static double share_resources(double now)
+static double cpu_share_resources(double now)
{
s_surf_action_cpu_Cas01_t action;
- return generic_maxmin_share_resources(surf_cpu_resource->common_public->
- states.running_action_set,
- xbt_swag_offset(action, variable));
+ return generic_maxmin_share_resources(surf_cpu_model->
+ states.running_action_set,
+ xbt_swag_offset(action, variable),
+ cpu_maxmin_system, lmm_solve);
}
-static void update_actions_state(double now, double delta)
+static void cpu_update_actions_state(double now, double delta)
{
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;
- /* FIXME: UNUSED
- xbt_swag_t failed_actions =
- surf_cpu_resource->common_public->states.failed_action_set;
- */
+ xbt_swag_t running_actions = surf_cpu_model->states.running_action_set;
xbt_swag_foreach_safe(action, next_action, running_actions) {
- surf_double_update(&(action->generic_action.remains),
- lmm_variable_getvalue(action->variable) * delta);
+#ifdef HAVE_TRACING
+ if (TRACE_is_enabled()) {
+ cpu_Cas01_t x =
+ lmm_constraint_id(lmm_get_cnst_from_var
+ (cpu_maxmin_system, action->variable, 0));
+
+ TRACE_surf_host_set_utilization(x->generic_resource.name,
+ action->generic_action.data,
+ (surf_action_t) action,
+ 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 (action->generic_action.max_duration != NO_MAX_DURATION)
- surf_double_update(&(action->generic_action.max_duration), delta);
- if ((action->generic_action.remains <= 0) &&
- (lmm_get_variable_weight(action->variable)>0)) {
+ double_update(&(action->generic_action.max_duration), delta);
+ if ((action->generic_action.remains <= 0) &&
+ (lmm_get_variable_weight(action->variable) > 0)) {
action->generic_action.finish = surf_get_clock();
- action_change_state((surf_action_t) action, SURF_ACTION_DONE);
+ cpu_action_state_set((surf_action_t) action, SURF_ACTION_DONE);
} else if ((action->generic_action.max_duration != NO_MAX_DURATION) &&
- (action->generic_action.max_duration <= 0)) {
+ (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 */
- lmm_constraint_t cnst = NULL;
- int i = 0;
- cpu_Cas01_t cpu = NULL;
-
- while ((cnst =
- lmm_get_cnst_from_var(maxmin_system, action->variable,
- i++))) {
- cpu = lmm_constraint_id(cnst);
- if (cpu->state_current == SURF_CPU_OFF) {
- action->generic_action.finish = surf_get_clock();
- action_change_state((surf_action_t) action, SURF_ACTION_FAILED);
- break;
- }
- }
+ cpu_action_state_set((surf_action_t) action, SURF_ACTION_DONE);
}
}
return;
}
-static void update_resource_state(void *id,
- tmgr_trace_event_t event_type,
- double value)
+static void cpu_update_resource_state(void *id,
+ tmgr_trace_event_t event_type,
+ double value, double date)
{
cpu_Cas01_t cpu = id;
+ lmm_variable_t var = NULL;
+ lmm_element_t elem = NULL;
if (event_type == cpu->power_event) {
- cpu->power_current = value;
- lmm_update_constraint_bound(maxmin_system, cpu->constraint,
- cpu->power_current * cpu->power_scale);
+ cpu->power_scale = value;
+ lmm_update_constraint_bound(cpu_maxmin_system, cpu->constraint,
+ cpu->core * cpu->power_scale * cpu->power_peak);
+#ifdef HAVE_TRACING
+ TRACE_surf_host_set_power(date, cpu->generic_resource.name,
+ cpu->core * cpu->power_scale * cpu->power_peak);
+#endif
+ while ((var = lmm_get_var_from_cnst
+ (cpu_maxmin_system, cpu->constraint, &elem))) {
+ surf_action_cpu_Cas01_t action = lmm_variable_id(var);
+ lmm_update_variable_bound(cpu_maxmin_system, action->variable,
+ cpu->power_scale * cpu->power_peak);
+ }
+ if (tmgr_trace_event_free(event_type))
+ cpu->power_event = NULL;
} else if (event_type == cpu->state_event) {
if (value > 0)
- cpu->state_current = SURF_CPU_ON;
- else
- cpu->state_current = SURF_CPU_OFF;
+ cpu->state_current = SURF_RESOURCE_ON;
+ else {
+ lmm_constraint_t cnst = cpu->constraint;
+ lmm_variable_t var = NULL;
+ lmm_element_t elem = NULL;
+
+ cpu->state_current = SURF_RESOURCE_OFF;
+
+ while ((var = lmm_get_var_from_cnst(cpu_maxmin_system, cnst, &elem))) {
+ surf_action_t action = lmm_variable_id(var);
+
+ if (surf_action_state_get(action) == SURF_ACTION_RUNNING ||
+ surf_action_state_get(action) == SURF_ACTION_READY ||
+ surf_action_state_get(action) ==
+ SURF_ACTION_NOT_IN_THE_SYSTEM) {
+ action->finish = date;
+ cpu_action_state_set(action, SURF_ACTION_FAILED);
+ }
+ }
+ }
+ if (tmgr_trace_event_free(event_type))
+ cpu->state_event = NULL;
} else {
- CRITICAL0("Unknown event ! \n");
+ XBT_CRITICAL("Unknown event ! \n");
xbt_abort();
}
return;
}
-static surf_action_t execute(void *cpu, double size)
+static surf_action_t cpu_execute(void *cpu, double size)
{
surf_action_cpu_Cas01_t action = NULL;
cpu_Cas01_t CPU = cpu;
- action = xbt_new0(s_surf_action_cpu_Cas01_t, 1);
-
- action->generic_action.using = 1;
- action->generic_action.cost = size;
- action->generic_action.remains = size;
- action->generic_action.priority = 1.0;
- 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;
-
- if (CPU->state_current == SURF_CPU_ON)
- action->generic_action.state_set =
- surf_cpu_resource->common_public->states.running_action_set;
- else
- action->generic_action.state_set =
- surf_cpu_resource->common_public->states.failed_action_set;
- xbt_swag_insert(action, action->generic_action.state_set);
-
- action->variable = lmm_variable_new(maxmin_system, action,
- action->generic_action.priority, -1.0, 1);
- lmm_expand(maxmin_system, CPU->constraint, action->variable,
- 1.0);
+ XBT_IN("(%s,%g)", surf_resource_name(CPU), size);
+ action =
+ surf_action_new(sizeof(s_surf_action_cpu_Cas01_t), size,
+ surf_cpu_model,
+ CPU->state_current != SURF_RESOURCE_ON);
+
+ action->suspended = 0; /* Should be useless because of the
+ calloc but it seems to help valgrind... */
+ action->variable = lmm_variable_new(cpu_maxmin_system, action,
+ action->generic_action.priority,
+ CPU->power_scale * CPU->power_peak, 1);
+ lmm_expand(cpu_maxmin_system, CPU->constraint, action->variable, 1.0);
+ XBT_OUT();
return (surf_action_t) action;
}
-static surf_action_t action_sleep(void *cpu, double duration)
+static surf_action_t cpu_action_sleep(void *cpu, double duration)
{
surf_action_cpu_Cas01_t action = NULL;
- action = (surf_action_cpu_Cas01_t) execute(cpu, 1.0);
+ if (duration > 0)
+ duration = MAX(duration, MAXMIN_PRECISION);
+
+ 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;
- lmm_update_variable_weight(maxmin_system, action->variable, 0.0);
+ action->suspended = 2;
+ if (duration == NO_MAX_DURATION) {
+ /* Move to the *end* of the corresponding action set. This convention
+ is used to speed up update_resource_state */
+ xbt_swag_remove(action, ((surf_action_t) action)->state_set);
+ ((surf_action_t) action)->state_set =
+ cpu_running_action_set_that_does_not_need_being_checked;
+ xbt_swag_insert(action, ((surf_action_t) action)->state_set);
+ }
+ lmm_update_variable_weight(cpu_maxmin_system, action->variable, 0.0);
+ XBT_OUT();
return (surf_action_t) action;
}
-static void action_suspend(surf_action_t action)
+static void cpu_action_suspend(surf_action_t action)
{
- lmm_update_variable_weight(maxmin_system,
- ((surf_action_cpu_Cas01_t) action)->variable, 0.0);
+ 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();
}
-static void action_resume(surf_action_t action)
+static void cpu_action_resume(surf_action_t action)
{
- lmm_update_variable_weight(maxmin_system,
- ((surf_action_cpu_Cas01_t) action)->variable,
- action->priority);
+ 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();
}
-static int action_is_suspended(surf_action_t action)
+static int cpu_action_is_suspended(surf_action_t action)
{
- return (lmm_get_variable_weight(((surf_action_cpu_Cas01_t) action)->variable) == 0.0);
+ return (((surf_action_cpu_Cas01_t) action)->suspended == 1);
}
-static void action_set_max_duration(surf_action_t action, double duration)
+static void cpu_action_set_max_duration(surf_action_t action,
+ double duration)
{
+ XBT_IN("(%p,%g)", action, duration);
action->max_duration = duration;
+ XBT_OUT();
}
-static void action_set_priority(surf_action_t action, double priority)
+static void cpu_action_set_priority(surf_action_t action, double 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();
}
-static e_surf_cpu_state_t get_state(void *cpu)
+#ifdef HAVE_TRACING
+static void cpu_action_set_category(surf_action_t action, const char *category)
+{
+ XBT_IN("(%p,%s)", action, category);
+ action->category = xbt_strdup (category);
+ XBT_OUT();
+}
+#endif
+
+static double cpu_action_get_remains(surf_action_t action)
+{
+ XBT_IN("(%p)", action);
+ return action->remains;
+ XBT_OUT();
+}
+
+static e_surf_resource_state_t cpu_get_state(void *cpu)
{
return ((cpu_Cas01_t) cpu)->state_current;
}
-static double get_speed(void *cpu, double load)
+static double cpu_get_speed(void *cpu, double load)
{
- return load*(((cpu_Cas01_t) cpu)->power_scale);
+ return load * (((cpu_Cas01_t) cpu)->power_peak);
}
-static void finalize(void)
+static double cpu_get_available_speed(void *cpu)
{
- 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.
- running_action_set);
- xbt_swag_free(surf_cpu_resource->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);
-
- free(surf_cpu_resource);
- surf_cpu_resource = NULL;
+ /* number between 0 and 1 */
+ return ((cpu_Cas01_t) cpu)->power_scale;
}
-static void surf_cpu_resource_init_internal(void)
+
+static void cpu_finalize(void)
{
- s_surf_action_t action;
+ lmm_system_free(cpu_maxmin_system);
+ cpu_maxmin_system = NULL;
- surf_cpu_resource = xbt_new0(s_surf_cpu_resource_t, 1);
+ surf_model_exit(surf_cpu_model);
+ surf_cpu_model = NULL;
- 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);
+ xbt_swag_free(cpu_running_action_set_that_does_not_need_being_checked);
+ cpu_running_action_set_that_does_not_need_being_checked = NULL;
+}
- surf_cpu_resource->extension_public =
- xbt_new0(s_surf_cpu_resource_extension_public_t, 1);
+static void surf_cpu_model_init_internal(void)
+{
+ s_surf_action_t action;
- surf_cpu_resource->common_public->states.ready_action_set =
- xbt_swag_new(xbt_swag_offset(action, state_hookup));
- surf_cpu_resource->common_public->states.running_action_set =
- xbt_swag_new(xbt_swag_offset(action, state_hookup));
- surf_cpu_resource->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 = surf_model_init();
+
+ cpu_running_action_set_that_does_not_need_being_checked =
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_action_get_state;
- 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 =
- action_change_state;
- surf_cpu_resource->common_public->action_set_data = surf_action_set_data;
- surf_cpu_resource->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 =
- 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 = 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_resource->extension_public->get_state = get_state;
- surf_cpu_resource->extension_public->get_speed = get_speed;
-
- cpu_set = xbt_dict_new();
-
- xbt_assert0(maxmin_system, "surf_init has to be called first!");
+ surf_cpu_model->name = "CPU";
+
+ surf_cpu_model->action_unref = cpu_action_unref;
+ surf_cpu_model->action_cancel = cpu_action_cancel;
+ surf_cpu_model->action_state_set = cpu_action_state_set;
+
+ surf_cpu_model->model_private->resource_used = cpu_resource_used;
+ surf_cpu_model->model_private->share_resources = cpu_share_resources;
+ surf_cpu_model->model_private->update_actions_state =
+ cpu_update_actions_state;
+ surf_cpu_model->model_private->update_resource_state =
+ cpu_update_resource_state;
+ surf_cpu_model->model_private->finalize = cpu_finalize;
+
+ surf_cpu_model->suspend = cpu_action_suspend;
+ surf_cpu_model->resume = cpu_action_resume;
+ surf_cpu_model->is_suspended = cpu_action_is_suspended;
+ surf_cpu_model->set_max_duration = cpu_action_set_max_duration;
+ surf_cpu_model->set_priority = cpu_action_set_priority;
+#ifdef HAVE_TRACING
+ surf_cpu_model->set_category = cpu_action_set_category;
+#endif
+ surf_cpu_model->get_remains = cpu_action_get_remains;
+
+ surf_cpu_model->extension.cpu.execute = cpu_execute;
+ surf_cpu_model->extension.cpu.sleep = cpu_action_sleep;
+
+ surf_cpu_model->extension.cpu.get_state = cpu_get_state;
+ surf_cpu_model->extension.cpu.get_speed = cpu_get_speed;
+ surf_cpu_model->extension.cpu.get_available_speed =
+ cpu_get_available_speed;
+ surf_cpu_model->extension.cpu.create_resource = cpu_create_resource;
+ surf_cpu_model->extension.cpu.add_traces = add_traces_cpu;
+
+ if (!cpu_maxmin_system)
+ cpu_maxmin_system = lmm_system_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()
{
- if (surf_cpu_resource)
+ if (surf_cpu_model)
return;
- surf_cpu_resource_init_internal();
- parse_file(filename);
- xbt_dynar_push(resource_list, &surf_cpu_resource);
+ surf_cpu_model_init_internal();
+ cpu_define_callbacks();
+ xbt_dynar_push(model_list, &surf_cpu_model);
}
