X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a2102287f9953ee825e0fce70d3aaa7a2e851493..1fccedd82c75d10afbde45a5204708a09a4b5ac8:/src/surf/cpu.c

diff --git a/src/surf/cpu.c b/src/surf/cpu.c
index f3d7fe4411..eb6ca0520d 100644
--- a/src/surf/cpu.c
+++ b/src/surf/cpu.c
@@ -7,31 +7,33 @@
 
 #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;
+surf_cpu_model_t surf_cpu_model = NULL;
+lmm_system_t cpu_maxmin_system = NULL;
 
-xbt_dict_t cpu_set = NULL;
+xbt_dict_t cpu_set;
 
 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,
+			   xbt_dict_t cpu_properties)
 {
   cpu_Cas01_t cpu = xbt_new0(s_cpu_Cas01_t, 1);
 
-  cpu->resource = (surf_resource_t) surf_cpu_resource;
-  cpu->name = name;
+  cpu->model = (surf_model_t) surf_cpu_model;
+  cpu->name = xbt_strdup(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,44 +45,55 @@ 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);
 
+  /*add the property set*/
+  cpu->properties = cpu_properties;
+
+  current_property_set = cpu_properties;
+
   xbt_dict_set(cpu_set, name, cpu, cpu_free);
 
   return cpu;
 }
 
-static void parse_cpu(void)
+
+static void parse_cpu_init(void)
 {
-  char *name = 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(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_get_double(&power_scale, A_surfxml_host_power);
+  surf_parse_get_double(&power_initial, A_surfxml_host_availability);
+  surf_parse_get_trace(&power_trace, A_surfxml_host_availability_file);
 
-  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);
+  xbt_assert0((A_surfxml_host_state == A_surfxml_host_state_ON) ||
+	      (A_surfxml_host_state == A_surfxml_host_state_OFF),
+	      "Invalid state");
+  if (A_surfxml_host_state == A_surfxml_host_state_ON)
+    state_initial = SURF_CPU_ON;
+  if (A_surfxml_host_state == A_surfxml_host_state_OFF)
+    state_initial = SURF_CPU_OFF;
+  surf_parse_get_trace(&state_trace, A_surfxml_host_state_file); 
+
+  current_property_set = xbt_dict_new();
+  cpu_new(A_surfxml_host_id, power_scale, power_initial, power_trace, state_initial,
+	  state_trace, /*add the properties*/ current_property_set);
 
-  cpu_new(name, power_scale, power_initial, power_trace, state_initial,
-	  state_trace);
 }
 
 static void parse_file(const char *file)
 {
   surf_parse_reset_parser();
-  ETag_cpu_fun=parse_cpu;
+  surfxml_add_callback(STag_surfxml_host_cb_list, parse_cpu_init);
+  surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties);
+
   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();
 }
 
@@ -96,17 +109,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;
   }
@@ -126,7 +140,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,
@@ -134,7 +148,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; */
 /*     } */
 
@@ -145,9 +159,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->
+  return generic_maxmin_share_resources(surf_cpu_model->common_public->
 					states.running_action_set,
-					xbt_swag_offset(action, variable));
+					xbt_swag_offset(action, variable),
+					cpu_maxmin_system, lmm_solve);
 }
 
 static void update_actions_state(double now, double delta)
@@ -155,32 +170,32 @@ static void update_actions_state(double now, double delta)
   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;
+      surf_cpu_model->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_model->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) &&
 	       (action->generic_action.max_duration <= 0)) {
       action->generic_action.finish = surf_get_clock();
       action_change_state((surf_action_t) action, SURF_ACTION_DONE);
-    } else {			/* Need to check that none of the resource has failed */
+    } else {			/* Need to check that none of the model has failed */
       lmm_constraint_t cnst = NULL;
       int i = 0;
       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) {
@@ -203,7 +218,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)
@@ -223,6 +238,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;
@@ -232,22 +248,24 @@ static surf_action_t execute(void *cpu, double size)
   action->generic_action.max_duration = NO_MAX_DURATION;
   action->generic_action.start = surf_get_clock();
   action->generic_action.finish = -1.0;
