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, double power_scale,
+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,
static void parse_cpu(void)
{
- e_surf_token_t token;
char *name = NULL;
double power_scale = 0.0;
double power_initial = 0.0;
e_surf_cpu_state_t state_initial = SURF_CPU_OFF;
tmgr_trace_t state_trace = NULL;
- name = xbt_strdup(surf_parse_text);
-
- surf_parse_double(&power_scale);
- surf_parse_double(&power_initial);
- surf_parse_trace(&power_trace);
-
- token = surf_parse(); /* state_initial */
- xbt_assert1((token == TOKEN_WORD), "Parse error line %d", surf_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", surf_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", surf_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)
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 int action_is_suspended(surf_action_t action)
{
- return (lmm_get_variable_weight(maxmin_system, ((surf_action_cpu_t) action)->variable) == 0.0);
+ return (lmm_get_variable_weight(((surf_action_cpu_t) action)->variable) == 0.0);
}
static e_surf_cpu_state_t get_state(void *cpu)
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;