X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/504b4d20dd2db9ea1eaa9c4b390b2a412d7c9779..f4ae32c676421a6cd5c076b273dd7a07f2695957:/src/surf/cpu.c

diff --git a/src/surf/cpu.c b/src/surf/cpu.c
index 1f010285c1..3814631308 100644
--- a/src/surf/cpu.c
+++ b/src/surf/cpu.c
@@ -13,11 +13,13 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf,
 surf_cpu_model_t surf_cpu_model = NULL;
 lmm_system_t cpu_maxmin_system = NULL;
 
-xbt_dict_t cpu_set;
+xbt_dict_t cpu_set = NULL;
+static xbt_swag_t running_action_set_that_does_not_need_being_checked = NULL;
 
 static void cpu_free(void *cpu)
 {
   free(((cpu_Cas01_t) cpu)->name);
+  xbt_dict_free(&(((cpu_Cas01_t)cpu)->properties));
   free(cpu);
 }
 
@@ -29,7 +31,9 @@ static cpu_Cas01_t cpu_new(char *name, double power_scale,
 			   xbt_dict_t cpu_properties)
 {
   cpu_Cas01_t cpu = xbt_new0(s_cpu_Cas01_t, 1);
-
+  xbt_assert1(!xbt_dict_get_or_null(cpu_set, name),
+	      "Host '%s' declared several times in the platform file",name);
+   
   cpu->model = (surf_model_t) surf_cpu_model;
   cpu->name = name;
   cpu->power_scale = power_scale;
@@ -67,7 +71,7 @@ static void parse_cpu_init(void)
   e_surf_cpu_state_t state_initial = SURF_CPU_OFF;
   tmgr_trace_t state_trace = NULL;
 
-  surf_parse_get_double(&power_scale, A_surfxml_host_power);
+  power_scale = get_cpu_power(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);
 
@@ -81,20 +85,47 @@ static void parse_cpu_init(void)
   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(xbt_strdup(A_surfxml_host_id), power_scale, power_initial, power_trace, state_initial,
+	  state_trace,  current_property_set);
+
+}
 
+static void add_traces_cpu(void) {
+   xbt_dict_cursor_t cursor=NULL;
+   char *trace_name,*elm;
+
+   static int called = 0;
+   
+   if (called) return;
+   called = 1;
+
+   
+   /* connect all traces relative to hosts */
+   xbt_dict_foreach(trace_connect_list_host_avail, cursor, trace_name, elm) {
+      tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
+      cpu_Cas01_t host = xbt_dict_get_or_null(cpu_set, elm);
+      
+      xbt_assert1(host, "Host %s undefined", elm);
+      xbt_assert1(trace, "Trace %s undefined", trace_name);
+      
+      host->state_event = tmgr_history_add_trace(history, trace, 0.0, 0, host); 
+   }
+
+   xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) {
+      tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
+      cpu_Cas01_t host = xbt_dict_get_or_null(cpu_set, elm);
+      
+      xbt_assert1(host, "Host %s undefined", elm);
+      xbt_assert1(trace, "Trace %s undefined", trace_name);
+      
+      host->power_event = tmgr_history_add_trace(history, trace, 0.0, 0, host); 
+   }
 }
 
-static void parse_file(const char *file)
+static void define_callbacks(const char *file)
 {
   surf_parse_reset_parser();
   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);
-  surf_parse_close();
 }
 
 static void *name_service(const char *name)
