Nobody cares about this argument since maybe 4 years (when we managed to parse the...

diff --git a/include/surf/surfxml_parse.h b/include/surf/surfxml_parse.h
index 09d150d..ef751eb 100644 (file)
--- a/include/surf/surfxml_parse.h
+++ b/include/surf/surfxml_parse.h
@@ -14,8 +14,6 @@
 
 SG_BEGIN_DECL()
 
-XBT_PUBLIC_DATA(char *) platform_filename;
-
 /* Hook for the different tags. All the functions which pointer to are push into here are run when the tag is encountered */
 XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_platform_cb_list;
 XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_platform_cb_list;

diff --git a/src/bindings/lua/simgrid_lua.c b/src/bindings/lua/simgrid_lua.c
index 09dd183..0859188 100644 (file)
--- a/src/bindings/lua/simgrid_lua.c
+++ b/src/bindings/lua/simgrid_lua.c
@@ -616,7 +616,7 @@ static int msg_register_platform(lua_State * L)
   /* Tell Simgrid we dont wanna use its parser */
   surf_parse = console_parse_platform;
   surf_parse_reset_callbacks();
-  surf_config_models_setup(NULL);
+  surf_config_models_setup();
   MSG_create_environment(NULL);
   return 0;
 }
@@ -629,7 +629,7 @@ static int sd_register_platform(lua_State * L)
 {
   surf_parse = console_parse_platform_wsL07;
   surf_parse_reset_callbacks();
-  surf_config_models_setup(NULL);
+  surf_config_models_setup();
   SD_create_environment(NULL);
   return 0;
 }
@@ -642,7 +642,7 @@ static int gras_register_platform(lua_State * L)
   /* Tell Simgrid we dont wanna use surf parser */
   surf_parse = console_parse_platform;
   surf_parse_reset_callbacks();
-  surf_config_models_setup(NULL);
+  surf_config_models_setup();
   gras_create_environment(NULL);
   return 0;
 }

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index 4d60d27..4ef507c 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -58,7 +58,7 @@ typedef struct surf_model_description {
   const char *name;
   const char *description;
   surf_model_t model;
-  void (*model_init_preparse) (const char *filename);
+  void (*model_init_preparse) (void);
   void (*model_init_postparse) (void);
 } s_surf_model_description_t, *surf_model_description_t;
 
@@ -356,13 +356,13 @@ XBT_PUBLIC_DATA(surf_model_t) surf_cpu_model;
  *
  *  \see surf_workstation_model_init_CLM03()
  */
-XBT_PUBLIC(void) surf_cpu_model_init_Cas01(const char *filename);
+XBT_PUBLIC(void) surf_cpu_model_init_Cas01(void);
 
 /** \brief Initializes the CPU model with trace integration
  *  \ingroup SURF_models
  *
  */
-XBT_PUBLIC(void) surf_cpu_model_init_ti(const char *filename);
+XBT_PUBLIC(void) surf_cpu_model_init_ti(void);
 
 /** \brief Initializes the CPU model with the model Cas01 Improved. This model uses a heap to order the events, decreasing the time complexity to get the minimum next event.
  *  \ingroup SURF_models
@@ -372,7 +372,7 @@ XBT_PUBLIC(void) surf_cpu_model_init_ti(const char *filename);
  *
  *  \see surf_workstation_model_init_CLM03()
  */
-XBT_PUBLIC(void) surf_cpu_model_init_Cas01_im(const char *filename);
+XBT_PUBLIC(void) surf_cpu_model_init_Cas01_im(void);
 
 /** \brief The list of all available cpu model models
  *  \ingroup SURF_models
@@ -406,7 +406,7 @@ XBT_PUBLIC_DATA(surf_model_t) surf_network_model;
  *
  *  \see surf_workstation_model_init_SMPI()
  */
