Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Cosmetics
authorNavarrop <Pierre.Navarro@imag.fr>
Wed, 14 Dec 2011 15:54:37 +0000 (16:54 +0100)
committerNavarrop <Pierre.Navarro@imag.fr>
Fri, 16 Dec 2011 15:58:02 +0000 (16:58 +0100)
src/surf/cpu_cas01.c
src/surf/cpu_ti.c

index d8c3b4d..8c2abcf 100644 (file)
@@ -650,7 +650,7 @@ static void cpu_finalize(void)
   if(cpu_modified_cpu) xbt_swag_free(cpu_modified_cpu);
 }
 
   if(cpu_modified_cpu) xbt_swag_free(cpu_modified_cpu);
 }
 
-static void surf_cpu_model_init_internal(const char* name)
+static void surf_cpu_model_init_internal()
 {
   s_surf_action_t action;
   s_cpu_Cas01_t cpu;
 {
   s_surf_action_t action;
   s_cpu_Cas01_t cpu;
@@ -660,7 +660,7 @@ static void surf_cpu_model_init_internal(const char* name)
   cpu_running_action_set_that_does_not_need_being_checked =
       xbt_swag_new(xbt_swag_offset(action, state_hookup));
 
   cpu_running_action_set_that_does_not_need_being_checked =
       xbt_swag_new(xbt_swag_offset(action, state_hookup));
 
-  surf_cpu_model->name = name;
+  surf_cpu_model->name = "cpu";
 
   surf_cpu_model->action_unref = cpu_action_unref;
   surf_cpu_model->action_cancel = cpu_action_cancel;
 
   surf_cpu_model->action_unref = cpu_action_unref;
   surf_cpu_model->action_cancel = cpu_action_cancel;
@@ -758,7 +758,7 @@ void surf_cpu_model_init_Cas01()
 
   if (surf_cpu_model)
     return;
 
   if (surf_cpu_model)
     return;
-  surf_cpu_model_init_internal("CPU");
+  surf_cpu_model_init_internal();
   cpu_define_callbacks();
   xbt_dynar_push(model_list, &surf_cpu_model);
 }
   cpu_define_callbacks();
   xbt_dynar_push(model_list, &surf_cpu_model);
 }
index f8ccc17..0b9f262 100644 (file)
@@ -765,7 +765,7 @@ static void surf_cpu_ti_model_init_internal(void)
   cpu_ti_modified_cpu =
       xbt_swag_new(xbt_swag_offset(cpu, modified_cpu_hookup));
 
   cpu_ti_modified_cpu =
       xbt_swag_new(xbt_swag_offset(cpu, modified_cpu_hookup));
 
-  surf_cpu_model->name = "CPU_TI";
+  surf_cpu_model->name = "cpu_ti";
 
   surf_cpu_model->action_unref = cpu_ti_action_unref;
   surf_cpu_model->action_cancel = cpu_ti_action_cancel;
 
   surf_cpu_model->action_unref = cpu_ti_action_unref;
   surf_cpu_model->action_cancel = cpu_ti_action_cancel;