Adding a nice description mechanism for models + cleaning (many?) useless functions

[simgrid.git] / src / surf / workstation_KCCFLN05.c

diff --git a/src/surf/workstation_KCCFLN05.c b/src/surf/workstation_KCCFLN05.c
index 9d3a015..a439c6c 100644 (file)
--- a/src/surf/workstation_KCCFLN05.c
+++ b/src/surf/workstation_KCCFLN05.c
@@ -89,6 +89,7 @@ static void *name_service(const char *name)
       RETHROW;
     WARN1("Host '%s' not found, verifing if it is a router", name);
     res = NULL;
+    xbt_ex_free(e);
   }
 
   return res;
@@ -1146,46 +1147,3 @@ void surf_workstation_resource_init_KCCFLN05(const char *filename)
 
   xbt_dynar_push(resource_list, &surf_workstation_resource);
 }
-
-void surf_workstation_resource_init_KCCFLN05_proportional(const char *filename)
-{
-  xbt_assert0(!surf_cpu_resource, "CPU resource type already defined");
-  xbt_assert0(!surf_network_resource, "network resource type already defined");
-  resource_init_internal();
-  parse_file(filename);
-
-  surf_workstation_resource->common_public->name = "Workstation KCCFLN05 (proportional)";
-  use_sdp_solver=1;
-  xbt_dynar_push(resource_list, &surf_workstation_resource);
-}
-
-void surf_workstation_resource_init_KCCFLN05_Vegas(const char *filename)
-{
-  xbt_assert0(!surf_cpu_resource, "CPU resource type already defined");
-  xbt_assert0(!surf_network_resource, "network resource type already defined");
-  resource_init_internal();
-  parse_file(filename);
-
-  lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp, func_vegas_fpi);
-
-  surf_workstation_resource->common_public->name = "Workstation KCCFLN05 (Vegas)";
-  use_lagrange_solver=1;
-  xbt_dynar_push(resource_list, &surf_workstation_resource);
-}
-
-void surf_workstation_resource_init_KCCFLN05_Reno(const char *filename)
-{
-  xbt_assert0(!surf_cpu_resource, "CPU resource type already defined");
-  xbt_assert0(!surf_network_resource, "network resource type already defined");
-  resource_init_internal();
-  parse_file(filename);
-
-  lmm_set_default_protocol_function(func_reno_f, func_reno_fp, func_reno_fpi);
-
-  surf_workstation_resource->common_public->name = "Workstation KCCFLN05 (Reno)";
-  use_lagrange_solver=1;
-  xbt_dynar_push(resource_list, &surf_workstation_resource);
-}
-
-
-