From: Arnaud Giersch Date: Fri, 20 Sep 2013 14:27:54 +0000 (+0200) Subject: Use xbt_cfg_setdefault everywhere. X-Git-Tag: v3_9_90~104^2~23 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/8a6229b1219b87682cf66abc13f5c2c0cd4fdb17?hp=ffb57ae2c9e165e5820768c62bf4f72a831fc020 Use xbt_cfg_setdefault everywhere. --- diff --git a/src/instr/instr_config.c b/src/instr/instr_config.c index 7081bc0a64..9ec7f7d0e8 100644 --- a/src/instr/instr_config.c +++ b/src/instr/instr_config.c @@ -319,166 +319,166 @@ char *TRACE_get_viva_cat_conf (void) void TRACE_global_init(int *argc, char **argv) { /* name of the tracefile */ - char *default_tracing_filename = xbt_strdup("simgrid.trace"); xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_FILENAME, "Trace file created by the instrumented SimGrid.", - xbt_cfgelm_string, &default_tracing_filename, 1, 1, + xbt_cfgelm_string, NULL, 1, 1, NULL, NULL); + xbt_cfg_setdefault_string(_sg_cfg_set, OPT_TRACING_FILENAME, xbt_strdup("simgrid.trace")); /* tracing */ - int default_tracing = 0; xbt_cfg_register(&_sg_cfg_set, OPT_TRACING, "Enable Tracing.", - xbt_cfgelm_int, &default_tracing, 0, 1, + xbt_cfgelm_int, NULL, 0, 1, NULL, NULL); + xbt_cfg_setdefault_int(_sg_cfg_set, OPT_TRACING, 0); /* register platform in the trace */ - int default_tracing_platform = 0; xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_PLATFORM, "Register the platform in the trace as a hierarchy.", - xbt_cfgelm_int, &default_tracing_platform, 0, 1, + xbt_cfgelm_int, NULL, 0, 1, NULL, NULL); + xbt_cfg_setdefault_int(_sg_cfg_set, OPT_TRACING_PLATFORM, 0); /* register platform in the trace */ - int default_tracing_platform_topology = 1; xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_TOPOLOGY, "Register the platform topology in the trace as a graph.", - xbt_cfgelm_int, &default_tracing_platform_topology, 0, 1, + xbt_cfgelm_int, NULL, 0, 1, NULL, NULL); + xbt_cfg_setdefault_int(_sg_cfg_set, OPT_TRACING_TOPOLOGY, 1); /* smpi */ - int default_tracing_smpi = 0; xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_SMPI, "Tracing of the SMPI interface.", - xbt_cfgelm_int, &default_tracing_smpi, 0, 1, + xbt_cfgelm_int, NULL, 0, 1, NULL, NULL); + xbt_cfg_setdefault_int(_sg_cfg_set, OPT_TRACING_SMPI, 0); /* smpi grouped */ - int default_tracing_smpi_grouped = 0; xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_SMPI_GROUP, "Group MPI processes by host.", - xbt_cfgelm_int, &default_tracing_smpi_grouped, 0, 1, + xbt_cfgelm_int, NULL, 0, 1, NULL, NULL); + xbt_cfg_setdefault_int(_sg_cfg_set, OPT_TRACING_SMPI_GROUP, 0); /* smpi computing */ - int default_tracing_smpi_computing = 0; xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_SMPI_COMPUTING, "Generate states for timing out of SMPI parts of the application", - xbt_cfgelm_int, &default_tracing_smpi_computing, 0, 1, + xbt_cfgelm_int, NULL, 0, 1, NULL, NULL); + xbt_cfg_setdefault_int(_sg_cfg_set, OPT_TRACING_SMPI_COMPUTING, 0); /* smpi internals */ - int default_tracing_smpi_internals = 0; xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_SMPI_INTERNALS, "View internal messages sent by Collective communications in SMPI", - xbt_cfgelm_int, &default_tracing_smpi_internals, 0, 1, + xbt_cfgelm_int, NULL, 0, 1, NULL, NULL); + xbt_cfg_setdefault_int(_sg_cfg_set, OPT_TRACING_SMPI_INTERNALS, 0); /* tracing categorized resource utilization traces */ - int default_tracing_categorized = 0; xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_CATEGORIZED, "Tracing categorized resource utilization of hosts and links.", - xbt_cfgelm_int, &default_tracing_categorized, 0, 1, + xbt_cfgelm_int, NULL, 0, 1, NULL, NULL); + xbt_cfg_setdefault_int(_sg_cfg_set, OPT_TRACING_CATEGORIZED, 0); /* tracing uncategorized resource utilization */ - int default_tracing_uncategorized = 0; xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_UNCATEGORIZED, "Tracing uncategorized resource utilization of hosts and links.", - xbt_cfgelm_int, &default_tracing_uncategorized, 0, 1, + xbt_cfgelm_int, NULL, 0, 1, NULL, NULL); + xbt_cfg_setdefault_int(_sg_cfg_set, OPT_TRACING_UNCATEGORIZED, 0); /* msg process */ - int default_tracing_msg_process = 0; xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_MSG_PROCESS, "Tracing of MSG process behavior.", - xbt_cfgelm_int, &default_tracing_msg_process, 0, 1, + xbt_cfgelm_int, NULL, 0, 1, NULL, NULL); + xbt_cfg_setdefault_int(_sg_cfg_set, OPT_TRACING_MSG_PROCESS, 0); /* msg process */ - int default_tracing_msg_vm = 0; xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_MSG_VM, "Tracing of MSG process behavior.", - xbt_cfgelm_int, &default_tracing_msg_vm, 0, 1, + xbt_cfgelm_int, NULL, 0, 1, NULL, NULL); + xbt_cfg_setdefault_int(_sg_cfg_set, OPT_TRACING_MSG_VM, 0); /* disable tracing link */ - int default_tracing_disable_link = 0; xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_DISABLE_LINK, "Do not trace link bandwidth and latency.", - xbt_cfgelm_int, &default_tracing_disable_link, 0, 1, + xbt_cfgelm_int, NULL, 0, 1, NULL, NULL); + xbt_cfg_setdefault_int(_sg_cfg_set, OPT_TRACING_DISABLE_LINK, 0); /* disable tracing link */ - int default_tracing_disable_power = 0; xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_DISABLE_POWER, "Do not trace host power.", - xbt_cfgelm_int, &default_tracing_disable_power, 0, 1, + xbt_cfgelm_int, NULL, 0, 1, NULL, NULL); + xbt_cfg_setdefault_int(_sg_cfg_set, OPT_TRACING_DISABLE_POWER, 0); /* tracing buffer */ - int default_buffer = 1; xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_BUFFER, "Buffer trace events to put them in temporal order.", - xbt_cfgelm_int, &default_buffer, 0, 1, + xbt_cfgelm_int, NULL, 0, 1, NULL, NULL); + xbt_cfg_setdefault_int(_sg_cfg_set, OPT_TRACING_BUFFER, 1); /* tracing one link only */ - int default_onelink_only = 0; xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_ONELINK_ONLY, "Use only routes with one link to trace platform.", - xbt_cfgelm_int, &default_onelink_only, 0, 1, + xbt_cfgelm_int, NULL, 0, 1, NULL, NULL); + xbt_cfg_setdefault_int(_sg_cfg_set, OPT_TRACING_ONELINK_ONLY, 0); /* disable destroy */ - int default_disable_destroy = 0; xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_DISABLE_DESTROY, "Disable platform containers destruction.", - xbt_cfgelm_int, &default_disable_destroy, 0, 1, + xbt_cfgelm_int, NULL, 0, 1, NULL, NULL); + xbt_cfg_setdefault_int(_sg_cfg_set, OPT_TRACING_DISABLE_DESTROY, 0); /* basic -- Avoid extended events (impoverished trace file) */ - int default_basic = 0; xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_BASIC, "Avoid extended events (impoverished trace file).", - xbt_cfgelm_int, &default_basic, 0, 1, + xbt_cfgelm_int, NULL, 0, 1, NULL, NULL); + xbt_cfg_setdefault_int(_sg_cfg_set, OPT_TRACING_BASIC, 0); /* display_sizes -- Extended events with message size information */ - int default_display_sizes = 0; xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_DISPLAY_SIZES, "(smpi only for now) Extended events with message size information", - xbt_cfgelm_int, &default_display_sizes, 0, 1, + xbt_cfgelm_int, NULL, 0, 1, NULL, NULL); + xbt_cfg_setdefault_int(_sg_cfg_set, OPT_TRACING_DISPLAY_SIZES, 0); /* comment */ - char *default_tracing_comment = xbt_strdup (""); xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_COMMENT, "Comment to be added on the top of the trace file.", - xbt_cfgelm_string, &default_tracing_comment, 1, 1, + xbt_cfgelm_string, NULL, 1, 1, NULL, NULL); + xbt_cfg_setdefault_string(_sg_cfg_set, OPT_TRACING_COMMENT, xbt_strdup("")); /* comment_file */ - char *default_tracing_comment_file = xbt_strdup (""); xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_COMMENT_FILE, "The contents of the file are added to the top of the trace file as comment.", - xbt_cfgelm_string, &default_tracing_comment_file, 1, 1, + xbt_cfgelm_string, NULL, 1, 1, NULL, NULL); + xbt_cfg_setdefault_string(_sg_cfg_set, OPT_TRACING_COMMENT_FILE, xbt_strdup("")); /* Viva graph configuration for uncategorized tracing */ - char *default_viva_uncat_conf_file = xbt_strdup (""); xbt_cfg_register(&_sg_cfg_set, OPT_VIVA_UNCAT_CONF, "Viva Graph configuration file for uncategorized resource utilization traces.", - xbt_cfgelm_string, &default_viva_uncat_conf_file, 1, 1, + xbt_cfgelm_string, NULL, 1, 1, NULL, NULL); + xbt_cfg_setdefault_string(_sg_cfg_set, OPT_VIVA_UNCAT_CONF, xbt_strdup("")); /* Viva graph configuration for uncategorized tracing */ - char *default_viva_cat_conf_file = xbt_strdup (""); xbt_cfg_register(&_sg_cfg_set, OPT_VIVA_CAT_CONF, "Viva Graph configuration file for categorized resource utilization traces.", - xbt_cfgelm_string, &default_viva_cat_conf_file, 1, 1, + xbt_cfgelm_string, NULL, 1, 1, NULL, NULL); + xbt_cfg_setdefault_string(_sg_cfg_set, OPT_VIVA_CAT_CONF, xbt_strdup("")); /* instrumentation can be considered configured now */ trace_configured = 1; diff --git a/src/simgrid/sg_config.c b/src/simgrid/sg_config.c index 1e7b8455a2..ee9263787d 100644 --- a/src/simgrid/sg_config.c +++ b/src/simgrid/sg_config.c @@ -94,7 +94,7 @@ static void sg_config_cmd_line(int *argc, char **argv) *argc = j; } if (shall_exit) { - _sg_init_status=1; // get everything cleanly cleaned on exit + _sg_init_status = 1; // get everything cleanly cleaned on exit exit(0); } } @@ -104,7 +104,7 @@ static void _sg_cfg_cb__workstation_model(const char *name, int pos) { char *val; - xbt_assert(_sg_init_status == 1, + xbt_assert(_sg_init_status < 2, "Cannot change the model after the initialization"); val = xbt_cfg_get_string(_sg_cfg_set, name); @@ -123,7 +123,7 @@ static void _sg_cfg_cb__cpu_model(const char *name, int pos) { char *val; - xbt_assert(_sg_init_status == 1, + xbt_assert(_sg_init_status < 2, "Cannot change the model after the initialization"); val = xbt_cfg_get_string(_sg_cfg_set, name); @@ -142,7 +142,7 @@ static void _sg_cfg_cb__optimization_mode(const char *name, int pos) { char *val; - xbt_assert(_sg_init_status == 1, + xbt_assert(_sg_init_status < 2, "Cannot change the model after the initialization"); val = xbt_cfg_get_string(_sg_cfg_set, name); @@ -161,7 +161,7 @@ static void _sg_cfg_cb__storage_mode(const char *name, int pos) { char *val; - xbt_assert(_sg_init_status == 1, + xbt_assert(_sg_init_status < 2, "Cannot change the model after the initialization"); val = xbt_cfg_get_string(_sg_cfg_set, name); @@ -180,7 +180,7 @@ static void _sg_cfg_cb__network_model(const char *name, int pos) { char *val; - xbt_assert(_sg_init_status == 1, + xbt_assert(_sg_init_status < 2, "Cannot change the model after the initialization"); val = xbt_cfg_get_string(_sg_cfg_set, name); @@ -233,7 +233,7 @@ static void _sg_cfg_cb__coll(const char *category, { char *val; - xbt_assert(_sg_init_status == 1, + xbt_assert(_sg_init_status < 2, "Cannot change the model after the initialization"); val = xbt_cfg_get_string(_sg_cfg_set, name); @@ -399,9 +399,6 @@ static void _sg_cfg_cb__gtnets_jitter_seed(const char *name, int pos) void sg_config_init(int *argc, char **argv) { char *description = xbt_malloc(1024), *p = description; - char *default_value; - double double_default_value; - int default_value_int; int i; /* Create the configuration support */ @@ -415,9 +412,9 @@ void sg_config_init(int *argc, char **argv) surf_cpu_model_description[i].name); sprintf(p, ".\n (use 'help' as a value to see the long description of each model)"); - default_value = xbt_strdup("Cas01"); xbt_cfg_register(&_sg_cfg_set, "cpu/model", description, xbt_cfgelm_string, - &default_value, 1, 1, &_sg_cfg_cb__cpu_model, NULL); + NULL, 1, 1, &_sg_cfg_cb__cpu_model, NULL); + xbt_cfg_setdefault_string(_sg_cfg_set, "cpu/model", xbt_strdup("Cas01")); sprintf(description, "The optimization modes to use for the CPU. Possible values: "); @@ -428,9 +425,9 @@ void sg_config_init(int *argc, char **argv) surf_optimization_mode_description[i].name); 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(&_sg_cfg_set, "cpu/optim", description, xbt_cfgelm_string, - &default_value, 1, 1, &_sg_cfg_cb__optimization_mode, NULL); + NULL, 1, 1, &_sg_cfg_cb__optimization_mode, NULL); + xbt_cfg_setdefault_string(_sg_cfg_set, "cpu/optim", xbt_strdup("Lazy")); sprintf(description, "The model to use for the storage. Possible values: "); @@ -441,10 +438,10 @@ void sg_config_init(int *argc, char **argv) surf_storage_model_description[i].name); sprintf(p, ".\n (use 'help' as a value to see the long description of each model)"); - default_value = xbt_strdup("default"); xbt_cfg_register(&_sg_cfg_set, "storage/model", description, xbt_cfgelm_string, - &default_value, 1, 1, &_sg_cfg_cb__storage_mode, + NULL, 1, 1, &_sg_cfg_cb__storage_mode, NULL); + xbt_cfg_setdefault_string(_sg_cfg_set, "storage/model", xbt_strdup("default")); /* ********************************************************************* */ /* TUTORIAL: New model */ @@ -457,10 +454,10 @@ void sg_config_init(int *argc, char **argv) surf_new_model_description[i].name); sprintf(p, ".\n (use 'help' as a value to see the long description of each model)"); - default_value = xbt_strdup("default"); xbt_cfg_register(&_sg_cfg_set, "new_model/model", description, xbt_cfgelm_string, - &default_value, 1, 1, &_sg_cfg_cb__storage_mode, + NULL, 1, 1, &_sg_cfg_cb__storage_mode, NULL); + xbt_cfg_setdefault_string(_sg_cfg_set, "new_model/model", xbt_strdup("default")); /* ********************************************************************* */ sprintf(description, @@ -472,10 +469,10 @@ void sg_config_init(int *argc, char **argv) surf_network_model_description[i].name); sprintf(p, ".\n (use 'help' as a value to see the long description of each model)"); - default_value = xbt_strdup("LV08"); xbt_cfg_register(&_sg_cfg_set, "network/model", description, xbt_cfgelm_string, - &default_value, 1, 1, &_sg_cfg_cb__network_model, + NULL, 1, 1, &_sg_cfg_cb__network_model, NULL); + xbt_cfg_setdefault_string(_sg_cfg_set, "network/model", xbt_strdup("LV08")); sprintf(description, "The optimization modes to use for the network. Possible values: "); @@ -486,9 +483,9 @@ void sg_config_init(int *argc, char **argv) surf_optimization_mode_description[i].name); 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(&_sg_cfg_set, "network/optim", description, xbt_cfgelm_string, - &default_value, 1, 1, &_sg_cfg_cb__optimization_mode, NULL); + NULL, 1, 1, &_sg_cfg_cb__optimization_mode, NULL); + xbt_cfg_setdefault_string(_sg_cfg_set, "network/optim", xbt_strdup("Lazy")); sprintf(description, "The model to use for the workstation. Possible values: "); @@ -499,10 +496,10 @@ void sg_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("default"); xbt_cfg_register(&_sg_cfg_set, "workstation/model", description, xbt_cfgelm_string, - &default_value, 1, 1, + NULL, 1, 1, &_sg_cfg_cb__workstation_model, NULL); + xbt_cfg_setdefault_string(_sg_cfg_set, "workstation/model", xbt_strdup("default")); xbt_free(description); @@ -524,16 +521,16 @@ void sg_config_init(int *argc, char **argv) xbt_cfgelm_double, NULL, 1, 1, /* default is set in network.c */ _sg_cfg_cb__sender_gap, NULL); - double_default_value = 1.0; // FIXME use setdefault everywhere here! xbt_cfg_register(&_sg_cfg_set, "network/latency_factor", "Correction factor to apply to the provided latency (default value set by network model)", - xbt_cfgelm_double, &double_default_value, 1, 1, + xbt_cfgelm_double, NULL, 1, 1, _sg_cfg_cb__latency_factor, NULL); - double_default_value = 1.0; + xbt_cfg_setdefault_double(_sg_cfg_set, "network/latency_factor", 1.0); xbt_cfg_register(&_sg_cfg_set, "network/bandwidth_factor", "Correction factor to apply to the provided bandwidth (default value set by network model)", - xbt_cfgelm_double, &double_default_value, 1, 1, + xbt_cfgelm_double, NULL, 1, 1, _sg_cfg_cb__bandwidth_factor, NULL); + xbt_cfg_setdefault_double(_sg_cfg_set, "network/bandwidth_factor", 1.0); xbt_cfg_register(&_sg_cfg_set, "network/weight_S", "Correction factor to apply to the weight of competing streams (default value set by network model)", @@ -625,42 +622,42 @@ void sg_config_init(int *argc, char **argv) xbt_cfg_setdefault_boolean(_sg_cfg_set, "verbose-exit", "yes"); /* context factory */ - default_value = xbt_strdup("ucontext"); xbt_cfg_register(&_sg_cfg_set, "contexts/factory", "Context factory to use in SIMIX (ucontext, thread or raw)", - xbt_cfgelm_string, &default_value, 1, 1, _sg_cfg_cb_context_factory, NULL); + xbt_cfgelm_string, NULL, 1, 1, _sg_cfg_cb_context_factory, NULL); + xbt_cfg_setdefault_string(_sg_cfg_set, "contexts/factory", xbt_strdup("ucontext")); /* stack size of contexts in Ko */ - default_value_int = 128; xbt_cfg_register(&_sg_cfg_set, "contexts/stack_size", "Stack size of contexts in Kib (ucontext or raw only)", - xbt_cfgelm_int, &default_value_int, 1, 1, + xbt_cfgelm_int, NULL, 1, 1, _sg_cfg_cb_context_stack_size, NULL); + xbt_cfg_setdefault_int(_sg_cfg_set, "contexts/stack_size", 128); /* number of parallel threads for user processes */ - default_value_int = 1; xbt_cfg_register(&_sg_cfg_set, "contexts/nthreads", "Number of parallel threads used to execute user contexts", - xbt_cfgelm_int, &default_value_int, 1, 1, + xbt_cfgelm_int, NULL, 1, 1, _sg_cfg_cb_contexts_nthreads, NULL); + xbt_cfg_setdefault_int(_sg_cfg_set, "contexts/nthreads", 1); /* minimal number of user contexts to be run in parallel */ - default_value_int = 2; xbt_cfg_register(&_sg_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, + xbt_cfgelm_int, NULL, 1, 1, _sg_cfg_cb_contexts_parallel_threshold, NULL); + xbt_cfg_setdefault_int(_sg_cfg_set, "contexts/parallel_threshold", 2); /* synchronization mode for parallel user contexts */ -#ifdef HAVE_FUTEX_H - default_value = xbt_strdup("futex"); -#else //No futex on mac and posix is unimplememted yet - default_value = xbt_strdup("busy_wait"); -#endif xbt_cfg_register(&_sg_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, + xbt_cfgelm_string, NULL, 1, 1, _sg_cfg_cb_contexts_parallel_mode, NULL); +#ifdef HAVE_FUTEX_H + xbt_cfg_setdefault_string(_sg_cfg_set, "contexts/synchro", xbt_strdup("futex")); +#else //No futex on mac and posix is unimplememted yet + xbt_cfg_setdefault_string(_sg_cfg_set, "contexts/synchro", xbt_strdup("busy_wait")); +#endif xbt_cfg_register(&_sg_cfg_set, "network/coordinates", "\"yes\" or \"no\", specifying whether we use a coordinate-based routing (as Vivaldi)", @@ -681,11 +678,11 @@ void sg_config_init(int *argc, char **argv) _sg_cfg_cb__gtnets_jitter, NULL); xbt_cfg_setdefault_double(_sg_cfg_set, "gtnets/jitter", 0.0); - default_value_int = 10; xbt_cfg_register(&_sg_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, + xbt_cfgelm_int, NULL, 0, 1, _sg_cfg_cb__gtnets_jitter_seed, NULL); + xbt_cfg_setdefault_int(_sg_cfg_set, "gtnets/jitter_seed", 10); #endif #ifdef HAVE_NS3 xbt_cfg_register(&_sg_cfg_set, "ns3/TcpModel", @@ -696,11 +693,11 @@ void sg_config_init(int *argc, char **argv) #endif #ifdef HAVE_SMPI - double default_reference_speed = 20000.0; xbt_cfg_register(&_sg_cfg_set, "smpi/running_power", "Power of the host running the simulation (in flop/s). Used to bench the operations.", - xbt_cfgelm_double, &default_reference_speed, 1, 1, NULL, + xbt_cfgelm_double, NULL, 1, 1, NULL, NULL); + xbt_cfg_setdefault_double(_sg_cfg_set, "smpi/running_power", 20000.0); xbt_cfg_register(&_sg_cfg_set, "smpi/display_timing", "Boolean indicating whether we should display the timing after simulation.", @@ -714,23 +711,23 @@ void sg_config_init(int *argc, char **argv) NULL); xbt_cfg_setdefault_boolean(_sg_cfg_set, "smpi/use_shared_malloc", "yes"); - double default_threshold = 1e-6; xbt_cfg_register(&_sg_cfg_set, "smpi/cpu_threshold", "Minimal computation time (in seconds) not discarded.", - xbt_cfgelm_double, &default_threshold, 1, 1, NULL, + xbt_cfgelm_double, NULL, 1, 1, NULL, NULL); + xbt_cfg_setdefault_double(_sg_cfg_set, "smpi/cpu_threshold", 1e-6); - int default_small_messages_threshold = 0; xbt_cfg_register(&_sg_cfg_set, "smpi/async_small_thres", "Maximal size of messages that are to be sent asynchronously, without waiting for the receiver", - xbt_cfgelm_int, &default_small_messages_threshold, 1, 1, NULL, + xbt_cfgelm_int, NULL, 1, 1, NULL, NULL); + xbt_cfg_setdefault_int(_sg_cfg_set, "smpi/async_small_thres", 0); - int default_send_is_detached_threshold = 65536; xbt_cfg_register(&_sg_cfg_set, "smpi/send_is_detached_thres", "Threshold of message size where MPI_Send stops behaving like MPI_Isend and becomes MPI_Ssend", - xbt_cfgelm_int, &default_send_is_detached_threshold, 1, 1, NULL, + xbt_cfgelm_int, NULL, 1, 1, NULL, NULL); + xbt_cfg_setdefault_int(_sg_cfg_set, "smpi/send_is_detached_thres", 65536); //For smpi/bw_factor and smpi/lat_factor //Default value have to be "threshold0:value0;threshold1:value1;...;thresholdN:valueN" @@ -766,16 +763,16 @@ void sg_config_init(int *argc, char **argv) xbt_cfgelm_string, NULL, 1, 1, NULL, NULL); xbt_cfg_setdefault_string(_sg_cfg_set, "smpi/or", "1:0:0:0:0"); - double default_iprobe_time = 1e-4; xbt_cfg_register(&_sg_cfg_set, "smpi/iprobe", "Minimum time to inject inside a call to MPI_Iprobe", - xbt_cfgelm_double, &default_iprobe_time, 1, 1, NULL, + xbt_cfgelm_double, NULL, 1, 1, NULL, NULL); - default_value = xbt_strdup("default"); + xbt_cfg_setdefault_double(_sg_cfg_set, "smpi/iprobe", 1e-4); xbt_cfg_register(&_sg_cfg_set, "smpi/coll_selector", "Which collective selector to use", - xbt_cfgelm_string, &default_value, 1, 1, NULL, + xbt_cfgelm_string, NULL, 1, 1, NULL, NULL); + xbt_cfg_setdefault_string(_sg_cfg_set, "smpi/coll_selector", xbt_strdup("default")); xbt_cfg_register(&_sg_cfg_set, "smpi/gather", "Which collective to use for gather",