From 10f32e547af21144c3bda7915005b12ada659e18 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 3 Apr 2016 22:26:08 +0200 Subject: [PATCH] further rework the option mechanism --- include/xbt/config.h | 10 +- src/instr/instr_config.cpp | 15 +-- src/simgrid/sg_config.cpp | 264 +++++++++++-------------------------- src/xbt/config.c | 40 +++--- 4 files changed, 111 insertions(+), 218 deletions(-) diff --git a/include/xbt/config.h b/include/xbt/config.h index 1373a8ff06..a1ba9926f6 100644 --- a/include/xbt/config.h +++ b/include/xbt/config.h @@ -161,11 +161,11 @@ XBT_PUBLIC(void) xbt_cfg_dump(const char *name, const char *indent, xbt_cfg_t cf */ XBT_PUBLIC(void) xbt_cfg_register(xbt_cfg_t * cfg, const char *name, const char *description, e_xbt_cfgelm_type_t type, int min, int max, xbt_cfg_cb_t cb_set); -XBT_PUBLIC(void) xbt_cfg_register_double (xbt_cfg_t * cfg, const char *name, const char *desc, double default_val, xbt_cfg_cb_t cb_set); -XBT_PUBLIC(void) xbt_cfg_register_int (xbt_cfg_t * cfg, const char *name, const char *desc, int default_val, xbt_cfg_cb_t cb_set); -XBT_PUBLIC(void) xbt_cfg_register_string (xbt_cfg_t * cfg, const char *name, const char *desc, const char*default_val,xbt_cfg_cb_t cb_set); -XBT_PUBLIC(void) xbt_cfg_register_boolean(xbt_cfg_t * cfg, const char *name, const char *desc, const char*default_val,xbt_cfg_cb_t cb_set); -XBT_PUBLIC(void) xbt_cfg_register_alias(xbt_cfg_t * cfg, const char *newname, const char *oldname); +XBT_PUBLIC(void) xbt_cfg_register_double (const char *name, const char *desc, double default_val, xbt_cfg_cb_t cb_set); +XBT_PUBLIC(void) xbt_cfg_register_int (const char *name, const char *desc, int default_val, xbt_cfg_cb_t cb_set); +XBT_PUBLIC(void) xbt_cfg_register_string (const char *name, const char *desc, const char*default_val,xbt_cfg_cb_t cb_set); +XBT_PUBLIC(void) xbt_cfg_register_boolean(const char *name, const char *desc, const char*default_val,xbt_cfg_cb_t cb_set); +XBT_PUBLIC(void) xbt_cfg_register_alias(const char *newname, const char *oldname); XBT_PUBLIC(void) xbt_cfg_unregister(xbt_cfg_t cfg, const char *name); XBT_PUBLIC(void) xbt_cfg_register_str(xbt_cfg_t * cfg, const char *entry); diff --git a/src/instr/instr_config.cpp b/src/instr/instr_config.cpp index 5237dfbf60..f3e0a571aa 100644 --- a/src/instr/instr_config.cpp +++ b/src/instr/instr_config.cpp @@ -357,14 +357,13 @@ void TRACE_global_init(int *argc, char **argv) is_initialised = 1; /* name of the tracefile */ - xbt_cfg_register_string (&_sg_cfg_set, OPT_TRACING_FILENAME, "Trace file created by the instrumented SimGrid.", "simgrid.trace", NULL); - xbt_cfg_register_boolean(&_sg_cfg_set, OPT_TRACING, "Enable Tracing.", "no", NULL); - xbt_cfg_register_boolean(&_sg_cfg_set, OPT_TRACING_PLATFORM, "Register the platform in the trace as a hierarchy.", "no", NULL); - xbt_cfg_register_boolean(&_sg_cfg_set, OPT_TRACING_TOPOLOGY, "Register the platform topology in the trace as a graph.", "yes", NULL); - xbt_cfg_register_boolean(&_sg_cfg_set, OPT_TRACING_SMPI, "Tracing of the SMPI interface.", "no", NULL); - xbt_cfg_register_boolean(&_sg_cfg_set, OPT_TRACING_SMPI_GROUP, "Group MPI processes by host.", "no", NULL); - xbt_cfg_register_boolean(&_sg_cfg_set, OPT_TRACING_SMPI_COMPUTING, - "Generate states for timing out of SMPI parts of the application", "no", NULL); + xbt_cfg_register_string (OPT_TRACING_FILENAME, "Trace file created by the instrumented SimGrid.", "simgrid.trace", NULL); + xbt_cfg_register_boolean(OPT_TRACING, "Enable Tracing.", "no", NULL); + xbt_cfg_register_boolean(OPT_TRACING_PLATFORM, "Register the platform in the trace as a hierarchy.", "no", NULL); + xbt_cfg_register_boolean(OPT_TRACING_TOPOLOGY, "Register the platform topology in the trace as a graph.", "yes", NULL); + xbt_cfg_register_boolean(OPT_TRACING_SMPI, "Tracing of the SMPI interface.", "no", NULL); + xbt_cfg_register_boolean(OPT_TRACING_SMPI_GROUP, "Group MPI processes by host.", "no", NULL); + xbt_cfg_register_boolean(OPT_TRACING_SMPI_COMPUTING, "Generate states for timing out of SMPI parts of the application", "no", NULL); /* smpi sleeping */ xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_SMPI_SLEEPING, diff --git a/src/simgrid/sg_config.cpp b/src/simgrid/sg_config.cpp index 22bd4467d2..a95f1b6f13 100644 --- a/src/simgrid/sg_config.cpp +++ b/src/simgrid/sg_config.cpp @@ -28,7 +28,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_config, surf, "About the configuration of SimGrid"); -xbt_cfg_t _sg_cfg_set = NULL; /* 0: beginning of time (config cannot be changed yet); * 1: initialized: cfg_set created (config can now be changed); @@ -498,143 +497,99 @@ void sg_config_init(int *argc, char **argv) xbt_cfgelm_string, 0, 1, &_sg_cfg_cb__plugin); describe_model(description, surf_cpu_model_description, "model", "The model to use for the CPU"); - xbt_cfg_register_string(&_sg_cfg_set, "cpu/model", description, "Cas01", &_sg_cfg_cb__cpu_model); + xbt_cfg_register_string("cpu/model", description, "Cas01", &_sg_cfg_cb__cpu_model); describe_model(description, surf_optimization_mode_description, "optimization mode", "The optimization modes to use for the CPU"); - xbt_cfg_register_string(&_sg_cfg_set, "cpu/optim", description, "Lazy", &_sg_cfg_cb__optimization_mode); + xbt_cfg_register_string("cpu/optim", description, "Lazy", &_sg_cfg_cb__optimization_mode); describe_model(description, surf_storage_model_description, "model", "The model to use for the storage"); - xbt_cfg_register_string(&_sg_cfg_set, "storage/model", description, "default", &_sg_cfg_cb__storage_mode); + xbt_cfg_register_string("storage/model", description, "default", &_sg_cfg_cb__storage_mode); describe_model(description, surf_network_model_description, "model", "The model to use for the network"); - xbt_cfg_register_string(&_sg_cfg_set, "network/model", description, "LV08", &_sg_cfg_cb__network_model); + xbt_cfg_register_string("network/model", description, "LV08", &_sg_cfg_cb__network_model); describe_model(description, surf_optimization_mode_description, "optimization mode", "The optimization modes to use for the network"); - xbt_cfg_register_string(&_sg_cfg_set, "network/optim", description, "Lazy", &_sg_cfg_cb__optimization_mode); + xbt_cfg_register_string("network/optim", description, "Lazy", &_sg_cfg_cb__optimization_mode); describe_model(description, surf_host_model_description, "model", "The model to use for the host"); - xbt_cfg_register_string(&_sg_cfg_set, "host/model", description, "default", &_sg_cfg_cb__host_model); + xbt_cfg_register_string("host/model", description, "default", &_sg_cfg_cb__host_model); describe_model(description, surf_vm_model_description, "model", "The model to use for the vm"); - xbt_cfg_register_string(&_sg_cfg_set, "vm/model", description, "default", &_sg_cfg_cb__vm_model); + xbt_cfg_register_string("vm/model", description, "default", &_sg_cfg_cb__vm_model); - xbt_cfg_register_double(&_sg_cfg_set, "network/TCP_gamma", + xbt_cfg_register_double("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)", 4194304.0, _sg_cfg_cb__tcp_gamma); - xbt_cfg_register_double(&_sg_cfg_set, "surf/precision", "Numerical precision used when updating simulation times (in seconds)", + xbt_cfg_register_double("surf/precision", "Numerical precision used when updating simulation times (in seconds)", 0.00001, _sg_cfg_cb__surf_precision); - xbt_cfg_register_double(&_sg_cfg_set, "maxmin/precision", + xbt_cfg_register_double("maxmin/precision", "Numerical precision used when computing resource sharing (in ops/sec or bytes/sec)", 0.00001, _sg_cfg_cb__maxmin_precision); /* The parameters of network models */ - xbt_cfg_register_double(&_sg_cfg_set, "network/sender_gap", "Minimum gap between two overlapping sends", - NAN, _sg_cfg_cb__sender_gap); /* real default for "network/sender_gap" is set in network_smpi.cpp */ - xbt_cfg_register_double(&_sg_cfg_set, "network/latency_factor", - "Correction factor to apply to the provided latency (default value set by network model)", + xbt_cfg_register_double("network/sender_gap", "Minimum gap between two overlapping sends", NAN, _sg_cfg_cb__sender_gap); /* real default for "network/sender_gap" is set in network_smpi.cpp */ + xbt_cfg_register_double("network/latency_factor", "Correction factor to apply to the provided latency (default value set by network model)", 1.0, _sg_cfg_cb__latency_factor); - xbt_cfg_register_double(&_sg_cfg_set, "network/bandwidth_factor", - "Correction factor to apply to the provided bandwidth (default value set by network model)", + xbt_cfg_register_double("network/bandwidth_factor", "Correction factor to apply to the provided bandwidth (default value set by network model)", 1.0, _sg_cfg_cb__bandwidth_factor); - xbt_cfg_register_double(&_sg_cfg_set, "network/weight_S", + xbt_cfg_register_double("network/weight_S", "Correction factor to apply to the weight of competing streams (default value set by network model)", NAN, _sg_cfg_cb__weight_S); /* real default for "network/weight_S" is set in network_*.cpp */ /* Inclusion path */ - xbt_cfg_register(&_sg_cfg_set, "path", - "Lookup path for inclusions in platform and deployment XML files", + xbt_cfg_register(&_sg_cfg_set, "path", "Lookup path for inclusions in platform and deployment XML files", xbt_cfgelm_string, 1, 0, _sg_cfg_cb__surf_path); - xbt_cfg_register_boolean(&_sg_cfg_set, "cpu/maxmin_selective_update", + xbt_cfg_register_boolean("cpu/maxmin_selective_update", "Update the constraint set propagating recursively to others constraints (off by default when optim is set to lazy)", "no", NULL); - xbt_cfg_register_boolean(&_sg_cfg_set, "network/maxmin_selective_update", + xbt_cfg_register_boolean("network/maxmin_selective_update", "Update the constraint set propagating recursively to others constraints (off by default when optim is set to lazy)", "no", NULL); /* Replay (this part is enabled even if MC it disabled) */ - xbt_cfg_register(&_sg_cfg_set, "model-check/replay", - "Enable replay mode with the given path", xbt_cfgelm_string, 0, 1, _sg_cfg_cb_model_check_replay); + xbt_cfg_register(&_sg_cfg_set, "model-check/replay", "Enable replay mode with the given path", xbt_cfgelm_string, 0, 1, _sg_cfg_cb_model_check_replay); #if HAVE_MC /* do model-checking-record */ - xbt_cfg_register_boolean(&_sg_cfg_set, "model-check/record", "Record the model-checking paths", - "no", _sg_cfg_cb_model_check_record); + xbt_cfg_register_boolean("model-check/record", "Record the model-checking paths", "no", _sg_cfg_cb_model_check_record); - /* do stateful model-checking */ - xbt_cfg_register_int(&_sg_cfg_set, "model-check/checkpoint", + xbt_cfg_register_int("model-check/checkpoint", "Specify the amount of steps between checkpoints during stateful model-checking (default: 0 => stateless verification). " "If value=1, one checkpoint is saved for each step => faster verification, but huge memory consumption; higher values are good compromises between speed and memory consumption.", 0, _mc_cfg_cb_checkpoint); - /* do stateful model-checking */ - xbt_cfg_register_boolean(&_sg_cfg_set, "model-check/sparse_checkpoint", "Use sparse per-page snapshots.", - "no", _mc_cfg_cb_sparse_checkpoint); + xbt_cfg_register_boolean("model-check/sparse_checkpoint", "Use sparse per-page snapshots.", "no", _mc_cfg_cb_sparse_checkpoint); + xbt_cfg_register_boolean("model-check/soft-dirty", "Use sparse per-page snapshots.", "no", _mc_cfg_cb_soft_dirty); + xbt_cfg_register_boolean("model-check/ksm", "Kernel same-page merging", "no", _mc_cfg_cb_ksm); - /* do stateful model-checking */ - xbt_cfg_register_boolean(&_sg_cfg_set, "model-check/soft-dirty", "Use sparse per-page snapshots.", - "no", _mc_cfg_cb_soft_dirty); + xbt_cfg_register_string("model-check/property", "Name of the file containing the property, as formated by the ltl2ba program.", + "", _mc_cfg_cb_property); - xbt_cfg_register(&_sg_cfg_set, "model-check/ksm", - "Kernel same-page merging", - xbt_cfgelm_boolean, 1, 1, _mc_cfg_cb_ksm); - xbt_cfg_setdefault_boolean(_sg_cfg_set, "model-check/ksm", "no"); + xbt_cfg_register_boolean("model-check/communications_determinism", + "Whether to enable the detection of communication determinism", "no", _mc_cfg_cb_comms_determinism); - /* 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.", - xbt_cfgelm_string, 1, 1, _mc_cfg_cb_property); - xbt_cfg_setdefault_string(_sg_cfg_set, "model-check/property", ""); - - /* do communications determinism model-checking */ - xbt_cfg_register_boolean(&_sg_cfg_set, "model-check/communications_determinism", - "Enable/disable the detection of determinism in the communications schemes", "no", _mc_cfg_cb_comms_determinism); - - /* do send determinism model-checking */ - xbt_cfg_register_boolean(&_sg_cfg_set, "model-check/send_determinism", + xbt_cfg_register_boolean("model-check/send_determinism", "Enable/disable the detection of send-determinism in the communications schemes", "no", _mc_cfg_cb_send_determinism); /* Specify the kind of model-checking reduction */ - xbt_cfg_register_string(&_sg_cfg_set, "model-check/reduction", "Specify the kind of exploration reduction (either none or DPOR)", - "dpor", _mc_cfg_cb_reduce); - - /* Enable/disable timeout for wait requests with model-checking */ - xbt_cfg_register_boolean(&_sg_cfg_set, "model-check/timeout", "Enable/Disable timeout for wait requests", "no", - _mc_cfg_cb_timeout); - - /* Enable/disable global hash computation with model-checking */ - xbt_cfg_register_boolean(&_sg_cfg_set, "model-check/hash", "Enable/Disable state hash for state comparison (experimental)", "no", - _mc_cfg_cb_hash); - - /* Set max depth exploration */ - xbt_cfg_register_boolean(&_sg_cfg_set, "model-check/snapshot_fds", "Whether file descriptors must be snapshoted (currently unusable)", "no", - _mc_cfg_cb_snapshot_fds); - - /* Set max depth exploration */ - xbt_cfg_register_int(&_sg_cfg_set, "model-check/max_depth", "Specify the max depth of exploration (default: 1000)", 1000, - _mc_cfg_cb_max_depth); - - /* Set number of visited state stored for state comparison reduction*/ - xbt_cfg_register_int(&_sg_cfg_set, "model-check/visited", - "Specify the number of visited state stored for state comparison reduction. If value=5, the last 5 visited states are stored", - 0, _mc_cfg_cb_visited); - - /* Set file name for dot output of graph state */ - xbt_cfg_register_string(&_sg_cfg_set, "model-check/dot_output", - "Specify the name of dot file corresponding to graph state", - "", _mc_cfg_cb_dot_output); - - /* Enable/disable non progressive cycles detection with model-checking */ - xbt_cfg_register_boolean(&_sg_cfg_set, "model-check/termination", - "Enable/Disable non progressive cycle detection", - "no", _mc_cfg_cb_termination); + xbt_cfg_register_string("model-check/reduction", "Specify the kind of exploration reduction (either none or DPOR)", "dpor", _mc_cfg_cb_reduce); + xbt_cfg_register_boolean("model-check/timeout", "Whether to enable timeouts for wait requests", "no", _mc_cfg_cb_timeout); + + xbt_cfg_register_boolean("model-check/hash", "Whether to enable state hash for state comparison (experimental)", "no", _mc_cfg_cb_hash); + xbt_cfg_register_boolean("model-check/snapshot_fds", "Whether file descriptors must be snapshoted (currently unusable)", "no", _mc_cfg_cb_snapshot_fds); + xbt_cfg_register_int("model-check/max_depth", "Maximal exploration depth (default: 1000)", 1000, _mc_cfg_cb_max_depth); + xbt_cfg_register_int("model-check/visited", + "Specify the number of visited state stored for state comparison reduction. If value=5, the last 5 visited states are stored. If value=0 (the default), all states are stored.", + 0, _mc_cfg_cb_visited); + + xbt_cfg_register_string("model-check/dot_output", "Name of dot output file corresponding to graph state", "", _mc_cfg_cb_dot_output); + xbt_cfg_register_boolean("model-check/termination", "Whether to enable non progressive cycle detection", "no", _mc_cfg_cb_termination); #endif - /* do verbose-exit */ - xbt_cfg_register_boolean(&_sg_cfg_set, "verbose-exit", "Activate the \"do nothing\" mode in Ctrl-C", - "yes", _sg_cfg_cb_verbose_exit); + xbt_cfg_register_boolean("verbose-exit", "Activate the \"do nothing\" mode in Ctrl-C", "yes", _sg_cfg_cb_verbose_exit); /* context factory */ const char *dflt_ctx_fact = "thread"; @@ -653,55 +608,43 @@ void sg_config_init(int *argc, char **argv) #endif sprintf(p, "."); } - xbt_cfg_register_string(&_sg_cfg_set, "contexts/factory", description, dflt_ctx_fact, _sg_cfg_cb_context_factory); + xbt_cfg_register_string("contexts/factory", description, dflt_ctx_fact, _sg_cfg_cb_context_factory); - /* stack size of contexts in KiB */ - xbt_cfg_register_int(&_sg_cfg_set, "contexts/stack_size", "Stack size of contexts in KiB", - 8*1024, _sg_cfg_cb_context_stack_size); + xbt_cfg_register_int("contexts/stack_size", "Stack size of contexts in KiB", 8*1024, _sg_cfg_cb_context_stack_size); /* (FIXME: this is unpleasant) Reset this static variable that was altered when setting the default value. */ smx_context_stack_size_was_set = 0; /* guard size for contexts stacks in memory pages */ - xbt_cfg_register(&_sg_cfg_set, "contexts/guard_size", - "Guard size for contexts stacks in memory pages", - xbt_cfgelm_int, 1, 1, _sg_cfg_cb_context_guard_size); + xbt_cfg_register_int("contexts/guard_size", "Guard size for contexts stacks in memory pages", #if defined(_WIN32) || (PTH_STACKGROWTH != -1) - xbt_cfg_setdefault_int(_sg_cfg_set, "contexts/guard_size", 0); + 0, _sg_cfg_cb_context_guard_size); #else - xbt_cfg_setdefault_int(_sg_cfg_set, "contexts/guard_size", 1); + 1, _sg_cfg_cb_context_guard_size); #endif /* No, it was not set yet (the above setdefault() changed this to 1). */ smx_context_guard_size_was_set = 0; - /* number of parallel threads for user processes */ - xbt_cfg_register_int(&_sg_cfg_set, "contexts/nthreads", - "Number of parallel threads used to execute user contexts", - 1, _sg_cfg_cb_contexts_nthreads); + xbt_cfg_register_int("contexts/nthreads", "Number of parallel threads used to execute user contexts", 1, _sg_cfg_cb_contexts_nthreads); - /* minimal number of user contexts to be run in parallel */ - xbt_cfg_register_int(&_sg_cfg_set, "contexts/parallel_threshold", - "Minimal number of user contexts to be run in parallel (raw contexts only)", - 2, _sg_cfg_cb_contexts_parallel_threshold); + xbt_cfg_register_int("contexts/parallel_threshold", "Minimal number of user contexts to be run in parallel (raw contexts only)", + 2, _sg_cfg_cb_contexts_parallel_threshold); /* synchronization mode for parallel user contexts */ - xbt_cfg_register_string(&_sg_cfg_set, "contexts/synchro", - "Synchronization mode to use when running contexts in parallel (either futex, posix or busy_wait)", + xbt_cfg_register_string("contexts/synchro", "Synchronization mode to use when running contexts in parallel (either futex, posix or busy_wait)", #if HAVE_FUTEX_H "futex", _sg_cfg_cb_contexts_parallel_mode); #else //No futex on mac and posix is unimplememted yet "busy_wait", _sg_cfg_cb_contexts_parallel_mode); #endif - xbt_cfg_register_boolean(&_sg_cfg_set, "network/coordinates", - "\"yes\" or \"no\", specifying whether we use a coordinate-based routing (as Vivaldi)", - "no", _sg_cfg_cb__surf_network_coordinates); + xbt_cfg_register_boolean("network/coordinates", "Whether we use a coordinate-based routing (as Vivaldi)", + "no", _sg_cfg_cb__surf_network_coordinates); - xbt_cfg_register_boolean(&_sg_cfg_set, "network/crosstraffic", - "Activate the interferences between uploads and downloads for fluid max-min models (LV08, CM02)", - "yes", _sg_cfg_cb__surf_network_crosstraffic); + xbt_cfg_register_boolean("network/crosstraffic", "Activate the interferences between uploads and downloads for fluid max-min models (LV08, CM02)", + "yes", _sg_cfg_cb__surf_network_crosstraffic); #if HAVE_NS3 - xbt_cfg_register_string(&_sg_cfg_set, "ns3/TcpModel", "The ns3 tcp model can be : NewReno or Reno or Tahoe", "default", NULL); + xbt_cfg_register_string("ns3/TcpModel", "The ns3 tcp model can be : NewReno or Reno or Tahoe", "default", NULL); #endif //For smpi/bw_factor and smpi/lat_factor @@ -710,80 +653,34 @@ void sg_config_init(int *argc, char **argv) //Values can be modified with command line --cfg=smpi/bw_factor:"threshold0:value0;threshold1:value1;...;thresholdN:valueN" // or with tag config put line // SMPI model can be used without enable_smpi, so keep this out of the ifdef. - xbt_cfg_register_string(&_sg_cfg_set, "smpi/bw_factor", "Bandwidth factors for smpi.", + xbt_cfg_register_string("smpi/bw_factor", "Bandwidth factors for smpi.", "65472:0.940694;15424:0.697866;9376:0.58729;5776:1.08739;3484:0.77493;1426:0.608902;732:0.341987;257:0.338112;0:0.812084", NULL); - xbt_cfg_register_string(&_sg_cfg_set, "smpi/lat_factor", "Latency factors for smpi.", + xbt_cfg_register_string("smpi/lat_factor", "Latency factors for smpi.", "65472:11.6436;15424:3.48845;9376:2.59299;5776:2.18796;3484:1.88101;1426:1.61075;732:1.9503;257:1.95341;0:2.01467", NULL); - xbt_cfg_register_string(&_sg_cfg_set, "smpi/IB_penalty_factors", + xbt_cfg_register_string("smpi/IB_penalty_factors", "Correction factor to communications using Infiniband model with contention (default value based on Stampede cluster profiling)", "0.965;0.925;1.35", NULL); #if HAVE_SMPI - xbt_cfg_register_double(&_sg_cfg_set, "smpi/running_power", - "Power of the host running the simulation (in flop/s). Used to bench the operations.", 20000.0, NULL); - - xbt_cfg_register_boolean(&_sg_cfg_set, "smpi/display_timing", - "Boolean indicating whether we should display the timing after simulation.", "no", NULL); - - xbt_cfg_register_boolean(&_sg_cfg_set, "smpi/simulate_computation", - "Boolean indicating whether the computational part of the simulated application should be simulated.", "yes", NULL); - - xbt_cfg_register(&_sg_cfg_set, "smpi/use_shared_malloc", - "Boolean indicating whether we should use shared memory when using SMPI_SHARED_MALLOC. Allows user to disable it for debug purposes.", - xbt_cfgelm_boolean, 1, 1, NULL); - xbt_cfg_setdefault_boolean(_sg_cfg_set, "smpi/use_shared_malloc", "yes"); - - xbt_cfg_register(&_sg_cfg_set, "smpi/cpu_threshold", - "Minimal computation time (in seconds) not discarded, or -1 for infinity.", - xbt_cfgelm_double, 1, 1, NULL); - xbt_cfg_setdefault_double(_sg_cfg_set, "smpi/cpu_threshold", 1e-6); - - xbt_cfg_register(&_sg_cfg_set, "smpi/async_small_thresh", - "Maximal size of messages that are to be sent asynchronously, without waiting for the receiver", - xbt_cfgelm_int, 1, 1, NULL); - xbt_cfg_setdefault_int(_sg_cfg_set, "smpi/async_small_thresh", 0); - - xbt_cfg_register(&_sg_cfg_set, "smpi/send_is_detached_thresh", - "Threshold of message size where MPI_Send stops behaving like MPI_Isend and becomes MPI_Ssend", - xbt_cfgelm_int, 1, 1, NULL); - xbt_cfg_setdefault_int(_sg_cfg_set, "smpi/send_is_detached_thresh", 65536); - - xbt_cfg_register(&_sg_cfg_set, "smpi/privatize_global_variables", - "Boolean indicating whether we should privatize global variable at runtime.", - xbt_cfgelm_boolean, 1, 1, NULL); - xbt_cfg_setdefault_boolean(_sg_cfg_set, "smpi/privatize_global_variables", "no"); - - xbt_cfg_register(&_sg_cfg_set, "smpi/os", - "Small messages timings (MPI_Send minimum time for small messages)", - xbt_cfgelm_string, 1, 1, NULL); - xbt_cfg_setdefault_string(_sg_cfg_set, "smpi/os", "1:0:0:0:0"); - - xbt_cfg_register(&_sg_cfg_set, "smpi/ois", - "Small messages timings (MPI_Isend minimum time for small messages)", - xbt_cfgelm_string, 1, 1, NULL); - xbt_cfg_setdefault_string(_sg_cfg_set, "smpi/ois", "1:0:0:0:0"); - - xbt_cfg_register(&_sg_cfg_set, "smpi/or", - "Small messages timings (MPI_Recv minimum time for small messages)", - xbt_cfgelm_string, 1, 1, NULL); - xbt_cfg_setdefault_string(_sg_cfg_set, "smpi/or", "1:0:0:0:0"); - - xbt_cfg_register(&_sg_cfg_set, "smpi/iprobe", - "Minimum time to inject inside a call to MPI_Iprobe", - xbt_cfgelm_double, 1, 1, _sg_cfg_cb__iprobe_sleep); - xbt_cfg_setdefault_double(_sg_cfg_set, "smpi/iprobe", 1e-4); - - xbt_cfg_register(&_sg_cfg_set, "smpi/test", - "Minimum time to inject inside a call to MPI_Test", - xbt_cfgelm_double, 1, 1, _sg_cfg_cb__test_sleep); - xbt_cfg_setdefault_double(_sg_cfg_set, "smpi/test", 1e-4); - - xbt_cfg_register(&_sg_cfg_set, "smpi/wtime", - "Minimum time to inject inside a call to MPI_Wtime", - xbt_cfgelm_double, 1, 1, _sg_cfg_cb__wtime_sleep); - xbt_cfg_setdefault_double(_sg_cfg_set, "smpi/wtime", 0.0); + xbt_cfg_register_double("smpi/running_power", "Power of the host running the simulation (in flop/s). Used to bench the operations.", 20000.0, NULL); + xbt_cfg_register_boolean("smpi/display_timing", "Whether we should display the timing after simulation.", "no", NULL); + xbt_cfg_register_boolean("smpi/simulate_computation", "Whether the computational part of the simulated application should be simulated.", "yes", NULL); + xbt_cfg_register_boolean("smpi/use_shared_malloc", "Whether SMPI_SHARED_MALLOC is enabled. Disable it for debugging purposes.", "yes", NULL); + xbt_cfg_register_double("smpi/cpu_threshold", "Minimal computation time (in seconds) not discarded, or -1 for infinity.", 1e-6, NULL); + xbt_cfg_register_int("smpi/async_small_thresh", "Maximal size of messages that are to be sent asynchronously, without waiting for the receiver", + 0, NULL); + xbt_cfg_register_int("smpi/send_is_detached_thresh", "Threshold of message size where MPI_Send stops behaving like MPI_Isend and becomes MPI_Ssend", + 65536, NULL); + + xbt_cfg_register_boolean("smpi/privatize_global_variables", "Whether we should privatize global variable at runtime.", "no", NULL); + xbt_cfg_register_string("smpi/os", "Small messages timings (MPI_Send minimum time for small messages)", "1:0:0:0:0", NULL); + xbt_cfg_register_string("smpi/ois", "Small messages timings (MPI_Isend minimum time for small messages)", "1:0:0:0:0", NULL); + xbt_cfg_register_string("smpi/or", "Small messages timings (MPI_Recv minimum time for small messages)", "1:0:0:0:0", NULL); + xbt_cfg_register_double("smpi/iprobe", "Minimum time to inject inside a call to MPI_Iprobe", 1e-4, _sg_cfg_cb__iprobe_sleep); + xbt_cfg_register_double("smpi/test", "Minimum time to inject inside a call to MPI_Test", 1e-4, _sg_cfg_cb__test_sleep); + xbt_cfg_register_double("smpi/wtime", "Minimum time to inject inside a call to MPI_Wtime", 0.0, _sg_cfg_cb__wtime_sleep); xbt_cfg_register(&_sg_cfg_set, "smpi/coll_selector", "Which collective selector to use", @@ -835,15 +732,10 @@ void sg_config_init(int *argc, char **argv) xbt_cfgelm_string, 0, 1, &_sg_cfg_cb__coll_reduce); #endif // HAVE_SMPI - xbt_cfg_register(&_sg_cfg_set, "exception/cutpath", - "\"yes\" or \"no\". \"yes\" will cut all path information from call traces, used e.g. in exceptions.", - xbt_cfgelm_boolean, 1, 1, NULL); - xbt_cfg_setdefault_boolean(_sg_cfg_set, "exception/cutpath", "no"); + xbt_cfg_register_boolean("exception/cutpath", "Whether to cut all path information from call traces, used e.g. in exceptions.", "no", NULL); - xbt_cfg_register(&_sg_cfg_set, "clean_atexit", - "\"yes\" or \"no\". \"yes\" enables all the cleanups of SimGrid (XBT,SIMIX,MSG) to be registered with atexit. \"no\" may be useful if your code segfaults when calling the exit function.", - xbt_cfgelm_boolean, 1, 1, _sg_cfg_cb_clean_atexit); - xbt_cfg_setdefault_boolean(_sg_cfg_set, "clean_atexit", "yes"); + xbt_cfg_register_boolean("clean_atexit", "Whether to cleanup SimGrid (XBT,SIMIX,MSG) at exit. Disable it if your code segfaults at ending.", + "yes", _sg_cfg_cb_clean_atexit); if (!surf_path) { /* retrieves the current directory of the current process */ diff --git a/src/xbt/config.c b/src/xbt/config.c index cb0d0f4339..b87106d322 100644 --- a/src/xbt/config.c +++ b/src/xbt/config.c @@ -21,6 +21,8 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_cfg, xbt, "configuration support"); +xbt_cfg_t _sg_cfg_set = NULL; + /* xbt_cfgelm_t: the typedef corresponding to a config variable. Both data and DTD are mixed, but fixing it now would prevent me to ever defend my thesis. */ @@ -236,36 +238,36 @@ void xbt_cfg_register(xbt_cfg_t * cfg, const char *name, const char *desc, e_xbt xbt_dict_set((xbt_dict_t) * cfg, name, res, NULL); } -void xbt_cfg_register_double(xbt_cfg_t * cfg, const char *name, const char *desc, double default_value,xbt_cfg_cb_t cb_set){ - xbt_cfg_register(cfg,name,desc,xbt_cfgelm_double,1,1,cb_set); - xbt_cfg_setdefault_double(cfg, name, default_value); +void xbt_cfg_register_double(const char *name, const char *desc, double default_value,xbt_cfg_cb_t cb_set){ + xbt_cfg_register(_sg_cfg_set,name,desc,xbt_cfgelm_double,1,1,cb_set); + xbt_cfg_setdefault_double(_sg_cfg_set, name, default_value); } -void xbt_cfg_register_int(xbt_cfg_t * cfg, const char *name, const char *desc, int default_value,xbt_cfg_cb_t cb_set){ - xbt_cfg_register(cfg,name,desc,xbt_cfgelm_int,1,1,cb_set); - xbt_cfg_setdefault_int(cfg, name, default_value); +void xbt_cfg_register_int(const char *name, const char *desc, int default_value,xbt_cfg_cb_t cb_set){ + xbt_cfg_register(_sg_cfg_set,name,desc,xbt_cfgelm_int,1,1,cb_set); + xbt_cfg_setdefault_int(_sg_cfg_set, name, default_value); } -void xbt_cfg_register_string(xbt_cfg_t * cfg, const char *name, const char *desc, const char *default_value, xbt_cfg_cb_t cb_set){ - xbt_cfg_register(cfg,name,desc,xbt_cfgelm_string,1,1,cb_set); - xbt_cfg_setdefault_string(cfg, name, default_value); +void xbt_cfg_register_string(const char *name, const char *desc, const char *default_value, xbt_cfg_cb_t cb_set){ + xbt_cfg_register(_sg_cfg_set,name,desc,xbt_cfgelm_string,1,1,cb_set); + xbt_cfg_setdefault_string(_sg_cfg_set, name, default_value); } -void xbt_cfg_register_boolean(xbt_cfg_t * cfg, const char *name, const char *desc, const char*default_value,xbt_cfg_cb_t cb_set){ - xbt_cfg_register(cfg,name,desc,xbt_cfgelm_boolean,1,1,cb_set); - xbt_cfg_setdefault_boolean(cfg, name, default_value); +void xbt_cfg_register_boolean(const char *name, const char *desc, const char*default_value,xbt_cfg_cb_t cb_set){ + xbt_cfg_register(_sg_cfg_set,name,desc,xbt_cfgelm_boolean,1,1,cb_set); + xbt_cfg_setdefault_boolean(_sg_cfg_set, name, default_value); } -void xbt_cfg_register_alias(xbt_cfg_t * cfg, const char *newname, const char *oldname) +void xbt_cfg_register_alias(const char *newname, const char *oldname) { - if (*cfg == NULL) - *cfg = xbt_cfg_new(); + if (_sg_cfg_set == NULL) + _sg_cfg_set = xbt_cfg_new(); - xbt_cfgelm_t res = xbt_dict_get_or_null((xbt_dict_t) * cfg, oldname); + xbt_cfgelm_t res = xbt_dict_get_or_null(_sg_cfg_set, oldname); xbt_assert(NULL == res, "Refusing to register the option '%s' twice.", oldname); - res = xbt_dict_get_or_null((xbt_dict_t) * cfg, newname); + res = xbt_dict_get_or_null(_sg_cfg_set, newname); xbt_assert(res, "Cannot define an alias to the non-existing option '%s'.", newname); res = xbt_new0(s_xbt_cfgelm_t, 1); - XBT_DEBUG("Register cfg alias %s -> %s in set %p)",oldname,newname, *cfg); + XBT_DEBUG("Register cfg alias %s -> %s)",oldname,newname); res->desc = bprintf("Deprecated alias for %s",newname); res->type = xbt_cfgelm_alias; @@ -274,7 +276,7 @@ void xbt_cfg_register_alias(xbt_cfg_t * cfg, const char *newname, const char *ol res->isdefault = 1; res->content = (xbt_dynar_t)newname; - xbt_dict_set((xbt_dict_t) * cfg, oldname, res, NULL); + xbt_dict_set(_sg_cfg_set, oldname, res, NULL); } /** @brief Unregister an element from a config set. -- 2.20.1