X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9003b522ca66f1a3723c63ce1c4753ad7aea9b70..26ac669d68abd5ccb430266a6a57d1d2201827cf:/src/surf/surf.c diff --git a/src/surf/surf.c b/src/surf/surf.c index 67cd8a4b34..5309c43bb7 100644 --- a/src/surf/surf.c +++ b/src/surf/surf.c @@ -55,6 +55,26 @@ 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 @@ -391,8 +411,6 @@ void sg_version(int *ver_major,int *ver_minor,int *ver_patch) { *ver_patch = SIMGRID_VERSION_PATCH; } -xbt_dynar_t sg_cmdline = NULL; - void surf_init(int *argc, char **argv) { XBT_DEBUG("Create all Libs"); @@ -413,11 +431,6 @@ void surf_init(int *argc, char **argv) SURF_WKS_LEVEL = xbt_lib_add_level(host_lib,surf_resource_free); SURF_LINK_LEVEL = xbt_lib_add_level(link_lib,surf_resource_free); - sg_cmdline = xbt_dynar_new(sizeof(char*),NULL); - int i; - for (i=0;i<*argc;i++) { - xbt_dynar_push(sg_cmdline,&(argv[i])); - } xbt_init(argc, argv); if (!model_list) model_list = xbt_dynar_new(sizeof(surf_model_private_t), NULL); @@ -425,8 +438,9 @@ void surf_init(int *argc, char **argv) history = tmgr_history_new(); surf_config_init(argc, argv); + surf_action_init(); - if (MC_IS_ENABLED) + if (MC_is_active()) MC_memory_init(); } @@ -489,7 +503,6 @@ void surf_exit(void) #endif xbt_dynar_free(&surf_path); - xbt_dynar_free(&sg_cmdline); xbt_lib_free(&host_lib); xbt_lib_free(&link_lib);