X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/976ee462f4626798ebf76ca46d13f53e10e0e28d..180febe078089bb7d5e6ee141fc17115c2f8a0a1:/src/surf/cpu.c

diff --git a/src/surf/cpu.c b/src/surf/cpu.c
index 6a9f6e5883..b55c297ae5 100644
--- a/src/surf/cpu.c
+++ b/src/surf/cpu.c
@@ -1,6 +1,5 @@
-/* 	$Id$	 */
-
-/* Copyright (c) 2004 Arnaud Legrand. All rights reserved.                  */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -29,7 +28,7 @@ surf_model_t surf_cpu_model = NULL;
 lmm_system_t cpu_maxmin_system = NULL;
 
 
-static xbt_swag_t running_action_set_that_does_not_need_being_checked = NULL;
+static xbt_swag_t cpu_running_action_set_that_does_not_need_being_checked = NULL;
 
 static cpu_Cas01_t cpu_new(char *name, double power_peak,
                            double power_scale,
@@ -62,6 +61,9 @@ static cpu_Cas01_t cpu_new(char *name, double power_peak,
 
   xbt_dict_set(surf_model_resource_set(surf_cpu_model), name, cpu,
                surf_resource_free);
+#ifdef HAVE_TRACING
+  TRACE_surf_host_declaration (name, cpu->power_scale * cpu->power_peak);
+#endif
 
   return cpu;
 }
@@ -128,20 +130,20 @@ static void add_traces_cpu(void)
   }
 }
 
-static void define_callbacks(const char *file)
+static void cpu_define_callbacks(const char *file)
 {
   surf_parse_reset_parser();
   surfxml_add_callback(STag_surfxml_host_cb_list, parse_cpu_init);
   surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_traces_cpu);
 }
 
-static int resource_used(void *resource_id)
+static int cpu_resource_used(void *resource_id)
 {
   return lmm_constraint_used(cpu_maxmin_system,
                              ((cpu_Cas01_t) resource_id)->constraint);
 }
 