-XBT_PUBLIC(void) surf_network_model_init_SMPI(const char *filename);
+XBT_PUBLIC(void) surf_network_model_init_SMPI(void);
 
 /** \brief Initializes the platform with the network model 'LagrangeVelho'
  *  \ingroup SURF_models
@@ -418,8 +418,7 @@ XBT_PUBLIC(void) surf_network_model_init_SMPI(const char *filename);
  *
  *  \see surf_workstation_model_init_LegrandVelho()
  */
-XBT_PUBLIC(void) surf_network_model_init_LegrandVelho(const char
-                                                      *filename);
+XBT_PUBLIC(void) surf_network_model_init_LegrandVelho(void);
 
 
 /** \brief Initializes the platform with the network model 'LV08_im'
@@ -433,8 +432,7 @@ XBT_PUBLIC(void) surf_network_model_init_LegrandVelho(const char
  *
  *  \see surf_workstation_model_init_LegrandVelho()
  */
-XBT_PUBLIC(void) im_surf_network_model_init_LegrandVelho(const char
-                                                      *filename);
+XBT_PUBLIC(void) im_surf_network_model_init_LegrandVelho(void);
 
 /** \brief Initializes the platform with the network model 'Constant'
  *  \ingroup SURF_models
@@ -448,7 +446,7 @@ XBT_PUBLIC(void) im_surf_network_model_init_LegrandVelho(const char
  *
  *  \see surf_workstation_model_init_compound()
  */
-XBT_PUBLIC(void) surf_network_model_init_Constant(const char *filename);
+XBT_PUBLIC(void) surf_network_model_init_Constant(void);
 
 /** \brief Initializes the platform with the network model CM02
  *  \ingroup SURF_models
@@ -459,7 +457,7 @@ XBT_PUBLIC(void) surf_network_model_init_Constant(const char *filename);
  *
  *  \see surf_workstation_model_init_CLM03()
  */
-XBT_PUBLIC(void) surf_network_model_init_CM02(const char *filename);
+XBT_PUBLIC(void) surf_network_model_init_CM02(void);
 
 /**
  * brief initialize the the network model bypassing the XML parser
@@ -478,7 +476,7 @@ XBT_PUBLIC(void) surf_network_model_init_bypass(const char *id,
  *
  *  \see surf_workstation_model_init_GTNETS()
  */
-XBT_PUBLIC(void) surf_network_model_init_GTNETS(const char *filename);
+XBT_PUBLIC(void) surf_network_model_init_GbTNETS(void);
 #endif
 
 #ifdef HAVE_NS3
@@ -491,7 +489,7 @@ XBT_PUBLIC(void) surf_network_model_init_GTNETS(const char *filename);
  *
  *  \see surf_workstation_model_init_NS3()
  */
-XBT_PUBLIC(void) surf_network_model_init_NS3(const char *filename);
+XBT_PUBLIC(void) surf_network_model_init_NS3(void);
 
 XBT_PUBLIC(void) parse_ns3_add_host(void);
 XBT_PUBLIC(void) parse_ns3_add_router(void);
@@ -520,7 +518,7 @@ XBT_PUBLIC(double) ns3_get_link_bandwidth(const void *link);
  *  Call this function only if you plan using surf_workstation_model_init_compound.
  *
  */
-XBT_PUBLIC(void) surf_network_model_init_Reno(const char *filename);
+XBT_PUBLIC(void) surf_network_model_init_Reno(void);
 
 /** \brief Initializes the platform with the network model Reno2
  *  \ingroup SURF_models
@@ -535,7 +533,7 @@ XBT_PUBLIC(void) surf_network_model_init_Reno(const char *filename);
  *  Call this function only if you plan using surf_workstation_model_init_compound.
  *
  */
-XBT_PUBLIC(void) surf_network_model_init_Reno2(const char *filename);
+XBT_PUBLIC(void) surf_network_model_init_Reno2(void);
 
 /** \brief Initializes the platform with the network model Vegas
  *  \ingroup SURF_models
@@ -551,7 +549,7 @@ XBT_PUBLIC(void) surf_network_model_init_Reno2(const char *filename);
  *  Call this function only if you plan using surf_workstation_model_init_compound.
  *
  */
