X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f0164b9f36d247737a0857eef9d3a59667b58fdb..d0ffc37686edcc803601f76ab51fdfed5fc2f241:/src/simgrid/sg_config.c diff --git a/src/simgrid/sg_config.c b/src/simgrid/sg_config.c index 1b188b55c5..e2a11b9004 100644 --- a/src/simgrid/sg_config.c +++ b/src/simgrid/sg_config.c @@ -27,10 +27,19 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_config, surf, xbt_cfg_t _sg_cfg_set = NULL; -int _sg_init_status = 0; /* 0: beginning of time (config cannot be changed yet); - 1: initialized: cfg_set created (config can now be changed); - 2: configured: command line parsed and config part of platform file was integrated also, platform construction ongoing or done. - (Config cannot be changed anymore!) */ +/* 0: beginning of time (config cannot be changed yet); + * 1: initialized: cfg_set created (config can now be changed); + * 2: configured: command line parsed and config part of platform file was + * integrated also, platform construction ongoing or done. + * (Config cannot be changed anymore!) + */ +int _sg_cfg_init_status = 0; + +/* instruct the upper layer (simix or simdag) to exit as soon as possible + */ +int _sg_cfg_exit_asap = 0; + +#define sg_cfg_exit_early() do { _sg_cfg_exit_asap = 1; return; } while (0) /* Parse the command line, looking for options */ static void sg_config_cmd_line(int *argc, char **argv) @@ -93,10 +102,8 @@ static void sg_config_cmd_line(int *argc, char **argv) argv[j] = NULL; *argc = j; } - if (shall_exit) { - _sg_init_status = 1; // get everything cleanly cleaned on exit - exit(0); - } + if (shall_exit) + sg_cfg_exit_early(); } /* callback of the workstation/model variable */ @@ -104,14 +111,14 @@ static void _sg_cfg_cb__workstation_model(const char *name, int pos) { char *val; - xbt_assert(_sg_init_status < 2, + xbt_assert(_sg_cfg_init_status < 2, "Cannot change the model after the initialization"); val = xbt_cfg_get_string(_sg_cfg_set, name); if (!strcmp(val, "help")) { model_help("workstation", surf_workstation_model_description); - exit(0); + sg_cfg_exit_early(); } /* Make sure that the model exists */ @@ -123,14 +130,14 @@ static void _sg_cfg_cb__cpu_model(const char *name, int pos) { char *val; - xbt_assert(_sg_init_status < 2, + xbt_assert(_sg_cfg_init_status < 2, "Cannot change the model after the initialization"); val = xbt_cfg_get_string(_sg_cfg_set, name); if (!strcmp(val, "help")) { model_help("CPU", surf_cpu_model_description); - exit(0); + sg_cfg_exit_early(); } /* New Module missing */ @@ -142,14 +149,14 @@ static void _sg_cfg_cb__optimization_mode(const char *name, int pos) { char *val; - xbt_assert(_sg_init_status < 2, + xbt_assert(_sg_cfg_init_status < 2, "Cannot change the model after the initialization"); val = xbt_cfg_get_string(_sg_cfg_set, name); if (!strcmp(val, "help")) { model_help("optimization", surf_optimization_mode_description); - exit(0); + sg_cfg_exit_early(); } /* New Module missing */ @@ -161,14 +168,14 @@ static void _sg_cfg_cb__storage_mode(const char *name, int pos) { char *val; - xbt_assert(_sg_init_status < 2, + xbt_assert(_sg_cfg_init_status < 2, "Cannot change the model after the initialization"); val = xbt_cfg_get_string(_sg_cfg_set, name); if (!strcmp(val, "help")) { model_help("storage", surf_storage_model_description); - exit(0); + sg_cfg_exit_early(); } /* New Module missing */ @@ -180,14 +187,14 @@ static void _sg_cfg_cb__network_model(const char *name, int pos) { char *val; - xbt_assert(_sg_init_status < 2, + xbt_assert(_sg_cfg_init_status < 2, "Cannot change the model after the initialization"); val = xbt_cfg_get_string(_sg_cfg_set, name); if (!strcmp(val, "help")) { model_help("network", surf_network_model_description); - exit(0); + sg_cfg_exit_early(); } /* New Module missing */ @@ -233,14 +240,14 @@ static void _sg_cfg_cb__coll(const char *category, { char *val; - xbt_assert(_sg_init_status < 2, + xbt_assert(_sg_cfg_init_status < 2, "Cannot change the model after the initialization"); val = xbt_cfg_get_string(_sg_cfg_set, name); if (!strcmp(val, "help")) { coll_help(category, table); - exit(0); + sg_cfg_exit_early(); } /* New Module missing */ @@ -398,11 +405,12 @@ static void _sg_cfg_cb__gtnets_jitter_seed(const char *name, int pos) /* create the config set, register what should be and parse the command line*/ void sg_config_init(int *argc, char **argv) { - char *description = xbt_malloc(1024), *p = description; + char *description = xbt_malloc(1024); + char *p; int i; /* Create the configuration support */ - if (_sg_init_status == 0) { /* Only create stuff if not already inited */ + if (_sg_cfg_init_status == 0) { /* Only create stuff if not already inited */ sprintf(description, "The model to use for the CPU. Possible values: "); p = description; @@ -439,22 +447,6 @@ void sg_config_init(int *argc, char **argv) xbt_cfgelm_string, 1, 1, &_sg_cfg_cb__storage_mode, NULL); xbt_cfg_setdefault_string(_sg_cfg_set, "storage/model", "default"); - /* ********************************************************************* */ - /* TUTORIAL: New model */ - sprintf(description, - "The model to use for the New model. Possible values: "); - p = description; - while (*(++p) != '\0'); - for (i = 0; surf_new_model_description[i].name; i++) - p += sprintf(p, "%s%s", (i == 0 ? "" : ", "), - surf_new_model_description[i].name); - sprintf(p, - ".\n (use 'help' as a value to see the long description of each model)"); - xbt_cfg_register(&_sg_cfg_set, "new_model/model", description, - xbt_cfgelm_string, 1, 1, &_sg_cfg_cb__storage_mode, NULL); - xbt_cfg_setdefault_string(_sg_cfg_set, "new_model/model", "default"); - /* ********************************************************************* */ - sprintf(description, "The model to use for the network. Possible values: "); p = description; @@ -494,8 +486,6 @@ void sg_config_init(int *argc, char **argv) xbt_cfgelm_string, 1, 1, &_sg_cfg_cb__workstation_model, NULL); xbt_cfg_setdefault_string(_sg_cfg_set, "workstation/model", "default"); - xbt_free(description); - xbt_cfg_register(&_sg_cfg_set, "network/TCP_gamma", "Size of the biggest TCP window (cat /proc/sys/net/ipv4/tcp_[rw]mem for recv/send window; Use the last given value, which is the max window size)", xbt_cfgelm_double, 1, 1, _sg_cfg_cb__tcp_gamma, NULL); @@ -556,7 +546,7 @@ void sg_config_init(int *argc, char **argv) "If value=on, one checkpoint is saved for each step => faster verification, but huge memory consumption; higher values are good compromises between speed and memory consumption.", xbt_cfgelm_int, 0, 1, _mc_cfg_cb_checkpoint, NULL); xbt_cfg_setdefault_int(_sg_cfg_set, "model-check/checkpoint", 0); - + /* do liveness model-checking */ xbt_cfg_register(&_sg_cfg_set, "model-check/property", "Specify the name of the file containing the property. It must be the result of the ltl2ba program.", @@ -601,14 +591,21 @@ void sg_config_init(int *argc, char **argv) xbt_cfg_setdefault_boolean(_sg_cfg_set, "verbose-exit", "yes"); /* context factory */ - xbt_cfg_register(&_sg_cfg_set, "contexts/factory", - "Context factory to use in SIMIX (ucontext, thread or raw)", - xbt_cfgelm_string, 1, 1, _sg_cfg_cb_context_factory, NULL); -#ifndef WIN32 - xbt_cfg_setdefault_string(_sg_cfg_set, "contexts/factory", "ucontext"); -#else - xbt_cfg_setdefault_string(_sg_cfg_set, "contexts/factory", "raw"); + sprintf(description, + "Context factory to use in SIMIX. Possible values: thread"); + const char *dflt_ctx_fact = "thread"; +#ifdef CONTEXT_UCONTEXT + strcat(description, ", ucontext"); + dflt_ctx_fact = "ucontext"; +#endif +#ifdef HAVE_RAWCTX + strcat(description, ", raw"); + dflt_ctx_fact = "raw"; #endif + strcat(description, "."); + xbt_cfg_register(&_sg_cfg_set, "contexts/factory", description, + xbt_cfgelm_string, 1, 1, _sg_cfg_cb_context_factory, NULL); + xbt_cfg_setdefault_string(_sg_cfg_set, "contexts/factory", dflt_ctx_fact); /* stack size of contexts in Ko */ xbt_cfg_register(&_sg_cfg_set, "contexts/stack_size", @@ -795,7 +792,7 @@ void sg_config_init(int *argc, char **argv) xbt_cfg_setdefault_string(_sg_cfg_set, "path", initial_path); } - _sg_init_status = 1; + _sg_cfg_init_status = 1; sg_config_cmd_line(argc, argv); @@ -804,15 +801,17 @@ void sg_config_init(int *argc, char **argv) } else { XBT_WARN("Call to sg_config_init() after initialization ignored"); } + + xbt_free(description); } void sg_config_finalize(void) { - if (!_sg_init_status) + if (!_sg_cfg_init_status) return; /* Not initialized yet. Nothing to do */ xbt_cfg_free(&_sg_cfg_set); - _sg_init_status = 0; + _sg_cfg_init_status = 0; } /* Pick the right models for CPU, net and workstation, and call their model_init_preparse */ @@ -875,15 +874,6 @@ void surf_config_models_setup() storage_id = find_model_description(surf_storage_model_description, storage_model_name); surf_storage_model_description[storage_id].model_init_preparse(); - /* ********************************************************************* */ - /* TUTORIAL: New model */ - int new_model_id = -1; - char *new_model_name = NULL; - new_model_name = xbt_cfg_get_string(_sg_cfg_set, "new_model/model"); - XBT_DEBUG("Call new model_init"); - new_model_id = find_model_description(surf_new_model_description, new_model_name); - surf_new_model_description[new_model_id].model_init_preparse(); - /* ********************************************************************* */ } int sg_cfg_get_int(const char* name)