xbt_dict_t cpu_set = NULL;
-static void cpu_free(void *CPU)
+static void cpu_free(void *cpu)
{
-/* cpu_t cpu = CPU; */
-/* lmm_constraint_free(maxmin_system,cpu->constraint); */
-/* Clean somewhere else ! */
-
- xbt_free(CPU);
+ xbt_free(((cpu_t)cpu)->name);
+ xbt_free(cpu);
}
/* power_scale is the basic power of the cpu when the cpu is
state_trace values mean SURF_CPU_ON if >0 and SURF_CPU_OFF
otherwise.
*/
-static cpu_t cpu_new(const char *name, xbt_maxmin_float_t power_scale,
- xbt_maxmin_float_t power_initial,
+static cpu_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)
power trace state trace
Token: TOKEN_WORD TOKEN_WORD TOKEN_WORD TOKEN_WORD TOKEN_WORD TOKEN_WORD
- Type: string float float string ON/OFF string
+ Type: string double double string ON/OFF string
*/
static void parse_cpu(void)
{
- e_surf_token_t token;
char *name = NULL;
- xbt_maxmin_float_t power_scale = 0.0;
- xbt_maxmin_float_t power_initial = 0.0;
- tmgr_trace_t power_trace = 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(surf_parse_text);
-
- surf_parse_float(&power_scale);
- surf_parse_float(&power_initial);
- surf_parse_trace(&power_trace);
-
- token = surf_parse(); /* state_initial */
- xbt_assert1((token == TOKEN_WORD), "Parse error line %d", line_pos);
- if (strcmp(surf_parse_text, "ON") == 0)
- state_initial = SURF_CPU_ON;
- else if (strcmp(surf_parse_text, "OFF") == 0)
- state_initial = SURF_CPU_OFF;
- else {
- CRITICAL2("Invalid cpu state (line %d): %s neq ON or OFF\n", line_pos,
- surf_parse_text);
- xbt_abort();
- }
+ 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);
- surf_parse_trace(&state_trace);
+ 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)
{
- e_surf_token_t token;
-
- find_section(file, "CPU");
-
- while (1) {
- token = surf_parse();
-
- if (token == TOKEN_END_SECTION)
- break;
- if (token == TOKEN_NEWLINE)
- continue;
-
- if (token == TOKEN_WORD)
- parse_cpu();
- else {
- CRITICAL1("Parse error line %d\n", line_pos);
- xbt_abort();
- }
- }
-
- close_section("CPU");
+ 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();
}
static void *name_service(const char *name)
return;
}
-static xbt_heap_float_t share_resources(xbt_heap_float_t now)
+static double share_resources(double now)
{
s_surf_action_cpu_t action;
return generic_maxmin_share_resources(surf_cpu_resource->common_public->
xbt_swag_offset(action, variable));
}
-static void update_actions_state(xbt_heap_float_t now,
- xbt_heap_float_t delta)
+static void update_actions_state(double now, double delta)
{
surf_action_cpu_t action = NULL;
surf_action_cpu_t next_action = NULL;
if (action->generic_action.max_duration != NO_MAX_DURATION)
action->generic_action.max_duration -= delta;
/* if(action->generic_action.remains<.00001) action->generic_action.remains=0; */
- if (action->generic_action.remains <= 0) {
+ 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);
} else if ((action->generic_action.max_duration != NO_MAX_DURATION) &&
static void update_resource_state(void *id,
tmgr_trace_event_t event_type,
- xbt_maxmin_float_t value)
+ double value)
{
cpu_t cpu = id;
-/* printf("[" XBT_HEAP_FLOAT_T "] Asking to update CPU \"%s\" with value " */
-/* XBT_MAXMIN_FLOAT_T " for event %p\n", surf_get_clock(), cpu->name, */
+/* printf("[" "%lg" "] Asking to update CPU \"%s\" with value " */
+/* "%lg" " for event %p\n", surf_get_clock(), cpu->name, */
/* value, event_type); */
if (event_type == cpu->power_event) {
return;
}
-static surf_action_t execute(void *cpu, xbt_maxmin_float_t size)
+static surf_action_t execute(void *cpu, double size)
{
surf_action_cpu_t action = NULL;
cpu_t CPU = cpu;
action->generic_action.max_duration = NO_MAX_DURATION;
action->generic_action.start = surf_get_clock();
action->generic_action.finish = -1.0;
-/* action->generic_action.callback = cpu; */
- action->generic_action.callback = NULL;
action->generic_action.resource_type =
(surf_resource_t) surf_cpu_resource;
return (surf_action_t) action;
}
-static surf_action_t action_sleep(void *cpu, xbt_maxmin_float_t duration)
+static surf_action_t action_sleep(void *cpu, double duration)
{
surf_action_cpu_t action = NULL;
((surf_action_cpu_t) action)->variable, 1.0);
}
+static int action_is_suspended(surf_action_t action)
+{
+ return (lmm_get_variable_weight(((surf_action_cpu_t) action)->variable) == 0.0);
+}
+
static e_surf_cpu_state_t get_state(void *cpu)
{
return ((cpu_t) cpu)->state_current;
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->extension_public->sleep = action_sleep;
surf_cpu_resource->extension_public->suspend = action_suspend;
surf_cpu_resource->extension_public->resume = action_resume;
+ surf_cpu_resource->extension_public->is_suspended = action_is_suspended;
surf_cpu_resource->extension_public->get_state = get_state;
xbt_assert0(maxmin_system, "surf_init has to be called first!");
}
-void surf_cpu_resource_init(const char *filename)
+/*********************************************************************/
+/* Basic sharing model for CPU: that is all this started... ;) */
+/*********************************************************************/
+/* @InProceedings{casanova01simgrid, */
+/* author = "H. Casanova", */
+/* booktitle = "Proceedings of the IEEE Symposium on Cluster Computing */
+/* and the Grid (CCGrid'01)", */
+/* publisher = "IEEE Computer Society", */
+/* title = "Simgrid: {A} Toolkit for the Simulation of Application */
+/* Scheduling", */
+/* year = "2001", */
+/* month = may, */
+/* note = "Available at */
+/* \url{http://grail.sdsc.edu/papers/simgrid_ccgrid01.ps.gz}." */
+/* } */
+void surf_cpu_resource_init_Cas01(const char *filename)
{
if (surf_cpu_resource)
return;