-XBT_PUBLIC(void) surf_network_model_init_Vegas(const char *filename);
+XBT_PUBLIC(void) surf_network_model_init_Vegas(void);
 
 /** \brief The list of all available network model models
  *  \ingroup SURF_models
@@ -578,8 +576,7 @@ XBT_PUBLIC_DATA(surf_model_t) surf_workstation_model;
  *  network_model have been set up.
  *
  */
-XBT_PUBLIC(void) surf_workstation_model_init_compound(const char
-                                                      *filename);
+XBT_PUBLIC(void) surf_workstation_model_init_compound(void);
 
 /** \brief Initializes the platform with the workstation model CLM03
  *  \ingroup SURF_models
@@ -593,7 +590,7 @@ XBT_PUBLIC(void) surf_workstation_model_init_compound(const char
  *
  *  \see surf_workstation_model_init_KCCFLN05()
  */
-XBT_PUBLIC(void) surf_workstation_model_init_CLM03(const char *filename);
+XBT_PUBLIC(void) surf_workstation_model_init_CLM03(void);
 
 /** \brief Initializes the platform with the model KCCFLN05
  *  \ingroup SURF_models
@@ -606,8 +603,7 @@ XBT_PUBLIC(void) surf_workstation_model_init_CLM03(const char *filename);
  *  SimDag.
  *
  */
-XBT_PUBLIC(void) surf_workstation_model_init_KCCFLN05(const char
-                                                      *filename);
+XBT_PUBLIC(void) surf_workstation_model_init_KCCFLN05(void);
 
 /** \brief Initializes the platform with the model KCCFLN05
  *  \ingroup SURF_models
@@ -618,8 +614,7 @@ XBT_PUBLIC(void) surf_workstation_model_init_KCCFLN05(const char
  *  the model to each action.
  *
  */
-XBT_PUBLIC(void) surf_workstation_model_init_ptask_L07(const char
-                                                       *filename);
+XBT_PUBLIC(void) surf_workstation_model_init_ptask_L07(void);
 
 /** \brief The list of all available workstation model models
  *  \ingroup SURF_models
@@ -660,7 +655,7 @@ XBT_PUBLIC(void) surf_init(int *argc, char **argv);     /* initialize common str
  * Must not be called within the initialization process so that the use get a chance to change the settings from
  * its code between, say, MSG_init and MSG_create_environment using MSG_config
  */
-XBT_PUBLIC(void) surf_config_models_setup(const char *platform_file);
+XBT_PUBLIC(void) surf_config_models_setup(void);
 
 /** \brief create the elements of the models
  *

diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c
index 8bbdbdf..a74295c 100644 (file)
--- a/src/simdag/sd_global.c
+++ b/src/simdag/sd_global.c
@@ -182,8 +182,6 @@ void SD_create_environment(const char *platform_file)
   void **surf_workstation = NULL;
   void **surf_link = NULL;
 
-  platform_filename = xbt_strdup(platform_file);
-
   // Reset callbacks
   surf_parse_reset_callbacks();
   // Add config callbacks

diff --git a/src/simix/smx_environment.c b/src/simix/smx_environment.c
index c342abc..0c7d109 100644 (file)
--- a/src/simix/smx_environment.c
+++ b/src/simix/smx_environment.c
@@ -39,8 +39,6 @@ void SIMIX_create_environment(const char *file)
 
   double start, end;
 
-  platform_filename = xbt_strdup(file);
-
   // Reset callbacks
   surf_parse_reset_callbacks();
   // Add config callbacks

diff --git a/src/surf/cpu.c b/src/surf/cpu.c
index b251771..3be6a3f 100644 (file)
--- a/src/surf/cpu.c
+++ b/src/surf/cpu.c
@@ -123,7 +123,7 @@ static void add_traces_cpu(void)
   }
 }
 
-static void cpu_define_callbacks(const char *file)
+static void cpu_define_callbacks(void)
 {
   surfxml_add_callback(ETag_surfxml_host_cb_list, parse_cpu_init);
   surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_traces_cpu);
@@ -479,11 +479,11 @@ static void surf_cpu_model_init_internal(void)
 /*   note =         "Available at */
 /*                  \url{http://grail.sdsc.edu/papers/simgrid_ccgrid01.ps.gz}." */
 /* } */
