X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6760cb07d6b57be16928d95339d71e57c4e24f36..06719c673be736decee093e3f4750580c402552c:/src/surf/cpu_im.c

diff --git a/src/surf/cpu_im.c b/src/surf/cpu_im.c
index 694b8e82a5..f1b2b8cf34 100644
--- a/src/surf/cpu_im.c
+++ b/src/surf/cpu_im.c
@@ -52,12 +52,14 @@ static cpu_Cas01_im_t cpu_im_new(char *name, double power_peak,
                               tmgr_trace_t state_trace,
                               xbt_dict_t cpu_properties)
 {
-#ifdef HAVE_TRACING
+  cpu_Cas01_im_t cpu = NULL;
+  s_surf_action_cpu_Cas01_im_t action;
+  cpu = xbt_new0(s_cpu_Cas01_im_t, 1);
+
+  #ifdef HAVE_TRACING
   TRACE_surf_host_declaration (name, power_scale * power_peak);
-#endif
+  #endif
 
-  cpu_Cas01_im_t cpu = xbt_new0(s_cpu_Cas01_im_t, 1);
-  s_surf_action_cpu_Cas01_im_t action;
   xbt_assert1(!surf_model_resource_by_name(surf_cpu_model, name),
               "Host '%s' declared several times in the platform file", name);
   cpu->generic_resource.model = surf_cpu_model;
@@ -150,6 +152,7 @@ static void cpu_im_add_traces_cpu(void)
 
 static void cpu_im_define_callbacks(const char *file)
 {
+
   surf_parse_reset_parser();
   surfxml_add_callback(STag_surfxml_host_cb_list, parse_cpu_im_init);
   surfxml_add_callback(ETag_surfxml_platform_cb_list, &cpu_im_add_traces_cpu);
@@ -433,6 +436,7 @@ static void cpu_im_action_suspend(surf_action_t action)
 
 static void cpu_im_action_resume(surf_action_t action)
 {
+
   XBT_IN1("(%p)", action);
   if (((surf_action_lmm_t) action)->suspended != 2) {
     lmm_update_variable_weight(cpu_im_maxmin_system,
@@ -592,3 +596,28 @@ void surf_cpu_model_init_Cas01_im(const char *filename)
   cpu_im_define_callbacks(filename);
   xbt_dynar_push(model_list, &surf_cpu_model);
 }
+
+void surf_cpu_im_init_bypass(char* id,double power)
+{
+	/* FIXME
+	 * the hard coded value must be passed as argument of the lua function
+	 * depending on the number of arguments the user pass to function
+	 * we'd affect it to the corresponding value
+	 */
+	double power_peak = 0.0;
+	double power_scale = 0.0;
+	tmgr_trace_t power_trace = NULL;
+	//FIXME : hard coded value
+	e_surf_resource_state_t state_initial = SURF_RESOURCE_ON;
+	tmgr_trace_t state_trace = NULL;
+	power_peak = power;
+	//FIXME : hard coded value !!!
+	surf_parse_get_double(&power_scale, "1.0");
+	power_trace = tmgr_trace_new("");
+
+	//state_trace = tmgr_trace_new(A_surfxml_host_state_file);
+	current_property_set = xbt_dict_new();
+	cpu_im_new(xbt_strdup(id), power_peak, power_scale,
+					       power_trace, state_initial, state_trace, current_property_set);
+
+	}