X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/693ba4212f01cdcc236bc94bfb2a0fbcbb6a3379..f4d1afaaa1e4fee55a98707443c05bdbc9abb42c:/src/surf/cpu.c

diff --git a/src/surf/cpu.c b/src/surf/cpu.c
index ecac805821..fd68353ed0 100644
--- a/src/surf/cpu.c
+++ b/src/surf/cpu.c
@@ -7,31 +7,32 @@
 
 #include "cpu_private.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(cpu, surf,
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf,
 				"Logging specific to the SURF CPU module");
 
 surf_cpu_resource_t surf_cpu_resource = NULL;
+lmm_system_t cpu_maxmin_system = NULL;
 
 xbt_dict_t cpu_set = NULL;
 
 static void cpu_free(void *cpu)
 {
-  free(((cpu_Cas01_t)cpu)->name);
+  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)
+			   double power_initial,
+			   tmgr_trace_t power_trace,
+			   e_surf_cpu_state_t state_initial,
+			   tmgr_trace_t state_trace)
 {
   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");
+  xbt_assert0(cpu->power_scale > 0, "Power has to be >0");
   cpu->power_current = power_initial;
   if (power_trace)
     cpu->power_event =
@@ -43,7 +44,7 @@ static cpu_Cas01_t cpu_new(char *name, double power_scale,
 	tmgr_history_add_trace(history, state_trace, 0.0, 0, cpu);
 
   cpu->constraint =
-      lmm_constraint_new(maxmin_system, cpu,
+      lmm_constraint_new(cpu_maxmin_system, cpu,
 			 cpu->power_current * cpu->power_scale);
 
   xbt_dict_set(cpu_set, name, cpu, cpu_free);
@@ -61,16 +62,18 @@ static void parse_cpu(void)
   tmgr_trace_t state_trace = NULL;
 
   name = xbt_strdup(A_surfxml_cpu_name);
-  surf_parse_get_double(&power_scale,A_surfxml_cpu_power);
-  surf_parse_get_double(&power_initial,A_surfxml_cpu_availability);
-  surf_parse_get_trace(&power_trace,A_surfxml_cpu_availability_file);
+  surf_parse_get_double(&power_scale, A_surfxml_cpu_power);
+  surf_parse_get_double(&power_initial, A_surfxml_cpu_availability);
+  surf_parse_get_trace(&power_trace, A_surfxml_cpu_availability_file);
 
-  xbt_assert0((A_surfxml_cpu_state==A_surfxml_cpu_state_ON)||
-	      (A_surfxml_cpu_state==A_surfxml_cpu_state_OFF),
+  xbt_assert0((A_surfxml_cpu_state == A_surfxml_cpu_state_ON) ||
+	      (A_surfxml_cpu_state == A_surfxml_cpu_state_OFF),
 	      "Invalid state");
-  if (A_surfxml_cpu_state==A_surfxml_cpu_state_ON) state_initial = SURF_CPU_ON;
-  if (A_surfxml_cpu_state==A_surfxml_cpu_state_OFF) state_initial = SURF_CPU_OFF;
-  surf_parse_get_trace(&state_trace,A_surfxml_cpu_state_file);
+  if (A_surfxml_cpu_state == A_surfxml_cpu_state_ON)
+    state_initial = SURF_CPU_ON;
+  if (A_surfxml_cpu_state == A_surfxml_cpu_state_OFF)
+    state_initial = SURF_CPU_OFF;
+  surf_parse_get_trace(&state_trace, A_surfxml_cpu_state_file);
 
   cpu_new(name, power_scale, power_initial, power_trace, state_initial,
 	  state_trace);
@@ -79,9 +82,9 @@ static void parse_cpu(void)
 static void parse_file(const char *file)
 {
   surf_parse_reset_parser();
-  ETag_surfxml_cpu_fun=parse_cpu;
+  ETag_surfxml_cpu_fun = parse_cpu;
   surf_parse_open(file);
-  xbt_assert1((!surf_parse()),"Parse error in %s",file);
+  xbt_assert1((!surf_parse()), "Parse error in %s", file);
   surf_parse_close();
 }
 
@@ -97,17 +100,18 @@ static const char *get_resource_name(void *resource_id)
 
 static int resource_used(void *resource_id)
 {
-  return lmm_constraint_used(maxmin_system,
+  return lmm_constraint_used(cpu_maxmin_system,
 			     ((cpu_Cas01_t) resource_id)->constraint);
 }
 
 static int action_free(surf_action_t action)
 {
   action->using--;
-  if(!action->using) {
+  if (!action->using) {
     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);
+    if (((surf_action_cpu_Cas01_t) action)->variable)
+      lmm_variable_free(cpu_maxmin_system,
+			((surf_action_cpu_Cas01_t) action)->variable);
     free(action);
     return 1;
   }
@@ -127,7 +131,7 @@ static void action_cancel(surf_action_t action)
 
 static void action_recycle(surf_action_t action)
 {
-  return;
+  DIE_IMPOSSIBLE;
 }
 
 static void action_change_state(surf_action_t action,
@@ -135,7 +139,7 @@ static void action_change_state(surf_action_t action,
 {
 /*   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; */
 /*     } */
 
@@ -146,9 +150,10 @@ static void action_change_state(surf_action_t action,
 static double 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_resources2(surf_cpu_resource->common_public->
+					 states.running_action_set,
+					 xbt_swag_offset(action, variable),
+					 cpu_maxmin_system, lmm_solve);
 }
 
 static void update_actions_state(double now, double delta)
@@ -158,17 +163,17 @@ static void update_actions_state(double now, double delta)
   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 failed_actions =
+     surf_cpu_resource->common_public->states.failed_action_set;
+   */
 
   xbt_swag_foreach_safe(action, next_action, running_actions) {
-    surf_double_update(&(action->generic_action.remains),
-	lmm_variable_getvalue(action->variable) * delta);
+    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);
     } else if ((action->generic_action.max_duration != NO_MAX_DURATION) &&
@@ -181,7 +186,7 @@ static void update_actions_state(double now, double delta)
       cpu_Cas01_t cpu = NULL;
 
       while ((cnst =
-	      lmm_get_cnst_from_var(maxmin_system, action->variable,
+	      lmm_get_cnst_from_var(cpu_maxmin_system, action->variable,
 				    i++))) {
 	cpu = lmm_constraint_id(cnst);
 	if (cpu->state_current == SURF_CPU_OFF) {
@@ -204,7 +209,7 @@ static void update_resource_state(void *id,
 
   if (event_type == cpu->power_event) {
     cpu->power_current = value;
-    lmm_update_constraint_bound(maxmin_system, cpu->constraint,
+    lmm_update_constraint_bound(cpu_maxmin_system, cpu->constraint,
 				cpu->power_current * cpu->power_scale);
   } else if (event_type == cpu->state_event) {
     if (value > 0)
@@ -224,6 +229,7 @@ static surf_action_t execute(void *cpu, double size)
   surf_action_cpu_Cas01_t action = NULL;
   cpu_Cas01_t CPU = cpu;
 
+  XBT_IN2("(%s,%g)", CPU->name, size);
   action = xbt_new0(s_surf_action_cpu_Cas01_t, 1);
 
   action->generic_action.using = 1;
@@ -235,6 +241,8 @@ static surf_action_t execute(void *cpu, double size)
   action->generic_action.finish = -1.0;
   action->generic_action.resource_type =
       (surf_resource_t) surf_cpu_resource;
+  action->suspended = 0;	/* Should be useless because of the 
+				   calloc but it seems to help valgrind... */
 
   if (CPU->state_current == SURF_CPU_ON)
     action->generic_action.state_set =
@@ -244,11 +252,11 @@ static surf_action_t execute(void *cpu, double size)
 	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);
-
+  action->variable = lmm_variable_new(cpu_maxmin_system, action,
+				      action->generic_action.priority,
+				      -1.0, 1);
+  lmm_expand(cpu_maxmin_system, CPU->constraint, action->variable, 1.0);
+  XBT_OUT;
   return (surf_action_t) action;
 }
 
@@ -256,39 +264,56 @@ static surf_action_t action_sleep(void *cpu, double duration)
 {
   surf_action_cpu_Cas01_t action = NULL;
 
+  XBT_IN2("(%s,%g)", ((cpu_Cas01_t) cpu)->name, duration);
   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);
-
+  action->suspended = 2;
+  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)
 {
-  lmm_update_variable_weight(maxmin_system,
-			     ((surf_action_cpu_Cas01_t) action)->variable, 0.0);
+  XBT_IN1("(%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)
 {
-  lmm_update_variable_weight(maxmin_system,
-			     ((surf_action_cpu_Cas01_t) action)->variable, 
-			     action->priority);
+  XBT_IN1("(%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)
 {
-  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)
 {
+  XBT_IN2("(%p,%g)", action, duration);
   action->max_duration = duration;
+  XBT_OUT;
 }
 
 static void action_set_priority(surf_action_t action, double priority)
 {
+  XBT_IN2("(%p,%g)", action, priority);
   action->priority = priority;
+  XBT_OUT;
 }
 
 static e_surf_cpu_state_t get_state(void *cpu)
@@ -298,7 +323,13 @@ static e_surf_cpu_state_t get_state(void *cpu)
 
 static double get_speed(void *cpu, double load)
 {
-  return load*(((cpu_Cas01_t) cpu)->power_scale);
+  return load * (((cpu_Cas01_t) cpu)->power_scale);
+}
+
+static double get_available_speed(void *cpu)
+{
+  /* number between 0 and 1 */
+  return ((cpu_Cas01_t) cpu)->power_current;
 }
 
 static void finalize(void)
@@ -344,6 +375,10 @@ static void surf_cpu_resource_init_internal(void)
   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_get_start_time =
+      surf_action_get_start_time;
+  surf_cpu_resource->common_public->action_get_finish_time =
+      surf_action_get_finish_time;
   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;
@@ -364,17 +399,21 @@ static void surf_cpu_resource_init_internal(void)
   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_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;
+  surf_cpu_resource->extension_public->get_available_speed =
+      get_available_speed;
 
   cpu_set = xbt_dict_new();
 
-  xbt_assert0(maxmin_system, "surf_init has to be called first!");
+  if (!cpu_maxmin_system)
+    cpu_maxmin_system = lmm_system_new();
 }
 
 /*********************************************************************/