From 8b60d8cf574ab44ee009c8dddce49b443e229cf3 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 1 Oct 2013 15:50:10 +0200 Subject: [PATCH] Further improve help message. --- src/simgrid/sg_config.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/simgrid/sg_config.c b/src/simgrid/sg_config.c index 4ad10517f9..9ec43f64f7 100644 --- a/src/simgrid/sg_config.c +++ b/src/simgrid/sg_config.c @@ -494,8 +494,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); @@ -601,18 +599,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. Possible values: " - "default" -#if HAVE_RAWCTX - ", 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 -#if CONTEXT_UCONTEXT - ", ucontext" +#ifdef HAVE_RAWCTX + strcat(description, ", raw"); + dflt_ctx_fact = "raw"; #endif - ", thread.", + 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", "default"); + 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", @@ -808,6 +809,8 @@ 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) -- 2.20.1