X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/de5aca5ac43104948f11c931bdb6303d70562c4c..15c81e44412415173de220954a453019c68714cd:/src/surf/surf_config.c diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c index db5e5d73d0..a136ff96c2 100644 --- a/src/surf/surf_config.c +++ b/src/surf/surf_config.c @@ -310,8 +310,7 @@ void surf_config_init(int *argc, char **argv) sprintf(p, ".\n (use 'help' as a value to see the long description of each model)"); default_value = xbt_strdup("Cas01"); - xbt_cfg_register(&_surf_cfg_set, - "cpu/model", description, xbt_cfgelm_string, + xbt_cfg_register(&_surf_cfg_set, "cpu/model", description, xbt_cfgelm_string, &default_value, 1, 1, &_surf_cfg_cb__cpu_model, NULL); sprintf(description, @@ -324,8 +323,7 @@ void surf_config_init(int *argc, char **argv) sprintf(p, ".\n (use 'help' as a value to see the long description of each optimization mode)"); default_value = xbt_strdup("Lazy"); - xbt_cfg_register(&_surf_cfg_set, - "cpu/optim", description, xbt_cfgelm_string, + xbt_cfg_register(&_surf_cfg_set, "cpu/optim", description, xbt_cfgelm_string, &default_value, 1, 1, &_surf_cfg_cb__optimization_mode, NULL); sprintf(description, @@ -338,8 +336,7 @@ void surf_config_init(int *argc, char **argv) sprintf(p, ".\n (use 'help' as a value to see the long description of each model)"); default_value = xbt_strdup("LV08"); - xbt_cfg_register(&_surf_cfg_set, - "network/model", description, xbt_cfgelm_string, + xbt_cfg_register(&_surf_cfg_set, "network/model", description, xbt_cfgelm_string, &default_value, 1, 1, &_surf_cfg_cb__network_model, NULL); @@ -353,8 +350,7 @@ void surf_config_init(int *argc, char **argv) sprintf(p, ".\n (use 'help' as a value to see the long description of each optimization mode)"); default_value = xbt_strdup("Lazy"); - xbt_cfg_register(&_surf_cfg_set, - "network/optim", description, xbt_cfgelm_string, + xbt_cfg_register(&_surf_cfg_set, "network/optim", description, xbt_cfgelm_string, &default_value, 1, 1, &_surf_cfg_cb__optimization_mode, NULL); sprintf(description, @@ -366,19 +362,13 @@ void surf_config_init(int *argc, char **argv) surf_workstation_model_description[i].name); sprintf(p, ".\n (use 'help' as a value to see the long description of each model)"); - default_value = xbt_strdup("current_default"); - xbt_cfg_register(&_surf_cfg_set, - "workstation/model", description, xbt_cfgelm_string, + default_value = xbt_strdup("default"); + xbt_cfg_register(&_surf_cfg_set, "workstation/model", description, xbt_cfgelm_string, &default_value, 1, 1, &_surf_cfg_cb__workstation_model, NULL); xbt_free(description); - default_value = xbt_strdup("Full"); - xbt_cfg_register(&_surf_cfg_set, "routing", - "Model to use to store the routing information", - xbt_cfgelm_string, &default_value, 1, 1, NULL, NULL); - xbt_cfg_register(&_surf_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, NULL, 1, 1, @@ -445,7 +435,7 @@ void surf_config_init(int *argc, char **argv) xbt_cfg_set_int(_surf_cfg_set, "model-check", default_value_int); */ /* do verbose-exit */ - default_value_int = 0; + default_value_int = 1; xbt_cfg_register(&_surf_cfg_set, "verbose-exit", "Activate the \"do nothing\" mode in Ctrl-C", xbt_cfgelm_int, &default_value_int, 0, 1, @@ -461,28 +451,32 @@ void surf_config_init(int *argc, char **argv) /* stack size of contexts in Ko */ default_value_int = 128; xbt_cfg_register(&_surf_cfg_set, "contexts/stack_size", - "Stack size of contexts in Ko (ucontext or raw only)", + "Stack size of contexts in Kib (ucontext or raw only)", xbt_cfgelm_int, &default_value_int, 1, 1, _surf_cfg_cb_context_stack_size, NULL); /* number of parallel threads for user processes */ default_value_int = 1; xbt_cfg_register(&_surf_cfg_set, "contexts/nthreads", - "Number of parallel threads for user contexts (EXPERIMENTAL)", + "Number of parallel threads used to execute user contexts", xbt_cfgelm_int, &default_value_int, 1, 1, _surf_cfg_cb_contexts_nthreads, NULL); /* minimal number of user contexts to be run in parallel */ - default_value_int = 1; + default_value_int = 2; xbt_cfg_register(&_surf_cfg_set, "contexts/parallel_threshold", "Minimal number of user contexts to be run in parallel (raw contexts only)", xbt_cfgelm_int, &default_value_int, 1, 1, _surf_cfg_cb_contexts_parallel_threshold, NULL); /* minimal number of user contexts to be run in parallel */ +#ifdef HAVE_FUTEX_H default_value = xbt_strdup("futex"); - xbt_cfg_register(&_surf_cfg_set, "contexts/parallel_mode", - "Synchronization mode to use when running contexts in parallel", +#else //No futex on mac and posix is unimplememted yet + default_value = xbt_strdup("busy_wait"); +#endif + xbt_cfg_register(&_surf_cfg_set, "contexts/synchro", + "Synchronization mode to use when running contexts in parallel (either futex, posix or busy_wait)", xbt_cfgelm_string, &default_value, 1, 1, _surf_cfg_cb_contexts_parallel_mode, NULL); @@ -501,14 +495,14 @@ void surf_config_init(int *argc, char **argv) xbt_cfg_setdefault_int(_surf_cfg_set, "network/crosstraffic", default_value_int); #ifdef HAVE_GTNETS - xbt_cfg_register(&_surf_cfg_set, "gtnets_jitter", + xbt_cfg_register(&_surf_cfg_set, "gtnets/jitter", "Double value to oscillate the link latency, uniformly in random interval [-latency*gtnets_jitter,latency*gtnets_jitter)", xbt_cfgelm_double, NULL, 1, 1, _surf_cfg_cb__gtnets_jitter, NULL); xbt_cfg_setdefault_double(_surf_cfg_set, "gtnets_jitter", 0.0); default_value_int = 10; - xbt_cfg_register(&_surf_cfg_set, "gtnets_jitter_seed", + xbt_cfg_register(&_surf_cfg_set, "gtnets/jitter_seed", "Use a positive seed to reproduce jitted results, value must be in [1,1e8], default is 10", xbt_cfgelm_int, &default_value_int, 0, 1, _surf_cfg_cb__gtnets_jitter_seed, NULL);