@@ -115,8 +146,8 @@ static int resource_used(void *resource_id)
 
 static int action_free(surf_action_t action)
 {
-  action->using--;
-  if (!action->using) {
+  action->refcount --;
+  if (!action->refcount ) {
     xbt_swag_remove(action, action->state_set);
     if (((surf_action_cpu_Cas01_t) action)->variable)
       lmm_variable_free(cpu_maxmin_system,
@@ -129,7 +160,7 @@ static int action_free(surf_action_t action)
 
 static void action_use(surf_action_t action)
 {
-  action->using++;
+  action->refcount ++;
 }
 
 static void action_cancel(surf_action_t action)
@@ -189,21 +220,6 @@ static void update_actions_state(double now, double delta)
 	       (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 model has failed */
-      lmm_constraint_t cnst = NULL;
-      int i = 0;
-      cpu_Cas01_t cpu = NULL;
-
-      while ((cnst =
-	      lmm_get_cnst_from_var(cpu_maxmin_system, action->variable,
-				    i++))) {
-	cpu = lmm_constraint_id(cnst);
-	if (cpu->state_current == SURF_CPU_OFF) {
-	  action->generic_action.finish = surf_get_clock();
-	  action_change_state((surf_action_t) action, SURF_ACTION_FAILED);
-	  break;
-	}
-      }
     }
   }
 
@@ -212,7 +228,7 @@ static void update_actions_state(double now, double delta)
 
 static void update_resource_state(void *id,
 				  tmgr_trace_event_t event_type,
-				  double value)
+				  double value, double date)
 {
   cpu_Cas01_t cpu = id;
 
@@ -223,8 +239,24 @@ static void update_resource_state(void *id,
   } else if (event_type == cpu->state_event) {
     if (value > 0)
       cpu->state_current = SURF_CPU_ON;
-    else
+    else {
+      lmm_constraint_t cnst = cpu->constraint;
+      lmm_variable_t var = NULL;
+      lmm_element_t elem = NULL;
+
       cpu->state_current = SURF_CPU_OFF;
+
+      while((var = lmm_get_var_from_cnst(cpu_maxmin_system,cnst,&elem))) {
+	surf_action_t action = lmm_variable_id(var) ;
+
+	if(surf_action_get_state(action)==SURF_ACTION_RUNNING ||
+	   surf_action_get_state(action)==SURF_ACTION_READY || 
+	   surf_action_get_state(action)==SURF_ACTION_NOT_IN_THE_SYSTEM) {
+	  action->finish = date;
+	  action_change_state( action, SURF_ACTION_FAILED);
+	}
+      }
+    }
   } else {
     CRITICAL0("Unknown event ! \n");
     xbt_abort();
@@ -241,7 +273,7 @@ static surf_action_t execute(void *cpu, double size)
   XBT_IN2("(%s,%g)", CPU->name, size);
   action = xbt_new0(s_surf_action_cpu_Cas01_t, 1);
 
-  action->generic_action.using = 1;
+  action->generic_action.refcount  = 1;
   action->generic_action.cost = size;
   action->generic_action.remains = size;
   action->generic_action.priority = 1.0;
@@ -259,6 +291,7 @@ static surf_action_t execute(void *cpu, double size)
   else
     action->generic_action.state_set =
 	surf_cpu_model->common_public->states.failed_action_set;
+
   xbt_swag_insert(action, action->generic_action.state_set);
 
   action->variable = lmm_variable_new(cpu_maxmin_system, action,
@@ -273,10 +306,21 @@ static surf_action_t action_sleep(void *cpu, double duration)
 {
   surf_action_cpu_Cas01_t action = NULL;
 
+  if (duration>0)
+     duration=MAX(duration,MAXMIN_PRECISION);
+
   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;
   action->suspended = 2;
+  if(duration == NO_MAX_DURATION) {
+    /* Move to the *end* of the corresponding action set. This convention
+       is used to speed up update_resource_state  */
+    xbt_swag_remove(action, ((surf_action_t)action)->state_set);
+    ((surf_action_t)action)->state_set =running_action_set_that_does_not_need_being_checked;
+    xbt_swag_insert(action, ((surf_action_t)action)->state_set);
+  }
+
   lmm_update_variable_weight(cpu_maxmin_system, action->variable, 0.0);
   XBT_OUT;
   return (surf_action_t) action;
@@ -351,12 +395,16 @@ static xbt_dict_t get_properties(void *cpu)
 static void finalize(void)
 {
   xbt_dict_free(&cpu_set);
+  lmm_system_free(cpu_maxmin_system);
+  cpu_maxmin_system = NULL;
   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_model->common_public->states.
 		failed_action_set);
   xbt_swag_free(surf_cpu_model->common_public->states.done_action_set);
+  xbt_swag_free(running_action_set_that_does_not_need_being_checked);
+  running_action_set_that_does_not_need_being_checked = NULL;
   free(surf_cpu_model->common_public);
   free(surf_cpu_model->common_private);
   free(surf_cpu_model->extension_public);
@@ -387,6 +435,9 @@ static void surf_cpu_model_init_internal(void)
   surf_cpu_model->common_public->states.done_action_set =
       xbt_swag_new(xbt_swag_offset(action, state_hookup));
 
+  running_action_set_that_does_not_need_being_checked =
+      xbt_swag_new(xbt_swag_offset(action, state_hookup));
+
   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 =
@@ -426,7 +477,7 @@ static void surf_cpu_model_init_internal(void)
   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;
+  surf_cpu_model->common_public->get_properties = get_properties;
 
   if(!cpu_set) cpu_set = xbt_dict_new();
   if (!cpu_maxmin_system) cpu_maxmin_system = lmm_system_new();
@@ -452,6 +503,6 @@ void surf_cpu_model_init_Cas01(const char *filename)
   if (surf_cpu_model)
     return;
   surf_cpu_model_init_internal();
-  parse_file(filename);
+  define_callbacks(filename);
   xbt_dynar_push(model_list, &surf_cpu_model);
 }