X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9b9103db7f7aac95d28b162b7f78c6a946bba864..54b36b81cc3bd164e2a77326cd59011652d612c0:/src/surf/cpu.c

diff --git a/src/surf/cpu.c b/src/surf/cpu.c
index df379ddcae..463d81ff6d 100644
--- a/src/surf/cpu.c
+++ b/src/surf/cpu.c
@@ -16,35 +16,28 @@ xbt_dict_t cpu_set = NULL;
 
 static void cpu_free(void *cpu)
 {
-  xbt_free(((cpu_t)cpu)->name);
+  xbt_free(((cpu_Cas01_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(char *name, double power_scale,
+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)
 {
-  cpu_t cpu = xbt_new0(s_cpu_t, 1);
+  cpu_Cas01_t cpu = xbt_new0(s_cpu_Cas01_t, 1);
 
   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);
@@ -58,14 +51,6 @@ static cpu_t cpu_new(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)
 {
   char *name = NULL;
@@ -110,21 +95,20 @@ static void *name_service(const char *name)
 
 static const char *get_resource_name(void *resource_id)
 {
-  return ((cpu_t) resource_id)->name;
+  return ((cpu_Cas01_t) resource_id)->name;
 }
 
 static int resource_used(void *resource_id)
 {
   return lmm_constraint_used(maxmin_system,
-			     ((cpu_t) resource_id)->constraint);
+			     ((cpu_Cas01_t) resource_id)->constraint);
 }
 
 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_Cas01_t)action)->variable)
+    lmm_variable_free(maxmin_system, ((surf_action_cpu_Cas01_t)action)->variable);
   xbt_free(action);
 
   return;
@@ -143,13 +127,19 @@ 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_Cas01_t)action)->variable) {
+      lmm_variable_disable(maxmin_system, ((surf_action_cpu_Cas01_t)action)->variable);
+      ((surf_action_cpu_Cas01_t)action)->variable = NULL;
+    }
+
   surf_action_change_state(action, state);
   return;
 }
 
 static double share_resources(double now)
 {
-  s_surf_action_cpu_t action;
+  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));
@@ -157,19 +147,18 @@ static double share_resources(double now)
 
 static void update_actions_state(double now, double delta)
 {
-  surf_action_cpu_t action = NULL;
-  surf_action_cpu_t next_action = NULL;
+  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;
   xbt_swag_t failed_actions =
       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; */
+      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();
@@ -181,7 +170,7 @@ static void update_actions_state(double now, double delta)
     } else {			/* Need to check that none of the resource has failed */
       lmm_constraint_t cnst = NULL;
       int i = 0;
-      cpu_t cpu = NULL;
+      cpu_Cas01_t cpu = NULL;
 
       while ((cnst =
 	      lmm_get_cnst_from_var(maxmin_system, action->variable,
@@ -196,10 +185,6 @@ 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);
-  }
-
   return;
 }
 
@@ -207,11 +192,7 @@ static void update_resource_state(void *id,
 				  tmgr_trace_event_t event_type,
 				  double value)
 {
-  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); */
+  cpu_Cas01_t cpu = id;
 
   if (event_type == cpu->power_event) {
     cpu->power_current = value;
@@ -232,10 +213,10 @@ static void update_resource_state(void *id,
 
 static surf_action_t execute(void *cpu, double size)
 {
-  surf_action_cpu_t action = NULL;
-  cpu_t CPU = cpu;
+  surf_action_cpu_Cas01_t action = NULL;
+  cpu_Cas01_t CPU = cpu;
 
-  action = xbt_new0(s_surf_action_cpu_t, 1);
+  action = xbt_new0(s_surf_action_cpu_Cas01_t, 1);
 
   action->generic_action.cost = size;
   action->generic_action.remains = size;
@@ -254,7 +235,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;
@@ -262,9 +243,9 @@ static surf_action_t execute(void *cpu, double size)
 
 static surf_action_t action_sleep(void *cpu, double duration)
 {
-  surf_action_cpu_t action = NULL;
+  surf_action_cpu_Cas01_t action = NULL;
 
-  action = (surf_action_cpu_t) execute(cpu, 1.0);
+  action = (surf_action_cpu_Cas01_t) execute(cpu, 1.0);
   action->generic_action.max_duration = duration;
   lmm_update_variable_weight(maxmin_system, action->variable, 0.0);
 
@@ -274,23 +255,23 @@ static surf_action_t action_sleep(void *cpu, double duration)
 static void action_suspend(surf_action_t action)
 {
   lmm_update_variable_weight(maxmin_system,
-			     ((surf_action_cpu_t) action)->variable, 0.0);
+			     ((surf_action_cpu_Cas01_t) action)->variable, 0.0);
 }
 
 static void action_resume(surf_action_t action)
 {
   lmm_update_variable_weight(maxmin_system,
-			     ((surf_action_cpu_t) action)->variable, 1.0);
+			     ((surf_action_cpu_Cas01_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);
+  return (lmm_get_variable_weight(((surf_action_cpu_Cas01_t) action)->variable) == 0.0);
 }
 
 static e_surf_cpu_state_t get_state(void *cpu)
 {
-  return ((cpu_t) cpu)->state_current;
+  return ((cpu_Cas01_t) cpu)->state_current;
 }
 
 static void finalize(void)
@@ -352,11 +333,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;
 
@@ -366,7 +348,7 @@ static void surf_cpu_resource_init_internal(void)
 }
 
 /*********************************************************************/
-/* Basic sharing model for CPU: that is all this started... ;)       */
+/* Basic sharing model for CPU: that is where all this started... ;) */
 /*********************************************************************/
 /* @InProceedings{casanova01simgrid, */
 /*   author =       "H. Casanova", */