X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b068fb07209cff63d16db86b8c5f90067b67a194..bff077b4621c68455a86e60292cb0bf872a879d5:/src/simix/smx_config.c diff --git a/src/simix/smx_config.c b/src/simix/smx_config.c index 6043e65538..77d690fb10 100644 --- a/src/simix/smx_config.c +++ b/src/simix/smx_config.c @@ -10,88 +10,93 @@ #include "xbt/sysdep.h" #include "xbt/log.h" -int _simix_init_status = 0; /* 0: beginning of time; - 1: pre-inited (cfg_set created); - 2: inited (running) */ +int _simix_init_status = 0; /* 0: beginning of time; + 1: pre-inited (cfg_set created); + 2: inited (running) */ xbt_cfg_t _simix_cfg_set = NULL; /* callback of the workstation_model variable */ -static void _simix_cfg_cb__workstation_model(const char *name, int pos) +static void _simix_cfg_cb__workstation_model(const char *name, int pos) { char *val; - xbt_assert0(_simix_init_status<2, "Cannot change the model after the initialization"); - - val = xbt_cfg_get_string (_simix_cfg_set, name); + xbt_assert0(_simix_init_status < 2, + "Cannot change the model after the initialization"); + + val = xbt_cfg_get_string(_simix_cfg_set, name); /* New Module missing */ - xbt_assert1(!strcmp(val, "CLM03") || - !strcmp(val, "KCCFLN05") || - !strcmp(val, "SDP") || - !strcmp(val, "Vegas") || - !strcmp(val, "Reno") || - !strcmp(val, "GTNets") || - !strcmp(val, "compound"), - "Unknown workstation model: %s (choices are: 'CLM03', 'KCCFLN05', 'SDP', 'Vegas', 'Reno', 'GTNets' and 'Compound'",val); + + find_model_description(surf_workstation_model_description, + surf_workstation_model_description_size, + val); } /* callback of the cpu_model variable */ -static void _simix_cfg_cb__cpu_model(const char *name, int pos) +static void _simix_cfg_cb__cpu_model(const char *name, int pos) { char *val; - xbt_assert0(_simix_init_status<2, "Cannot change the model after the initialization"); - - val = xbt_cfg_get_string (_simix_cfg_set, name); + xbt_assert0(_simix_init_status < 2, + "Cannot change the model after the initialization"); + + val = xbt_cfg_get_string(_simix_cfg_set, name); /* New Module missing */ - xbt_assert1(!strcmp(val, "Cas01"), - "Unknown CPU model: %s (choices are: 'Cas01'",val); + find_model_description(surf_cpu_model_description, + surf_cpu_model_description_size, val); } + /* callback of the workstation_model variable */ -static void _simix_cfg_cb__network_model(const char *name, int pos) +static void _simix_cfg_cb__network_model(const char *name, int pos) { char *val; - xbt_assert0(_simix_init_status<2, "Cannot change the model after the initialization"); - - val = xbt_cfg_get_string (_simix_cfg_set, name); + xbt_assert0(_simix_init_status < 2, + "Cannot change the model after the initialization"); + + val = xbt_cfg_get_string(_simix_cfg_set, name); /* New Module missing */ - xbt_assert1(!strcmp(val, "CM02") || - !strcmp(val, "GTNets") || - !strcmp(val, "SDP") || - !strcmp(val, "Vegas") || - !strcmp(val, "Reno"), - "Unknown workstation model: %s (choices are: 'CM02', 'GTNets', 'SDP', 'Vegas' and 'Reno'",val); + find_model_description(surf_network_model_description, + surf_network_model_description_size, val); } /* create the config set and register what should be */ -void simix_config_init(void) +void simix_config_init(void) { - if (_simix_init_status) - return; /* Already inited, nothing to do */ - + if (_simix_init_status) + return; /* Already inited, nothing to do */ + + /* Connect our log channels: that must be done manually under windows */ + XBT_LOG_CONNECT(simix_action, simix); + XBT_LOG_CONNECT(simix_deployment, simix); + XBT_LOG_CONNECT(simix_environment, simix); + XBT_LOG_CONNECT(simix_host, simix); + XBT_LOG_CONNECT(simix_kernel, simix); + XBT_LOG_CONNECT(simix_process, simix); + XBT_LOG_CONNECT(simix_synchro, simix); + _simix_init_status = 1; _simix_cfg_set = xbt_cfg_new(); - - xbt_cfg_register (_simix_cfg_set, - "workstation_model", xbt_cfgelm_string, 1,1, - &_simix_cfg_cb__workstation_model,NULL); - - xbt_cfg_register (_simix_cfg_set, - "cpu_model", xbt_cfgelm_string, 1,1, - &_simix_cfg_cb__cpu_model,NULL); - xbt_cfg_register (_simix_cfg_set, - "network_model", xbt_cfgelm_string, 1,1, - &_simix_cfg_cb__network_model,NULL); - - xbt_cfg_set_string(_simix_cfg_set,"workstation_model", "KCCFLN05"); + + xbt_cfg_register(_simix_cfg_set, + "workstation_model", xbt_cfgelm_string, 1, 1, + &_simix_cfg_cb__workstation_model, NULL); + + xbt_cfg_register(_simix_cfg_set, + "cpu_model", xbt_cfgelm_string, 1, 1, + &_simix_cfg_cb__cpu_model, NULL); + xbt_cfg_register(_simix_cfg_set, + "network_model", xbt_cfgelm_string, 1, 1, + &_simix_cfg_cb__network_model, NULL); + + xbt_cfg_set_string(_simix_cfg_set, "workstation_model", "CLM03"); } -void simix_config_finalize(void) +void simix_config_finalize(void) { - if (!_simix_init_status) - return; /* Not initialized yet. Nothing to do */ + if (!_simix_init_status) + return; /* Not initialized yet. Nothing to do */ xbt_cfg_free(&_simix_cfg_set); _simix_init_status = 0; @@ -99,19 +104,21 @@ void simix_config_finalize(void) /** \brief Set a configuration variable * + * FIXME + * Currently existing configuration variable: * - workstation_model (string): Model of workstation to use. * Possible values (defaults to "KCCFLN05"): * - "CLM03": realistic TCP behavior + basic CPU model (see [CML03 at CCGrid03]) + support for parallel tasks * - "KCCFLN05": realistic TCP behavior + basic CPU model (see [CML03 at CCGrid03]) + failure handling + interference between communications and computations if precised in the platform file. - * + * - compound * \param name Configuration variable name that will change. * \param pa A va_list with the others parameters */ -void SIMIX_config(const char *name, va_list pa) +void SIMIX_config(const char *name, va_list pa) { if (!_simix_init_status) { simix_config_init(); } - xbt_cfg_set_vargs(_simix_cfg_set,name,pa); + xbt_cfg_set_vargs(_simix_cfg_set, name, pa); }