-static int action_unref(surf_action_t action)
+static int cpu_action_unref(surf_action_t action)
 {
   action->refcount--;
   if (!action->refcount) {
@@ -155,7 +157,7 @@ static int action_unref(surf_action_t action)
   return 0;
 }
 
-static void action_cancel(surf_action_t action)
+static void cpu_action_cancel(surf_action_t action)
 {
   surf_action_state_set(action, SURF_ACTION_FAILED);
   return;
@@ -174,7 +176,7 @@ static void cpu_action_state_set(surf_action_t action,
   return;
 }
 
-static double share_resources(double now)
+static double cpu_share_resources(double now)
 {
   s_surf_action_cpu_Cas01_t action;
   return generic_maxmin_share_resources(surf_cpu_model->
@@ -183,13 +185,19 @@ static double share_resources(double now)
                                         cpu_maxmin_system, lmm_solve);
 }
 
-static void update_actions_state(double now, double delta)
+static void cpu_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_model->states.running_action_set;
 
   xbt_swag_foreach_safe(action, next_action, running_actions) {
+#ifdef HAVE_TRACING
+    cpu_Cas01_t x = lmm_constraint_id(lmm_get_cnst_from_var (cpu_maxmin_system, action->variable, 0));
+
+    TRACE_surf_host_set_utilization (x->generic_resource.name,
+              action->generic_action.data, lmm_variable_getvalue(action->variable), now-delta, delta);
+#endif
     double_update(&(action->generic_action.remains),
                   lmm_variable_getvalue(action->variable) * delta);
     if (action->generic_action.max_duration != NO_MAX_DURATION)
@@ -208,7 +216,7 @@ static void update_actions_state(double now, double delta)
   return;
 }
 
-static void update_resource_state(void *id,
+static void cpu_update_resource_state(void *id,
                                   tmgr_trace_event_t event_type,
                                   double value, double date)
 {
@@ -218,6 +226,9 @@ static void update_resource_state(void *id,
     cpu->power_scale = value;
     lmm_update_constraint_bound(cpu_maxmin_system, cpu->constraint,
                                 cpu->power_scale * cpu->power_peak);
+#ifdef HAVE_TRACING
+    TRACE_surf_host_set_power (date, cpu->generic_resource.name, cpu->power_scale * cpu->power_peak);
+#endif
     if (tmgr_trace_event_free(event_type))
       cpu->power_event = NULL;
   } else if (event_type == cpu->state_event) {
@@ -251,7 +262,7 @@ static void update_resource_state(void *id,
   return;
 }
 
-static surf_action_t execute(void *cpu, double size)
+static surf_action_t cpu_execute(void *cpu, double size)
 {
   surf_action_cpu_Cas01_t action = NULL;
   cpu_Cas01_t CPU = cpu;
@@ -272,7 +283,7 @@ static surf_action_t execute(void *cpu, double size)
   return (surf_action_t) action;
 }
 
-static surf_action_t action_sleep(void *cpu, double duration)
+static surf_action_t cpu_action_sleep(void *cpu, double duration)
 {
   surf_action_cpu_Cas01_t action = NULL;
 
@@ -280,7 +291,7 @@ static surf_action_t action_sleep(void *cpu, double duration)
     duration = MAX(duration, MAXMIN_PRECISION);
 
   XBT_IN2("(%s,%g)", surf_resource_name(cpu), duration);
-  action = (surf_action_cpu_Cas01_t) execute(cpu, 1.0);
+  action = (surf_action_cpu_Cas01_t) cpu_execute(cpu, 1.0);
   action->generic_action.max_duration = duration;
   action->suspended = 2;
   if (duration == NO_MAX_DURATION) {
@@ -288,7 +299,7 @@ static surf_action_t action_sleep(void *cpu, double duration)
        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;
+      cpu_running_action_set_that_does_not_need_being_checked;
     xbt_swag_insert(action, ((surf_action_t) action)->state_set);
   }
 
@@ -297,7 +308,7 @@ static surf_action_t action_sleep(void *cpu, double duration)
   return (surf_action_t) action;
 }
 
-static void action_suspend(surf_action_t action)
+static void cpu_action_suspend(surf_action_t action)
 {
   XBT_IN1("(%p)", action);
   if (((surf_action_cpu_Cas01_t) action)->suspended != 2) {
@@ -309,7 +320,7 @@ static void action_suspend(surf_action_t action)
   XBT_OUT;
 }
 
-static void action_resume(surf_action_t action)
+static void cpu_action_resume(surf_action_t action)
 {
   XBT_IN1("(%p)", action);
   if (((surf_action_cpu_Cas01_t) action)->suspended != 2) {
@@ -321,19 +332,19 @@ static void action_resume(surf_action_t action)
   XBT_OUT;
 }
 
-static int action_is_suspended(surf_action_t action)
+static int cpu_action_is_suspended(surf_action_t action)
 {
   return (((surf_action_cpu_Cas01_t) action)->suspended == 1);
 }
 
-static void action_set_max_duration(surf_action_t action, double duration)
+static void cpu_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)
+static void cpu_action_set_priority(surf_action_t action, double priority)
 {
   XBT_IN2("(%p,%g)", action, priority);
   action->priority = priority;
@@ -344,30 +355,41 @@ static void action_set_priority(surf_action_t action, double priority)
   XBT_OUT;
 }
 
-static double action_get_remains(surf_action_t action)
+static double cpu_action_get_remains(surf_action_t action)
 {
   XBT_IN1("(%p)", action);
   return action->remains;
   XBT_OUT;
 }
 
-static e_surf_resource_state_t get_state(void *cpu)
+static e_surf_resource_state_t cpu_get_state(void *cpu)
 {
   return ((cpu_Cas01_t) cpu)->state_current;
 }
 
-static double get_speed(void *cpu, double load)
+static double cpu_get_speed(void *cpu, double load)
 {
   return load * (((cpu_Cas01_t) cpu)->power_peak);
 }
 
-static double get_available_speed(void *cpu)
+static double cpu_get_available_speed(void *cpu)
 {
   /* number between 0 and 1 */
   return ((cpu_Cas01_t) cpu)->power_scale;
 }
 
-static void finalize(void)
+static void cpu_create_resource(char *name, double power_peak,
+        double power_scale,
+        tmgr_trace_t power_trace,
+        e_surf_resource_state_t state_initial,
+        tmgr_trace_t state_trace,
+        xbt_dict_t cpu_properties)
+{
+	cpu_new(name,power_peak,power_scale,power_trace,
+					  state_initial,state_trace,cpu_properties);
+}
+
+static void cpu_finalize(void)
 {
   lmm_system_free(cpu_maxmin_system);
   cpu_maxmin_system = NULL;
@@ -375,8 +397,8 @@ static void finalize(void)
   surf_model_exit(surf_cpu_model);
   surf_cpu_model = NULL;
 
-  xbt_swag_free(running_action_set_that_does_not_need_being_checked);
-  running_action_set_that_does_not_need_being_checked = NULL;
+  xbt_swag_free(cpu_running_action_set_that_does_not_need_being_checked);
+  cpu_running_action_set_that_does_not_need_being_checked = NULL;
 }
 
 static void surf_cpu_model_init_internal(void)
@@ -385,35 +407,37 @@ static void surf_cpu_model_init_internal(void)
 
   surf_cpu_model = surf_model_init();
 
-  running_action_set_that_does_not_need_being_checked =
+  cpu_running_action_set_that_does_not_need_being_checked =
     xbt_swag_new(xbt_swag_offset(action, state_hookup));
 
   surf_cpu_model->name = "CPU";
 
-  surf_cpu_model->action_unref = action_unref;
-  surf_cpu_model->action_cancel = action_cancel;
+  surf_cpu_model->action_unref = cpu_action_unref;
+  surf_cpu_model->action_cancel = cpu_action_cancel;
   surf_cpu_model->action_state_set = cpu_action_state_set;
 
-  surf_cpu_model->model_private->resource_used = resource_used;
-  surf_cpu_model->model_private->share_resources = share_resources;
-  surf_cpu_model->model_private->update_actions_state = update_actions_state;
+  surf_cpu_model->model_private->resource_used = cpu_resource_used;
+  surf_cpu_model->model_private->share_resources = cpu_share_resources;
+  surf_cpu_model->model_private->update_actions_state = cpu_update_actions_state;
   surf_cpu_model->model_private->update_resource_state =
-    update_resource_state;
-  surf_cpu_model->model_private->finalize = finalize;
+    cpu_update_resource_state;
+  surf_cpu_model->model_private->finalize = cpu_finalize;
 
-  surf_cpu_model->suspend = action_suspend;
-  surf_cpu_model->resume = action_resume;
-  surf_cpu_model->is_suspended = action_is_suspended;
-  surf_cpu_model->set_max_duration = action_set_max_duration;
-  surf_cpu_model->set_priority = action_set_priority;
-  surf_cpu_model->get_remains = action_get_remains;
+  surf_cpu_model->suspend = cpu_action_suspend;
+  surf_cpu_model->resume = cpu_action_resume;
+  surf_cpu_model->is_suspended = cpu_action_is_suspended;
+  surf_cpu_model->set_max_duration = cpu_action_set_max_duration;
+  surf_cpu_model->set_priority = cpu_action_set_priority;
+  surf_cpu_model->get_remains = cpu_action_get_remains;
 
-  surf_cpu_model->extension.cpu.execute = execute;
-  surf_cpu_model->extension.cpu.sleep = action_sleep;
+  surf_cpu_model->extension.cpu.execute = cpu_execute;
+  surf_cpu_model->extension.cpu.sleep = cpu_action_sleep;
 
-  surf_cpu_model->extension.cpu.get_state = get_state;
-  surf_cpu_model->extension.cpu.get_speed = get_speed;
-  surf_cpu_model->extension.cpu.get_available_speed = get_available_speed;
+  surf_cpu_model->extension.cpu.get_state = cpu_get_state;
+  surf_cpu_model->extension.cpu.get_speed = cpu_get_speed;
+  surf_cpu_model->extension.cpu.get_available_speed = cpu_get_available_speed;
+  surf_cpu_model->extension.cpu.create_resource = cpu_create_resource;
+  surf_cpu_model->extension.cpu.add_traces = add_traces_cpu;
 
   if (!cpu_maxmin_system)
     cpu_maxmin_system = lmm_system_new();
@@ -439,6 +463,6 @@ void surf_cpu_model_init_Cas01(const char *filename)
   if (surf_cpu_model)
     return;
   surf_cpu_model_init_internal();
-  define_callbacks(filename);
+  cpu_define_callbacks(filename);
   xbt_dynar_push(model_list, &surf_cpu_model);
 }