X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/253e5e44da23233d06314cfb81b82149e45c1d5d..7d4a9a7e27436e76b10c1b1f9ce794655dc070a2:/src/surf/surf.c diff --git a/src/surf/surf.c b/src/surf/surf.c index fbf2ae3c71..22aeea5247 100644 --- a/src/surf/surf.c +++ b/src/surf/surf.c @@ -10,6 +10,7 @@ #include "simix/smx_host_private.h" #include "surf/surf_resource.h" #include "xbt/xbt_os_thread.h" +#include "simgrid/sg_config.h" #include @@ -55,26 +56,6 @@ static const char *disk_drives_letter_table[MAX_DRIVE] = { }; #endif /* #ifdef _XBT_WIN32 */ -int surf_cfg_get_int(const char* name) -{ - return xbt_cfg_get_int(_surf_cfg_set,name); -} -double surf_cfg_get_double(const char* name) -{ - return xbt_cfg_get_double(_surf_cfg_set,name); -} -char* surf_cfg_get_string(const char* name) -{ - return xbt_cfg_get_string(_surf_cfg_set,name); -} -void surf_cfg_get_peer(const char *name, char **peer, int *port) -{ - xbt_cfg_get_peer(_surf_cfg_set,name, peer, port); -} -xbt_dynar_t surf_cfg_get_dynar(const char* name) -{ - return xbt_cfg_get_dynar(_surf_cfg_set,name); -} /* * Returns the initial path. On Windows the initial path is * the current directory for the current process in the other @@ -437,7 +418,7 @@ void surf_init(int *argc, char **argv) if (!history) history = tmgr_history_new(); - surf_config_init(argc, argv); + sg_config_init(argc, argv); surf_action_init(); if (MC_is_active()) @@ -479,7 +460,7 @@ void surf_exit(void) unsigned int iter; surf_model_t model = NULL; - surf_config_finalize(); + sg_config_finalize(); xbt_dynar_foreach(model_list, iter, model) model->model_private->finalize();