-void surf_cpu_model_init_Cas01(const char *filename)
+void surf_cpu_model_init_Cas01()
 {
   if (surf_cpu_model)
     return;
   surf_cpu_model_init_internal();
-  cpu_define_callbacks(filename);
+  cpu_define_callbacks();
   xbt_dynar_push(model_list, &surf_cpu_model);
 }

diff --git a/src/surf/cpu_im.c b/src/surf/cpu_im.c
index 7e06861..ccf3e56 100644 (file)
--- a/src/surf/cpu_im.c
+++ b/src/surf/cpu_im.c
@@ -136,7 +136,7 @@ static void cpu_im_add_traces_cpu(void)
   }
 }
 
-static void cpu_im_define_callbacks(const char *file)
+static void cpu_im_define_callbacks()
 {
   surfxml_add_callback(ETag_surfxml_host_cb_list, parse_cpu_im_init);
   surfxml_add_callback(ETag_surfxml_platform_cb_list,
@@ -660,11 +660,11 @@ static void surf_cpu_im_model_init_internal(void)
 /*   note =         "Available at */
 /*                  \url{http://grail.sdsc.edu/papers/simgrid_ccgrid01.ps.gz}." */
 /* } */
-void surf_cpu_model_init_Cas01_im(const char *filename)
+void surf_cpu_model_init_Cas01_im()
 {
   if (surf_cpu_model)
     return;
   surf_cpu_im_model_init_internal();
-  cpu_im_define_callbacks(filename);
+  cpu_im_define_callbacks();
   xbt_dynar_push(model_list, &surf_cpu_model);
 }

diff --git a/src/surf/cpu_ti.c b/src/surf/cpu_ti.c
index 876688d..41e3bc1 100644 (file)
--- a/src/surf/cpu_ti.c
+++ b/src/surf/cpu_ti.c
@@ -262,7 +262,7 @@ static void add_traces_cpu_ti(void)
   }
 }
 
-static void cpu_ti_define_callbacks(const char *file)
+static void cpu_ti_define_callbacks()
 {
   surfxml_add_callback(ETag_surfxml_host_cb_list, parse_cpu_ti_init);
   surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_traces_cpu_ti);
@@ -805,12 +805,12 @@ static void surf_cpu_ti_model_init_internal(void)
 
 }
 
-void surf_cpu_model_init_ti(const char *filename)
+void surf_cpu_model_init_ti()
 {
   if (surf_cpu_model)
     return;
   surf_cpu_ti_model_init_internal();
-  cpu_ti_define_callbacks(filename);
+  cpu_ti_define_callbacks();
   xbt_dynar_push(model_list, &surf_cpu_model);
 }
 

diff --git a/src/surf/network.c b/src/surf/network.c
index e6b7442..8984b41 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -270,7 +270,7 @@ static void net_add_traces(void)
   }
 }
 
