X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f193fed57024f1b113f3ec07500a76e1ed5b76b1..725c769707a505cb0a66620ca7bfce85fe107e8e:/src/surf/surf.c

diff --git a/src/surf/surf.c b/src/surf/surf.c
index f6d9f205be..77c0fed961 100644
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -124,7 +124,7 @@ s_surf_model_description_t surf_network_model_description[] = {
    im_surf_network_model_init_LegrandVelho},
    {"LV08_fullupdate",
     "Realistic network model wit lmm_solve, adequate correction factors (latency*=10.4, bandwidth*=.92, S=8775) but no further optimization. Should produce the same results as LV08, only slower.",
-    surf_network_model_init_LegrandVelho},
+   im_surf_network_model_init_LegrandVelho},
   {"SMPI",
    "Realistic network model with lmm_solve and correction factors on three intervals (< 1KiB, < 64 KiB, >= 64 KiB)",
    surf_network_model_init_SMPI},
@@ -152,7 +152,7 @@ s_surf_model_description_t surf_network_model_description[] = {
 
 s_surf_model_description_t surf_cpu_model_description[] = {
   {"Cas01_fullupdate", "CPU classical model time=size/power",
-   surf_cpu_model_init_Cas01},
+   surf_cpu_model_init_Cas01_im},
   {"Cas01",
    "Variation of Cas01_fullupdate with partial invalidation optimization of lmm system. Should produce the same values, only faster",
    surf_cpu_model_init_Cas01_im},
@@ -198,7 +198,7 @@ int find_model_description(s_surf_model_description_t * table,
   for (i = 1; table[i].name; i++) {
     name_list =
         xbt_realloc(name_list,
-                    strlen(name_list) + strlen(table[i].name) + 2);
+                    strlen(name_list) + strlen(table[i].name) + 3);
     strcat(name_list, ", ");
     strcat(name_list, table[i].name);
   }
@@ -366,6 +366,7 @@ void surf_exit(void)
   xbt_dynar_foreach(model_list, iter, model)
       model->model_private->finalize();
   xbt_dynar_free(&model_list);
+  routing_exit();
 
   if (maxmin_system) {
     lmm_system_free(maxmin_system);