X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/110b155a3d6309c2f780ca870d8c14391796ccd4..a9d4a27f57895978422f9cd1f51fd39b939f44fd:/src/surf/cpu.c

diff --git a/src/surf/cpu.c b/src/surf/cpu.c
index e9ecb0619d..8e087a9d6d 100644
--- a/src/surf/cpu.c
+++ b/src/surf/cpu.c
@@ -14,22 +14,13 @@ surf_cpu_resource_t surf_cpu_resource = NULL;
 
 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
-   completely available. power_initial is therefore expected to be
-   comprised between 0.0 and 1.0, just as the values of power_trace.
-   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,
@@ -40,14 +31,13 @@ static cpu_t cpu_new(const char *name, double power_scale,
   cpu->resource = (surf_resource_t) surf_cpu_resource;
   cpu->name = name;
   cpu->power_scale = power_scale;
+  xbt_assert0(cpu->power_scale>0,"Power has to be >0");
   cpu->power_current = power_initial;
-/*   cpu->power_trace = power_trace; */
   if (power_trace)
     cpu->power_event =
 	tmgr_history_add_trace(history, power_trace, 0.0, 0, cpu);
 
   cpu->state_current = state_initial;
-/*   cpu->state_trace = state_trace; */
   if (state_trace)
     cpu->state_event =
 	tmgr_history_add_trace(history, state_trace, 0.0, 0, cpu);
@@ -61,17 +51,8 @@ static cpu_t cpu_new(const char *name, double power_scale,
   return cpu;
 }
 
-/*  
-   Semantic:  name       scale     initial     power     initial     state
-                                    power      trace      state      trace
-   
-   Token:   TOKEN_WORD TOKEN_WORD TOKEN_WORD TOKEN_WORD TOKEN_WORD TOKEN_WORD
-   Type:     string      double     double     string     ON/OFF     string
-*/
-
 static void parse_cpu(void)
 {
-  e_surf_token_t token;
   char *name = NULL;
   double power_scale = 0.0;
   double power_initial = 0.0;
@@ -79,25 +60,16 @@ static void parse_cpu(void)
   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);
@@ -105,27 +77,11 @@ static void parse_cpu(void)
 
 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)
@@ -150,10 +106,9 @@ static int resource_used(void *resource_id)
 
 static void action_free(surf_action_t action)
 {
-  surf_action_cpu_t Action = (surf_action_cpu_t) action;
-
   xbt_swag_remove(action, action->state_set);
-  lmm_variable_free(maxmin_system, Action->variable);
+  if(((surf_action_cpu_t)action)->variable)
+    lmm_variable_free(maxmin_system, ((surf_action_cpu_t)action)->variable);
   xbt_free(action);
 
   return;
@@ -172,6 +127,12 @@ static void action_recycle(surf_action_t action)
 static void action_change_state(surf_action_t action,
 				e_surf_action_state_t state)
 {
+  if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED))
+    if(((surf_action_cpu_t)action)->variable) {
+      lmm_variable_disable(maxmin_system, ((surf_action_cpu_t)action)->variable);
+      ((surf_action_cpu_t)action)->variable = NULL;
+    }
+
   surf_action_change_state(action, state);
   return;
 }
@@ -194,12 +155,12 @@ static void update_actions_state(double now, double delta)
       surf_cpu_resource->common_public->states.failed_action_set;
 
   xbt_swag_foreach_safe(action, next_action, running_actions) {
-    action->generic_action.remains -=
-	lmm_variable_getvalue(action->variable) * delta;
+    surf_double_update(&(action->generic_action.remains),
+	lmm_variable_getvalue(action->variable) * delta);
     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) {
+      surf_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);
     } else if ((action->generic_action.max_duration != NO_MAX_DURATION) &&
@@ -224,9 +185,9 @@ static void update_actions_state(double now, double delta)
     }
   }
 
-  xbt_swag_foreach_safe(action, next_action, failed_actions) {
-    lmm_variable_disable(maxmin_system, action->variable);
-  }
+/*   xbt_swag_foreach_safe(action, next_action, failed_actions) { */
+/*     lmm_variable_disable(maxmin_system, action->variable); */
+/*   } */
 
   return;
 }
@@ -237,10 +198,6 @@ static void update_resource_state(void *id,
 {
   cpu_t cpu = id;
 
-/*   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) {
     cpu->power_current = value;
     lmm_update_constraint_bound(maxmin_system, cpu->constraint,
@@ -282,7 +239,7 @@ static surf_action_t execute(void *cpu, double size)
   xbt_swag_insert(action, action->generic_action.state_set);
 
   action->variable = lmm_variable_new(maxmin_system, action, 1.0, -1.0, 1);
-  lmm_expand(maxmin_system, ((cpu_t) cpu)->constraint, action->variable,
+  lmm_expand(maxmin_system, CPU->constraint, action->variable,
 	     1.0);
 
   return (surf_action_t) action;
@@ -313,7 +270,7 @@ static void action_resume(surf_action_t action)
 
 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)
@@ -380,11 +337,12 @@ static void surf_cpu_resource_init_internal(void)
       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->extension_public->execute = execute;
   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;
 
@@ -393,7 +351,22 @@ static void surf_cpu_resource_init_internal(void)
   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 where 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;