-static void net_define_callbacks(const char *file)
+static void net_define_callbacks(void)
 {
   /* Figuring out the network links */
   surfxml_add_callback(STag_surfxml_link_cb_list, &net_parse_link_init);
@@ -825,7 +825,7 @@ static void surf_network_model_init_internal(void)
 /************************************************************************/
 /* New model based on LV08 and experimental results of MPI ping-pongs   */
 /************************************************************************/
-void surf_network_model_init_SMPI(const char *filename)
+void surf_network_model_init_SMPI(void)
 {
 
   if (surf_network_model)
@@ -834,7 +834,7 @@ void surf_network_model_init_SMPI(const char *filename)
   latency_factor_callback = &smpi_latency_factor;
   bandwidth_factor_callback = &smpi_bandwidth_factor;
   bandwidth_constraint_callback = &smpi_bandwidth_constraint;
-  net_define_callbacks(filename);
+  net_define_callbacks();
   xbt_dynar_push(model_list, &surf_network_model);
   network_solve = lmm_solve;
 
@@ -848,13 +848,13 @@ void surf_network_model_init_SMPI(const char *filename)
 /************************************************************************/
 /* New model based on optimizations discussed during this thesis        */
 /************************************************************************/
-void surf_network_model_init_LegrandVelho(const char *filename)
+void surf_network_model_init_LegrandVelho(void)
 {
 
   if (surf_network_model)
     return;
   surf_network_model_init_internal();
-  net_define_callbacks(filename);
+  net_define_callbacks();
   xbt_dynar_push(model_list, &surf_network_model);
   network_solve = lmm_solve;
 
@@ -878,13 +878,13 @@ void surf_network_model_init_LegrandVelho(const char *filename)
 /*   month         = {oct}, */
 /*   year          = {2002} */
 /* } */
-void surf_network_model_init_CM02(const char *filename)
+void surf_network_model_init_CM02(void)
 {
 
   if (surf_network_model)
     return;
   surf_network_model_init_internal();
-  net_define_callbacks(filename);
+  net_define_callbacks();
   xbt_dynar_push(model_list, &surf_network_model);
   network_solve = lmm_solve;
 
@@ -892,12 +892,12 @@ void surf_network_model_init_CM02(const char *filename)
                            "CM02", surf_network_model);
 }
 
-void surf_network_model_init_Reno(const char *filename)
+void surf_network_model_init_Reno(void)
 {
   if (surf_network_model)
     return;
   surf_network_model_init_internal();
-  net_define_callbacks(filename);
+  net_define_callbacks();
 
   xbt_dynar_push(model_list, &surf_network_model);
   lmm_set_default_protocol_function(func_reno_f, func_reno_fp,
@@ -914,12 +914,12 @@ void surf_network_model_init_Reno(const char *filename)
 }
 
 
-void surf_network_model_init_Reno2(const char *filename)
+void surf_network_model_init_Reno2(void)
 {
   if (surf_network_model)
     return;
   surf_network_model_init_internal();
-  net_define_callbacks(filename);
+  net_define_callbacks();
 
   xbt_dynar_push(model_list, &surf_network_model);
   lmm_set_default_protocol_function(func_reno2_f, func_reno2_fp,
@@ -936,12 +936,12 @@ void surf_network_model_init_Reno2(const char *filename)
                            "Reno2", surf_network_model);
 }
 
-void surf_network_model_init_Vegas(const char *filename)
+void surf_network_model_init_Vegas(void)
 {
   if (surf_network_model)
     return;
   surf_network_model_init_internal();
-  net_define_callbacks(filename);
+  net_define_callbacks();
 
   xbt_dynar_push(model_list, &surf_network_model);
   lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp,

diff --git a/src/surf/network_constant.c b/src/surf/network_constant.c
index 7b811c4..4c9db11 100644 (file)
--- a/src/surf/network_constant.c
+++ b/src/surf/network_constant.c
@@ -26,7 +26,7 @@ static void netcste_count_hosts(void)
   host_number_int++;
 }
 
-static void netcste_define_callbacks(const char *file)
+static void netcste_define_callbacks(void)
 {
   surfxml_add_callback(STag_surfxml_host_cb_list, &netcste_count_hosts);
 }
@@ -191,7 +191,7 @@ static void netcste_finalize(void)
 
 
 
-void surf_network_model_init_Constant(const char *filename)
+void surf_network_model_init_Constant()
 {
   xbt_assert(surf_network_model == NULL);
   if (surf_network_model)
@@ -233,7 +233,7 @@ void surf_network_model_init_Constant(const char *filename)
 
   if (!random_latency)
     random_latency = random_new(RAND, 100, 0.0, 1.0, .125, .034);
-  netcste_define_callbacks(filename);
+  netcste_define_callbacks();
   xbt_dynar_push(model_list, &surf_network_model);
 
   update_model_description(surf_network_model_description,

diff --git a/src/surf/network_gtnets.c b/src/surf/network_gtnets.c
index b6e1357..3667fb8 100644 (file)
--- a/src/surf/network_gtnets.c
+++ b/src/surf/network_gtnets.c
@@ -151,7 +151,7 @@ static void create_gtnets_topology()
 }
 
 /* Main XML parsing */
-static void define_callbacks(const char *file)
+static void define_callbacks(void)
 {
   /* Figuring out the network links */
   surfxml_add_callback(ETag_surfxml_link_cb_list, &parse_link_init);
@@ -454,12 +454,12 @@ static int get_latency_limited(surf_action_t action)
 }
 #endif
 
-void surf_network_model_init_GTNETS(const char *filename)
+void surf_network_model_init_GTNETS(void)
 {
   if (surf_network_model)
     return;
   surf_network_model_init_internal();
-  define_callbacks(filename);
+  define_callbacks();
   xbt_dynar_push(model_list, &surf_network_model);
 
 #ifdef HAVE_LATENCY_BOUND_TRACKING

diff --git a/src/surf/network_im.c b/src/surf/network_im.c
index 90bc93d..668c2f2 100644 (file)
--- a/src/surf/network_im.c
+++ b/src/surf/network_im.c
@@ -263,7 +263,7 @@ static void im_net_add_traces(void)
   }
 }
 
-static void im_net_define_callbacks(const char *file)
+static void im_net_define_callbacks(void)
 {
   /* Figuring out the network links */
   surfxml_add_callback(STag_surfxml_link_cb_list, &im_net_parse_link_init);
@@ -883,13 +883,13 @@ static void im_surf_network_model_init_internal(void)
 /************************************************************************/
 /* New model based on optimizations discussed during this thesis        */
 /************************************************************************/
-void im_surf_network_model_init_LegrandVelho(const char *filename)
+void im_surf_network_model_init_LegrandVelho(void)
 {
 
   if (surf_network_model)
     return;
   im_surf_network_model_init_internal();
-  im_net_define_callbacks(filename);
+  im_net_define_callbacks();
   xbt_dynar_push(model_list, &surf_network_model);
   network_im_solve = lmm_solve;
 

diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c
index 8dc4779..7d3862f 100644 (file)
--- a/src/surf/surf_config.c
+++ b/src/surf/surf_config.c
@@ -475,7 +475,7 @@ void surf_config_finalize(void)
   _surf_init_status = 0;
 }
 
-void surf_config_models_setup(const char *platform_file)
+void surf_config_models_setup()
 {
   char *workstation_model_name;
   int workstation_id = -1;
@@ -523,14 +523,12 @@ void surf_config_models_setup(const char *platform_file)
     cpu_id =
         find_model_description(surf_cpu_model_description, cpu_model_name);
 
-    surf_cpu_model_description[cpu_id].model_init_preparse(platform_file);
-    surf_network_model_description[network_id].model_init_preparse
-        (platform_file);
+    surf_cpu_model_description[cpu_id].model_init_preparse();
+    surf_network_model_description[network_id].model_init_preparse();
   }
 
   XBT_DEBUG("Call workstation_model_init");
-  surf_workstation_model_description[workstation_id].model_init_preparse
-      (platform_file);
+  surf_workstation_model_description[workstation_id].model_init_preparse();
 }
 
 void surf_config_models_create_elms(void)

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index 583028e..e7f700f 100644 (file)
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -1000,8 +1000,7 @@ void surf_parse_models_setup()
 {
        routing_parse_Erandom();
        surfxml_del_callback(STag_surfxml_AS_cb_list, surf_parse_models_setup);
-       surf_config_models_setup(platform_filename);
-       free(platform_filename);
+       surf_config_models_setup();
 }
 
 /* ************************************************** */

diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index 2489231..6f03bf3 100644 (file)
--- a/src/surf/surfxml_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -24,8 +24,6 @@ int ETag_surfxml_include_state(void);
 
 #include "simgrid_dtd.c"
 
-char *platform_filename;
-
 /*
  * Helping functions
  */

diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index 9aa3304..0a7641b 100644 (file)
--- a/src/surf/workstation.c
+++ b/src/surf/workstation.c
@@ -347,17 +347,17 @@ static void surf_workstation_model_init_internal(void)
 /*   month = {may}, */
 /*   year = {2003} */
 /* } */
-void surf_workstation_model_init_CLM03(const char *filename)
+void surf_workstation_model_init_CLM03(void)
 {
   surf_workstation_model_init_internal();
-  surf_cpu_model_init_Cas01_im(filename);
-  surf_network_model_init_LegrandVelho(filename);
+  surf_cpu_model_init_Cas01_im();
+  surf_network_model_init_LegrandVelho();
   update_model_description(surf_workstation_model_description,
                            "CLM03", surf_workstation_model);
   xbt_dynar_push(model_list, &surf_workstation_model);
 }
 
-void surf_workstation_model_init_compound(const char *filename)
+void surf_workstation_model_init_compound()
 {
 
   xbt_assert(surf_cpu_model, "No CPU model defined yet!");

diff --git a/src/surf/workstation_ptask_L07.c b/src/surf/workstation_ptask_L07.c
index 3994355..709e1a9 100644 (file)
--- a/src/surf/workstation_ptask_L07.c
+++ b/src/surf/workstation_ptask_L07.c
@@ -799,7 +799,7 @@ static void ptask_add_traces(void)
   }
 }
 
-static void ptask_define_callbacks(const char *file)
+static void ptask_define_callbacks()
 {
   /* Adding callback functions */
   surfxml_add_callback(ETag_surfxml_host_cb_list, &ptask_parse_cpu_init);
@@ -881,13 +881,13 @@ static void ptask_model_init_internal(void)
 /**************************************/
 /*************** Generic **************/
 /**************************************/
-void surf_workstation_model_init_ptask_L07(const char *filename)
+void surf_workstation_model_init_ptask_L07(void)
 {
   XBT_INFO("surf_workstation_model_init_ptask_L07");
   xbt_assert(!surf_cpu_model, "CPU model type already defined");
   xbt_assert(!surf_network_model, "network model type already defined");
   surf_network_model = surf_model_init();
-  ptask_define_callbacks(filename);
+  ptask_define_callbacks();
   ptask_model_init_internal();
 
   update_model_description(surf_workstation_model_description,

diff --git a/testsuite/surf/surf_usage.c b/testsuite/surf/surf_usage.c
index a3dc2ca..da1c4d2 100644 (file)
--- a/testsuite/surf/surf_usage.c
+++ b/testsuite/surf/surf_usage.c
@@ -52,8 +52,8 @@ void test(char *platform)
   e_surf_action_state_t stateActionC;
   double now = -1.0;
   surf_parse_reset_callbacks();
-  surf_cpu_model_init_Cas01(platform);  /* Now it is possible to use CPUs */
-  surf_network_model_init_CM02(platform);       /* Now it is possible to use eth0 */
+  surf_cpu_model_init_Cas01();  /* Now it is possible to use CPUs */
+  surf_network_model_init_CM02();       /* Now it is possible to use eth0 */
   parse_platform_file(platform);
 
   /*********************** CPU ***********************************/

diff --git a/testsuite/surf/surf_usage2.c b/testsuite/surf/surf_usage2.c
index 3dcab96..d42d2b7 100644 (file)
--- a/testsuite/surf/surf_usage2.c
+++ b/testsuite/surf/surf_usage2.c
@@ -49,7 +49,7 @@ void test(char *platform)
       find_model_description(surf_workstation_model_description, "CLM03");
   surf_parse_reset_callbacks();
   surf_workstation_model_description[workstation_id].
-      model_init_preparse(platform);
+      model_init_preparse();
   parse_platform_file(platform);
   if (surf_workstation_model_description[workstation_id].
       model_init_postparse)