-  action->generic_action.resource_type =
-      (surf_resource_t) surf_cpu_resource;
+  action->generic_action.model_type =
+      (surf_model_t) surf_cpu_model;
+  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 =
-	surf_cpu_resource->common_public->states.running_action_set;
+	surf_cpu_model->common_public->states.running_action_set;
   else
     action->generic_action.state_set =
-	surf_cpu_resource->common_public->states.failed_action_set;
+	surf_cpu_model->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;
 }
 
@@ -255,39 +273,58 @@ 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;
+  lmm_update_variable_weight(cpu_maxmin_system, ((surf_action_cpu_Cas01_t) action)->variable, priority);
+
+  XBT_OUT;
 }
 
 static e_surf_cpu_state_t get_state(void *cpu)
@@ -297,83 +334,102 @@ 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 xbt_dict_t get_properties(void *cpu)
+{
+ return ((cpu_Cas01_t) cpu)->properties;
 }
 
 static void finalize(void)
 {
   xbt_dict_free(&cpu_set);
-  xbt_swag_free(surf_cpu_resource->common_public->states.ready_action_set);
-  xbt_swag_free(surf_cpu_resource->common_public->states.
+  xbt_swag_free(surf_cpu_model->common_public->states.ready_action_set);
+  xbt_swag_free(surf_cpu_model->common_public->states.
 		running_action_set);
-  xbt_swag_free(surf_cpu_resource->common_public->states.
+  xbt_swag_free(surf_cpu_model->common_public->states.
 		failed_action_set);
-  xbt_swag_free(surf_cpu_resource->common_public->states.done_action_set);
-  free(surf_cpu_resource->common_public);
-  free(surf_cpu_resource->common_private);
-  free(surf_cpu_resource->extension_public);
+  xbt_swag_free(surf_cpu_model->common_public->states.done_action_set);
+  free(surf_cpu_model->common_public);
+  free(surf_cpu_model->common_private);
+  free(surf_cpu_model->extension_public);
 
-  free(surf_cpu_resource);
-  surf_cpu_resource = NULL;
+  free(surf_cpu_model);
+  surf_cpu_model = NULL;
 }
 
-static void surf_cpu_resource_init_internal(void)
+static void surf_cpu_model_init_internal(void)
 {
   s_surf_action_t action;
 
-  surf_cpu_resource = xbt_new0(s_surf_cpu_resource_t, 1);
+  surf_cpu_model = xbt_new0(s_surf_cpu_model_t, 1);
 
-  surf_cpu_resource->common_private =
-      xbt_new0(s_surf_resource_private_t, 1);
-  surf_cpu_resource->common_public = xbt_new0(s_surf_resource_public_t, 1);
+  surf_cpu_model->common_private =
+      xbt_new0(s_surf_model_private_t, 1);
+  surf_cpu_model->common_public = xbt_new0(s_surf_model_public_t, 1);
 
-  surf_cpu_resource->extension_public =
-      xbt_new0(s_surf_cpu_resource_extension_public_t, 1);
+  surf_cpu_model->extension_public =
+      xbt_new0(s_surf_cpu_model_extension_public_t, 1);
 
-  surf_cpu_resource->common_public->states.ready_action_set =
+  surf_cpu_model->common_public->states.ready_action_set =
       xbt_swag_new(xbt_swag_offset(action, state_hookup));
-  surf_cpu_resource->common_public->states.running_action_set =
+  surf_cpu_model->common_public->states.running_action_set =
       xbt_swag_new(xbt_swag_offset(action, state_hookup));
-  surf_cpu_resource->common_public->states.failed_action_set =
+  surf_cpu_model->common_public->states.failed_action_set =
       xbt_swag_new(xbt_swag_offset(action, state_hookup));
-  surf_cpu_resource->common_public->states.done_action_set =
+  surf_cpu_model->common_public->states.done_action_set =
       xbt_swag_new(xbt_swag_offset(action, state_hookup));
 
-  surf_cpu_resource->common_public->name_service = name_service;
-  surf_cpu_resource->common_public->get_resource_name = get_resource_name;
-  surf_cpu_resource->common_public->action_get_state =
+  surf_cpu_model->common_public->name_service = name_service;
+  surf_cpu_model->common_public->get_resource_name = get_resource_name;
+  surf_cpu_model->common_public->action_get_state =
       surf_action_get_state;
-  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;
-  surf_cpu_resource->common_public->action_recycle = action_recycle;
-  surf_cpu_resource->common_public->action_change_state =
+  surf_cpu_model->common_public->action_get_start_time =
+      surf_action_get_start_time;
+  surf_cpu_model->common_public->action_get_finish_time =
+      surf_action_get_finish_time;
+  surf_cpu_model->common_public->action_free = action_free;
+  surf_cpu_model->common_public->action_use = action_use;
+  surf_cpu_model->common_public->action_cancel = action_cancel;
+  surf_cpu_model->common_public->action_recycle = action_recycle;
+  surf_cpu_model->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_model->common_public->action_set_data = surf_action_set_data;
+  surf_cpu_model->common_public->name = "CPU";
 
-  surf_cpu_resource->common_private->resource_used = resource_used;
-  surf_cpu_resource->common_private->share_resources = share_resources;
-  surf_cpu_resource->common_private->update_actions_state =
+  surf_cpu_model->common_private->resource_used = resource_used;
+  surf_cpu_model->common_private->share_resources = share_resources;
+  surf_cpu_model->common_private->update_actions_state =
       update_actions_state;
-  surf_cpu_resource->common_private->update_resource_state =
+  surf_cpu_model->common_private->update_resource_state =
       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->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;
-
-  cpu_set = xbt_dict_new();
-
-  xbt_assert0(maxmin_system, "surf_init has to be called first!");
+  surf_cpu_model->common_private->finalize = finalize;
+
+  surf_cpu_model->common_public->suspend = action_suspend;
+  surf_cpu_model->common_public->resume = action_resume;
+  surf_cpu_model->common_public->is_suspended = action_is_suspended;
+  surf_cpu_model->common_public->set_max_duration =
+      action_set_max_duration;
+  surf_cpu_model->common_public->set_priority = action_set_priority;
+  surf_cpu_model->extension_public->execute = execute;
+  surf_cpu_model->extension_public->sleep = action_sleep;
+
+  surf_cpu_model->extension_public->get_state = get_state;
+  surf_cpu_model->extension_public->get_speed = get_speed;
+  surf_cpu_model->extension_public->get_available_speed =
+      get_available_speed;
+  /*manage the properties of the cpu*/
+  surf_cpu_model->common_public->get_cpu_properties = get_properties;
+
+  if(!cpu_set) cpu_set = xbt_dict_new();
+  if (!cpu_maxmin_system) cpu_maxmin_system = lmm_system_new();
 }
 
 /*********************************************************************/
@@ -391,11 +447,11 @@ static void surf_cpu_resource_init_internal(void)
 /*   note =         "Available at */
 /*                  \url{http://grail.sdsc.edu/papers/simgrid_ccgrid01.ps.gz}." */
 /* } */
-void surf_cpu_resource_init_Cas01(const char *filename)
+void surf_cpu_model_init_Cas01(const char *filename)
 {
-  if (surf_cpu_resource)
+  if (surf_cpu_model)
     return;
-  surf_cpu_resource_init_internal();
+  surf_cpu_model_init_internal();
   parse_file(filename);
-  xbt_dynar_push(resource_list, &surf_cpu_resource);
+  xbt_dynar_push(model_list, &surf_cpu_model);
 }