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

diff --git a/src/surf/cpu.c b/src/surf/cpu.c
index f3d7fe4411..240ee5352c 100644
--- a/src/surf/cpu.c
+++ b/src/surf/cpu.c
@@ -7,7 +7,7 @@
 
 #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;
@@ -60,16 +60,17 @@ static void parse_cpu(void)
   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);
+  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);
 
-  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_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);
 
   cpu_new(name, power_scale, power_initial, power_trace, state_initial,
 	  state_trace);
@@ -78,7 +79,7 @@ static void parse_cpu(void)
 static void parse_file(const char *file)
 {
   surf_parse_reset_parser();
-  ETag_cpu_fun=parse_cpu;
+  ETag_surfxml_cpu_fun=parse_cpu;
   surf_parse_open(file);
   xbt_assert1((!surf_parse()),"Parse error in %s",file);
   surf_parse_close();
@@ -126,7 +127,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,
@@ -162,10 +163,10 @@ static void update_actions_state(double now, double delta)
   */
 
   xbt_swag_foreach_safe(action, next_action, running_actions) {
-    surf_double_update(&(action->generic_action.remains),
+    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);
+      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();
@@ -223,6 +224,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;
@@ -247,7 +249,7 @@ static surf_action_t execute(void *cpu, double size)
 				      action->generic_action.priority, -1.0, 1);
   lmm_expand(maxmin_system, CPU->constraint, action->variable,
 	     1.0);
-
+  XBT_OUT;
   return (surf_action_t) action;
 }
 
@@ -255,24 +257,29 @@ 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);
-
+  XBT_OUT;
   return (surf_action_t) action;
 }
 
 static void action_suspend(surf_action_t action)
 {
+  XBT_IN1("(%p)",action);
   lmm_update_variable_weight(maxmin_system,
 			     ((surf_action_cpu_Cas01_t) action)->variable, 0.0);
+  XBT_OUT;
 }
 
 static void action_resume(surf_action_t action)
 {
+  XBT_IN1("(%p)",action);
   lmm_update_variable_weight(maxmin_system,
 			     ((surf_action_cpu_Cas01_t) action)->variable, 
 			     action->priority);
+  XBT_OUT;
 }
 
 static int action_is_suspended(surf_action_t action)
@@ -282,12 +289,16 @@ static int action_is_suspended(surf_action_t action)
 
 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)
@@ -300,6 +311,12 @@ static double get_speed(void *cpu, double load)
   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)
 {
   xbt_dict_free(&cpu_set);
@@ -343,6 +360,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;
@@ -370,6 +391,7 @@ static void surf_cpu_resource_init_internal(void)
 
   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();