From d2870500ed94896ec3b064fa67af8d729920c007 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 25 Apr 2016 21:58:38 +0200 Subject: [PATCH] All options are consistently in kebab-case (but the tracing ones) Pushing before converting the tracing options as I broke jenkins once again. --- ChangeLog | 4 + doc/doxygen/options.doc | 80 +++++++++---------- doc/doxygen/platform.doc | 2 +- .../app-masterworker-vivaldi.tesh | 6 +- examples/platforms/config.xml | 2 +- examples/simdag/throttling/sd_throttling.tesh | 4 +- .../simdag/typed_tasks/sd_typed_tasks.tesh | 4 +- examples/smpi/energy/energy.tesh | 2 +- examples/smpi/energy/f77/energy.tesh | 2 +- examples/smpi/energy/f90/energy.tesh | 2 +- examples/smpi/replay/replay.tesh | 20 ++--- examples/smpi/trace/trace.tesh | 2 +- examples/smpi/trace_simple/trace_simple.tesh | 12 +-- src/msg/msg_global.cpp | 4 +- src/msg/msg_gos.cpp | 4 +- src/simgrid/sg_config.cpp | 66 +++++++++------ src/simix/smx_global.cpp | 2 +- src/smpi/smpi_coll.cpp | 2 +- src/smpi/smpi_global.cpp | 2 +- src/smpi/smpirun.in | 2 +- src/surf/cpu_cas01.cpp | 4 +- src/surf/network_cm02.cpp | 34 ++++---- src/surf/network_ib.cpp | 12 +-- src/surf/network_smpi.cpp | 8 +- .../simdag/availability/availability.tesh | 4 +- .../simix/stack_overflow/stack_overflow.tesh | 2 +- teshsuite/smpi/bug-17132/bug-17132.tesh | 2 +- teshsuite/smpi/macro-shared/macro-shared.tesh | 2 +- teshsuite/smpi/mpich3-test/runtests | 2 +- teshsuite/smpi/pt2pt-dsend/pt2pt-dsend.tesh | 2 +- teshsuite/smpi/pt2pt-pingpong/TI_output.tesh | 8 +- .../smpi/pt2pt-pingpong/pt2pt-pingpong.tesh | 2 +- teshsuite/smpi/type-hvector/type-hvector.tesh | 2 +- teshsuite/smpi/type-indexed/type-indexed.tesh | 2 +- teshsuite/smpi/type-struct/type-struct.tesh | 2 +- teshsuite/smpi/type-vector/type-vector.tesh | 2 +- 36 files changed, 169 insertions(+), 145 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5a5649d99c..4ebb78ddc2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,6 +43,10 @@ SimGrid (3.13) UNRELEASED; urgency=low MC_snapshot() and MC_compare_snapshot(); - keep the MC_cut() function as a stub (it was not really working in the previous release). + + Options: + * All options are consistently in kebab-case (but the tracing ones). + Old names are kept as alias. XML platforms: * Switch to platform v4 format. diff --git a/doc/doxygen/options.doc b/doc/doxygen/options.doc index 2e81ada639..37832fe87d 100644 --- a/doc/doxygen/options.doc +++ b/doc/doxygen/options.doc @@ -176,16 +176,16 @@ configurations. now). - \b Full: Full update of remaining and variables. Slow but may be useful when debugging. - - items \b network/maxmin_selective_update and - \b cpu/maxmin_selective_update: configure whether the underlying + - items \b network/maxmin-selective-update and + \b cpu/maxmin-selective-update: configure whether the underlying should be lazily updated or not. It should have no impact on the computed timings, but should speed up the computation. -It is still possible to disable the \c maxmin_selective_update feature +It is still possible to disable the \c maxmin-selective-update feature because it can reveal counter-productive in very specific scenarios where the interaction level is high. In particular, if all your communication share a given backbone link, you should disable it: -without \c maxmin_selective_update, every communications are updated +without \c maxmin-selective-update, every communications are updated at each step through a simple loop over them. With that feature enabled, every communications will still get updated in this case (because of the dependency induced by the backbone), but through a @@ -216,7 +216,7 @@ speedup or a slowdown because of the synchronization costs of threads. The analytical models need to know the maximal TCP window size to take the TCP congestion mechanism into account. This is set to 20000 by -default, but can be changed using the \b network/TCP_gamma item. +default, but can be changed using the \b network/TCP-gamma item. On linux, this value can be retrieved using the following commands. Both give a set of values, and you should use the last one, @@ -247,7 +247,7 @@ InfiniBand network behavior can be modeled through 3 parameters, as explained in These factors can be changed through the following option: \verbatim -smpi/IB_penalty_factors:"βe;βs;γs" +smpi/IB-penalty-factors:"βe;βs;γs" \endverbatim By default SMPI uses factors computed on the Stampede Supercomputer at TACC, with optimal @@ -284,7 +284,7 @@ initialization are done in the simulator. (this configuration item is experimental and may change or disapear) It is possible to specify a timing gap between consecutive emission on -the same network card through the \b network/sender_gap item. This +the same network card through the \b network/sender-gap item. This is still under investigation as of writting, and the default value is to wait 10 microseconds (1e-5 seconds) between emissions. @@ -295,7 +295,7 @@ to wait 10 microseconds (1e-5 seconds) between emissions. It is possible to specify that messages below a certain size will be sent as soon as the call to MPI_Send is issued, without waiting for the correspondant receive. This threshold can be configured through the -\b smpi/async_small_thresh item. The default value is 0. This behavior can also be +\b smpi/async-small-thresh item. The default value is 0. This behavior can also be manually set for MSG mailboxes, by setting the receiving mode of the mailbox with a call to \ref MSG_mailbox_set_async . For MSG, all messages sent to this mailbox will have this behavior, so consider using two mailboxes if needed. @@ -402,9 +402,9 @@ This only works in safety mode. This options is disabled by default. -\subsection options_modelchecking_dot_output model-check/dot_output, Dot output +\subsection options_modelchecking_dot_output model-check/dot-output, Dot output -If set, the \b model-check/dot_output configuration item is the name of a file +If set, the \b model-check/dot-output configuration item is the name of a file in which to write a dot file of the path leading the found property (safety or liveness violation) as well as the cycle for liveness properties. This dot file can then fed to the graphviz dot tool to generate an corresponding graphical @@ -412,7 +412,7 @@ representation. \subsection options_modelchecking_max_depth model-check/max_depth, Depth limit -The \b model-checker/max_depth can set the maximum depth of the exploration +The \b model-checker/max-depth can set the maximum depth of the exploration graph of the model-checker. If this limit is reached, a logging message is sent and the results might not be exact. @@ -426,8 +426,8 @@ set to \b yes, the model-checker will explore timeouts of `wait` operations. \subsection options_modelchecking_comm_determinism Communication determinism -The \b model-check/communications_determinism and -\b model-check/send_determinism items can be used to select the communication +The \b model-check/communications-determinism and +\b model-check/send-determinism items can be used to select the communication determinism mode of the model-checker which checks determinism properties of the communications of an application. @@ -577,7 +577,7 @@ rather disturbing: this leads to stack overflow (overwriting other stacks), leading to segfaults with corrupted stack traces. If you want to push the scalability limits of your code, you might -want to reduce the \b contexts/stack_size item. Its default value +want to reduce the \b contexts/stack-size item. Its default value is 8192 (in KiB), while our Chord simulation works with stacks as small as 16 KiB, for example. For the thread factory, the default value is the one of the system, if it is too large/small, it has to be set @@ -612,7 +612,7 @@ the amount of cores auto-detected). Even if you asked several worker threads using the previous option, you can request to start the parallel execution (and pay the associated synchronization costs) only if the potential parallelism is -large enough. For that, set the \b contexts/parallel_threshold +large enough. For that, set the \b contexts/parallel-threshold item to the minimal amount of user contexts needed to start the parallel execution. In any given simulation round, if that amount is not reached, the contexts will be run sequentially directly by the @@ -702,7 +702,7 @@ doing. This option shows a backtrace of the other process. Enable this option by adding \verbatim ---cfg=msg/debug_multiple_use:on +--cfg=msg/debug-multiple-use:on \endverbatim \section options_smpi Configuring SMPI @@ -727,14 +727,14 @@ to update it to get accurate simulation results. When the code is constituted of numerous consecutive MPI calls, the previous mechanism feeds the simulation kernel with numerous tiny -computations. The \b smpi/cpu_threshold item becomes handy when this +computations. The \b smpi/cpu-threshold item becomes handy when this impacts badly the simulation performance. It specifies a threshold (in seconds) below which the execution chunks are not reported to the simulation kernel (default value: 1e-6). \note - The option smpi/cpu_threshold ignores any computation time spent + The option smpi/cpu-threshold ignores any computation time spent below this threshold. SMPI does not consider the \a amount of these computations; there is no offset for this. Hence, by using a value that is too low, you may end up with unreliable simulation @@ -762,7 +762,7 @@ computation. you should check the SMPI_SAMPLE macros, documented in the chapter \ref SMPI_adapting_speed. -\subsection options_model_smpi_bw_factor smpi/bw_factor: Bandwidth factors +\subsection options_model_smpi_bw_factor smpi/bw-factor: Bandwidth factors The possible throughput of network links is often dependent on the message sizes, as protocols may adapt to different message sizes. With @@ -797,12 +797,12 @@ to 1, \c smpirun will display this information when the simulation ends. \verbat Simulation time: 1e3 seconds. \endverbatim -\subsection options_model_smpi_lat_factor smpi/lat_factor: Latency factors +\subsection options_model_smpi_lat_factor smpi/lat-factor: Latency factors The motivation and syntax for this option is identical to the motivation/syntax -of smpi/bw_factor, see \ref options_model_smpi_bw_factor for details. +of smpi/bw-factor, see \ref options_model_smpi_bw_factor for details. -There is an important difference, though: While smpi/bw_factor \a reduces the +There is an important difference, though: While smpi/bw-factor \a reduces the actual bandwidth (i.e., values between 0 and 1 are valid), latency factors increase the latency, i.e., values larger than or equal to 1 are valid here. @@ -860,7 +860,7 @@ by changing the \b smpi/send-is-detached item. The default value is 65536. \subsection options_model_smpi_collectives Simulating MPI collective algorithms SMPI implements more than 100 different algorithms for MPI collective communication, to accurately -simulate the behavior of most of the existing MPI libraries. The \b smpi/coll_selector item can be used +simulate the behavior of most of the existing MPI libraries. The \b smpi/coll-selector item can be used to use the decision logic of either OpenMPI or MPICH libraries (values: ompi or mpich, by default SMPI uses naive version of collective operations). Each collective operation can be manually selected with a \b smpi/collective_name:algo_name. Available algorithms are listed in \ref SMPI_collective_algorithms . @@ -994,7 +994,7 @@ option to force a call to MPI_Wtime to advance the time as well. The C / C++ standard contains a function called \b [atexit](http://www.cplusplus.com/reference/cstdlib/atexit/). atexit registers callbacks, which are called just before the program terminates. -By setting the configuration option clean_atexit to 1 (true), a callback +By setting the configuration option clean-atexit to 1 (true), a callback is registered and will clean up some variables and terminate/cleanup the tracing. TODO: Add when this should be used. @@ -1043,9 +1043,9 @@ tasks. If it is not possible you might use ucontext instead. A stack guard page is usually used which prevents the stack from overflowing on other parts of the memory. However this might have a performance impact if a huge number of processes is created. The -option \b contexts:guard_size is the number of stack guard pages +option \b contexts:guard-size is the number of stack guard pages used. By setting it to 0, no guard pages will be used: in this case, -you should avoid using small stacks (\b stack_size) as the stack will +you should avoid using small stacks (\b stack-size) as the stack will silently overflow on other parts of the memory. \section options_index Index of all existing configuration options @@ -1059,16 +1059,16 @@ silently overflow on other parts of the memory. \b Please \b note: You can also pass the command-line option "--help" and "--help-cfg" to an executable that uses simgrid. -- \c clean_atexit: \ref options_generic_clean_atexit +- \c clean-atexit: \ref options_generic_clean_atexit - \c contexts/factory: \ref options_virt_factory -- \c contexts/guard_size: \ref options_virt_parallel +- \c contexts/guard-size: \ref options_virt_parallel - \c contexts/nthreads: \ref options_virt_parallel - \c contexts/parallel_threshold: \ref options_virt_parallel -- \c contexts/stack_size: \ref options_virt_stacksize +- \c contexts/stack-size: \ref options_virt_stacksize - \c contexts/synchro: \ref options_virt_parallel -- \c cpu/maxmin_selective_update: \ref options_model_optim +- \c cpu/maxmin-selective-update: \ref options_model_optim - \c cpu/model: \ref options_model_select - \c cpu/optim: \ref options_model_optim @@ -1078,34 +1078,34 @@ silently overflow on other parts of the memory. - \c maxmin/precision: \ref options_model_precision -- \c msg/debug_multiple_use: \ref options_msg_debug_multiple_use +- \c msg/debug-multiple-use: \ref options_msg_debug_multiple_use - \c model-check: \ref options_modelchecking - \c model-check/checkpoint: \ref options_modelchecking_steps -- \c model-check/communications_determinism: \ref options_modelchecking_comm_determinism -- \c model-check/dot_output: \ref options_modelchecking_dot_output +- \c model-check/communications-determinism: \ref options_modelchecking_comm_determinism +- \c model-check/dot-output: \ref options_modelchecking_dot_output - \c model-check/hash: \ref options_modelchecking_hash - \c model-check/property: \ref options_modelchecking_liveness -- \c model-check/max_depth: \ref options_modelchecking_max_depth +- \c model-check/max-depth: \ref options_modelchecking_max_depth - \c model-check/record: \ref options_modelchecking_recordreplay - \c model-check/reduction: \ref options_modelchecking_reduction - \c model-check/replay: \ref options_modelchecking_recordreplay -- \c model-check/send_determinism: \ref options_modelchecking_comm_determinism +- \c model-check/send-determinism: \ref options_modelchecking_comm_determinism - \c model-check/sparse-checkpoint: \ref options_modelchecking_sparse_checkpoint - \c model-check/termination: \ref options_modelchecking_termination - \c model-check/timeout: \ref options_modelchecking_timeout - \c model-check/visited: \ref options_modelchecking_visited -- \c network/bandwidth_factor: \ref options_model_network_coefs +- \c network/bandwidth-factor: \ref options_model_network_coefs - \c network/coordinates: \ref options_model_network_coord - \c network/crosstraffic: \ref options_model_network_crosstraffic -- \c network/latency_factor: \ref options_model_network_coefs -- \c network/maxmin_selective_update: \ref options_model_optim +- \c network/latency-factor: \ref options_model_network_coefs +- \c network/maxmin-selective-update: \ref options_model_optim - \c network/model: \ref options_model_select - \c network/optim: \ref options_model_optim - \c network/sender_gap: \ref options_model_network_sendergap -- \c network/TCP_gamma: \ref options_model_network_gamma -- \c network/weight_S: \ref options_model_network_coefs +- \c network/TCP-gamma: \ref options_model_network_gamma +- \c network/weight-S: \ref options_model_network_coefs - \c ns3/TcpModel: \ref options_pls - \c path: \ref options_generic_path diff --git a/doc/doxygen/platform.doc b/doc/doxygen/platform.doc index eca3cb21af..620087d771 100644 --- a/doc/doxygen/platform.doc +++ b/doc/doxygen/platform.doc @@ -1553,7 +1553,7 @@ Tag name | Description | Documentation - + diff --git a/examples/msg/app-masterworker/app-masterworker-vivaldi.tesh b/examples/msg/app-masterworker/app-masterworker-vivaldi.tesh index f051d982b0..3b0eca36bf 100644 --- a/examples/msg/app-masterworker/app-masterworker-vivaldi.tesh +++ b/examples/msg/app-masterworker/app-masterworker-vivaldi.tesh @@ -2,9 +2,9 @@ p Testing a simple master/worker example application -$ $SG_TEST_EXENV ./app-masterworker/app-masterworker ${srcdir:=.}/../platforms/vivaldi.xml ${srcdir:=.}/app-masterworker/app-masterworker-vivaldi_d.xml --cfg=network/latency_factor:1.0 --cfg=network/bandwidth_factor:1.0 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (0:maestro@) Configuration change: Set 'network/latency_factor' to '1.0' -> [ 0.000000] (0:maestro@) Configuration change: Set 'network/bandwidth_factor' to '1.0' +$ $SG_TEST_EXENV ./app-masterworker/app-masterworker ${srcdir:=.}/../platforms/vivaldi.xml ${srcdir:=.}/app-masterworker/app-masterworker-vivaldi_d.xml --cfg=network/latency-factor:1.0 --cfg=network/bandwidth-factor:1.0 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +> [ 0.000000] (0:maestro@) Configuration change: Set 'network/latency-factor' to '1.0' +> [ 0.000000] (0:maestro@) Configuration change: Set 'network/bandwidth-factor' to '1.0' > [ 0.000000] (0:maestro@) Configuration change: Set 'network/coordinates' to 'yes' > [ 0.000000] (1:master@100030591) Got 15 workers and 10 tasks to process > [ 0.000000] (1:master@100030591) Sending "Task_0" (of 10) to mailbox "worker-0" diff --git a/examples/platforms/config.xml b/examples/platforms/config.xml index 4dae60f6c8..547e796952 100644 --- a/examples/platforms/config.xml +++ b/examples/platforms/config.xml @@ -7,7 +7,7 @@ - + diff --git a/examples/simdag/throttling/sd_throttling.tesh b/examples/simdag/throttling/sd_throttling.tesh index a9de46fc3a..aeffa60916 100644 --- a/examples/simdag/throttling/sd_throttling.tesh +++ b/examples/simdag/throttling/sd_throttling.tesh @@ -1,8 +1,8 @@ #! ./tesh p Modify the rate of communication tasks even when they are auto-scheduled -$ $SG_TEST_EXENV ./throttling/sd_throttling --cfg=network/TCP_gamma:4194304 ${srcdir:=.}/../platforms/2clusters.xml -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' +$ $SG_TEST_EXENV ./throttling/sd_throttling --cfg=network/TCP-gamma:4194304 ${srcdir:=.}/../platforms/2clusters.xml +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP-gamma' to '4194304' > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [1.000000] [sd_comm_throttling/INFO] Simulation stopped after 1.0000 seconds > [1.000000] [sd_comm_throttling/INFO] Task 'Task A' start time: 0.000000, finish time: 1.000000 diff --git a/examples/simdag/typed_tasks/sd_typed_tasks.tesh b/examples/simdag/typed_tasks/sd_typed_tasks.tesh index 57f8c576b2..00ef0c314b 100644 --- a/examples/simdag/typed_tasks/sd_typed_tasks.tesh +++ b/examples/simdag/typed_tasks/sd_typed_tasks.tesh @@ -1,8 +1,8 @@ #! ./tesh p Usage test of simdag's typed tasks -$ $SG_TEST_EXENV ./typed_tasks/sd_typed_tasks --cfg=network/TCP_gamma:4194304 ${srcdir:=.}/../platforms/2clusters.xml -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' +$ $SG_TEST_EXENV ./typed_tasks/sd_typed_tasks --cfg=network/TCP-gamma:4194304 ${srcdir:=.}/../platforms/2clusters.xml +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP-gamma' to '4194304' > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [2.080300] [sd_typed_tasks_test/INFO] Task 'Seq. comp. 1' start time: 0.000000, finish time: 1.000000 > [2.080300] [sd_typed_tasks_test/INFO] Task 'Par. Comp. 1' start time: 0.000000, finish time: 0.080000 diff --git a/examples/smpi/energy/energy.tesh b/examples/smpi/energy/energy.tesh index 11a8b70b6b..ff2406830b 100644 --- a/examples/smpi/energy/energy.tesh +++ b/examples/smpi/energy/energy.tesh @@ -2,7 +2,7 @@ p Test smpi bindings for dvfs functions (C example) $ ../../../smpi_script/bin/smpirun -np 2 -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../platforms/energy_platform.xml --cfg=smpi/cpu-threshold:-1 ${bindir:=.}/smpi_energy --cfg=plugin:Energy --log=smpi_kernel.thres:warning > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP-gamma' to '4194304' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/cpu-threshold' to '-1' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'plugin' to 'Energy' > [0.000000] [rank 0] Pstates: 3; Powers: 100000000, 50000000, 20000000 diff --git a/examples/smpi/energy/f77/energy.tesh b/examples/smpi/energy/f77/energy.tesh index 57ae7b090c..ee65341856 100644 --- a/examples/smpi/energy/f77/energy.tesh +++ b/examples/smpi/energy/f77/energy.tesh @@ -3,7 +3,7 @@ p Test smpi bindings for dvfs functions (Fortran 77 example) $ ../../../smpi_script/bin/smpirun -np 2 -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../platforms/energy_platform.xml --cfg=smpi/cpu-threshold:-1 ${bindir:=.}/f77/sef --cfg=plugin:Energy --log=smpi_kernel.thres:warning > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP-gamma' to '4194304' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/cpu-threshold' to '-1' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'plugin' to 'Energy' > [ 0.0000000000000000 ] [rank 0 ] 3 pstates available diff --git a/examples/smpi/energy/f90/energy.tesh b/examples/smpi/energy/f90/energy.tesh index 387cbaba32..78c866405b 100644 --- a/examples/smpi/energy/f90/energy.tesh +++ b/examples/smpi/energy/f90/energy.tesh @@ -3,7 +3,7 @@ p Test smpi bindings for dvfs functions (Fortran 90 example) $ ../../../smpi_script/bin/smpirun -np 2 -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../platforms/energy_platform.xml --cfg=smpi/cpu-threshold:-1 ${bindir:=.}/f90/sef90 --cfg=plugin:Energy --log=smpi_kernel.thres:warning > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP-gamma' to '4194304' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/cpu-threshold' to '-1' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'plugin' to 'Energy' > [ 0.0000000000000000 ] [rank 0 ] 3 pstates available diff --git a/examples/smpi/replay/replay.tesh b/examples/smpi/replay/replay.tesh index e4ba1d5f96..743814a132 100644 --- a/examples/smpi/replay/replay.tesh +++ b/examples/smpi/replay/replay.tesh @@ -11,7 +11,7 @@ $ mkfile replay/one_trace $ ../../smpi_script/bin/smpirun -ext smpi_replay --log=replay.thresh:critical --log=smpi_replay.thresh:verbose --log=no_loc --cfg=smpi/cpu-threshold:-1 -np 3 -platform ${srcdir:=.}/../platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile ./replay/smpi_replay replay/one_trace --log=smpi_kernel.thres:warning > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP-gamma' to '4194304' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/cpu-threshold' to '-1' > [Tremblay:0:(1) 0.000000] [smpi_replay/VERBOSE] 0 bcast 5e4 0.000000 > [Jupiter:1:(2) 0.015036] [smpi_replay/VERBOSE] 1 bcast 5e4 0.015036 @@ -40,7 +40,7 @@ $ mkfile replay/one_trace $ ../../smpi_script/bin/smpirun -ext smpi_replay --log=replay.thresh:critical --log=no_loc --cfg=tracing:yes --cfg=tracing/smpi:yes --cfg=tracing/smpi/computing:yes --cfg=smpi/cpu-threshold:-1 -np 3 -platform ${srcdir:=.}/../platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile ./replay/smpi_replay replay/one_trace --log=smpi_kernel.thres:warning > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP-gamma' to '4194304' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi/computing' to 'yes' @@ -229,7 +229,7 @@ $ mkfile ./split_traces_tesh $ ../../smpi_script/bin/smpirun -ext smpi_replay --log=replay.thresh:critical --log=smpi_replay.thresh:verbose --log=no_loc --cfg=smpi/cpu-threshold:-1 -np 2 -platform ${srcdir:=.}/../platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile ./replay/smpi_replay ./split_traces_tesh --log=smpi_kernel.thres:warning > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP-gamma' to '4194304' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/cpu-threshold' to '-1' > [Tremblay:0:(1) 0.164463] [smpi_replay/VERBOSE] 0 send 1 1e6 0.164463 > [Jupiter:1:(2) 0.164463] [smpi_replay/VERBOSE] 1 recv 0 1e6 0.164463 @@ -251,7 +251,7 @@ $ mkfile replay/one_trace $ ../../smpi_script/bin/smpirun -ext smpi_replay --log=replay.thresh:critical --log=smpi_replay.thresh:verbose --log=no_loc --cfg=smpi/cpu-threshold:-1 -np 3 -platform ${srcdir:=.}/../platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile ./replay/smpi_replay replay/one_trace --log=smpi_kernel.thres:warning > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP-gamma' to '4194304' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/cpu-threshold' to '-1' > [Tremblay:0:(1) 1.491472] [smpi_replay/VERBOSE] 0 send 1 1e7 1.491472 > [Jupiter:1:(2) 1.491472] [smpi_replay/VERBOSE] 1 recv 0 1e7 1.491472 @@ -273,7 +273,7 @@ $ mkfile replay/one_trace $ ../../smpi_script/bin/smpirun -ext smpi_replay --log=replay.thresh:critical --log=smpi_replay.thresh:verbose --log=no_loc --cfg=smpi/cpu-threshold:-1 -np 3 -platform ${srcdir:=.}/../platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile ./replay/smpi_replay replay/one_trace --log=smpi_kernel.thres:warning > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP-gamma' to '4194304' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/cpu-threshold' to '-1' > [Jupiter:1:(2) 0.000000] [smpi_replay/VERBOSE] 1 Irecv 0 1e6 0.000000 > [Jupiter:1:(2) 6.553424] [smpi_replay/VERBOSE] 1 compute 5e8 6.553424 @@ -304,7 +304,7 @@ $ mkfile replay/one_trace $ ../../smpi_script/bin/smpirun -ext smpi_replay --log=replay.thresh:critical --log=smpi_replay.thresh:verbose --log=no_loc --cfg=smpi/cpu-threshold:-1 -np 3 -platform ${srcdir:=.}/../platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile ./replay/smpi_replay replay/one_trace --log=smpi_kernel.thres:warning > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP-gamma' to '4194304' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/cpu-threshold' to '-1' > [Tremblay:0:(1) 5.112775] [smpi_replay/VERBOSE] 0 allReduce 5e4 5e8 5.112775 > [Jupiter:1:(2) 6.584135] [smpi_replay/VERBOSE] 1 allReduce 5e4 5e8 6.584135 @@ -324,7 +324,7 @@ $ mkfile replay/one_trace $ ../../smpi_script/bin/smpirun -ext smpi_replay --log=replay.thresh:critical --log=smpi_replay.thresh:verbose --log=no_loc --cfg=smpi/cpu-threshold:-1 -np 3 -platform ${srcdir:=.}/../platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile ./replay/smpi_replay replay/one_trace --log=smpi_kernel.thres:warning > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP-gamma' to '4194304' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/cpu-threshold' to '-1' > [Tremblay:0:(1) 0.004041] [smpi_replay/VERBOSE] 0 allToAll 500 500 0.004041 > [Fafard:2:(3) 0.006920] [smpi_replay/VERBOSE] 2 allToAll 500 500 0.006920 @@ -341,7 +341,7 @@ $ mkfile replay/one_trace $ ../../smpi_script/bin/smpirun -ext smpi_replay --log=replay.thresh:critical --log=smpi_replay.thresh:verbose --log=no_loc --cfg=smpi/cpu-threshold:-1 -np 3 -platform ${srcdir:=.}/../platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile ./replay/smpi_replay replay/one_trace --log=smpi_kernel.thres:warning > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP-gamma' to '4194304' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/cpu-threshold' to '-1' > [Tremblay:0:(1) 0.003999] [smpi_replay/VERBOSE] 0 allToAllV 100 1 40 30 1000 1 80 100 0.003999 > [Jupiter:1:(2) 0.006934] [smpi_replay/VERBOSE] 1 allToAllV 1000 80 1 40 1000 40 1 30 0.006934 @@ -358,7 +358,7 @@ $ mkfile replay/one_trace $ ../../smpi_script/bin/smpirun -ext smpi_replay --log=replay.thresh:critical --log=smpi_replay.thresh:verbose --log=no_loc --cfg=smpi/cpu-threshold:-1 -np 3 -platform ${srcdir:=.}/../platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile ./replay/smpi_replay replay/one_trace --log=smpi_kernel.thres:warning > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP-gamma' to '4194304' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/cpu-threshold' to '-1' > [Tremblay:0:(1) 0.882872] [smpi_replay/VERBOSE] 0 allGatherV 275427 275427 275427 275427 204020 0 0 0.882872 > [Fafard:2:(3) 1.300605] [smpi_replay/VERBOSE] 2 allGatherV 275427 275427 275427 275427 204020 0 0 1.300605 @@ -376,7 +376,7 @@ $ mkfile replay/one_trace $ ../../smpi_script/bin/smpirun -ext smpi_replay --log=replay.thresh:critical --log=smpi_replay.thresh:verbose --log=no_loc --cfg=smpi/cpu-threshold:-1 -np 3 -platform ${srcdir:=.}/../platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile ./replay/smpi_replay replay/one_trace --log=smpi_kernel.thres:warning > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP-gamma' to '4194304' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/cpu-threshold' to '-1' > [Fafard:2:(3) 0.000000] [smpi_replay/VERBOSE] 2 Irecv 1 3000 0.000000 > [Fafard:2:(3) 0.000000] [smpi_replay/VERBOSE] 2 Isend 0 3000 0.000000 diff --git a/examples/smpi/trace/trace.tesh b/examples/smpi/trace/trace.tesh index da15bdc6b8..63a90180ff 100644 --- a/examples/smpi/trace/trace.tesh +++ b/examples/smpi/trace/trace.tesh @@ -11,6 +11,6 @@ $ ../../smpi_script/bin/smpirun -trace -trace-resource -trace-file smpi_trace.tr > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP-gamma' to '4194304' $ rm -f smpi_trace.trace \ No newline at end of file diff --git a/examples/smpi/trace_simple/trace_simple.tesh b/examples/smpi/trace_simple/trace_simple.tesh index 821e091f65..251e7b1ac6 100644 --- a/examples/smpi/trace_simple/trace_simple.tesh +++ b/examples/smpi/trace_simple/trace_simple.tesh @@ -11,7 +11,7 @@ $ ../../smpi_script/bin/smpirun -trace -trace-resource -trace-file smpi_trace.tr > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP-gamma' to '4194304' p Another SMPI test, with only -trace $ ../../smpi_script/bin/smpirun -trace -trace-file smpi_trace.trace -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../platforms/small_platform.xml --cfg=path:${srcdir:=.}/../msg -np 3 ./trace_simple/smpi_trace_simple --log=smpi_kernel.thres:warning @@ -20,13 +20,13 @@ $ ../../smpi_script/bin/smpirun -trace -trace-file smpi_trace.trace -hostfile ${ > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP-gamma' to '4194304' p Testing without trace parameters $ ../../smpi_script/bin/smpirun -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../platforms/small_platform.xml --cfg=path:${srcdir:=.}/../msg -np 3 ./trace_simple/smpi_trace_simple --log=smpi_kernel.thres:warning > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP-gamma' to '4194304' p Testing grouped tracing $ ../../smpi_script/bin/smpirun -trace -trace-grouped -trace-file smpi_trace.trace -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../platforms/small_platform.xml --cfg=path:${srcdir:=.}/../msg -np 3 ./trace_simple/smpi_trace_simple --log=smpi_kernel.thres:warning @@ -36,7 +36,7 @@ $ ../../smpi_script/bin/smpirun -trace -trace-grouped -trace-file smpi_trace.tra > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi/group' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP-gamma' to '4194304' p Testing generation of viva configuration files $ ../../smpi_script/bin/smpirun -trace -trace-resource -trace-viva -trace-file smpi_trace.trace -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../platforms/small_platform.xml --cfg=path:${srcdir:=.}/../msg --cfg=smpi/cpu-threshold:-1 -np 3 ./trace_simple/smpi_trace_simple --log=smpi_kernel.thres:warning @@ -49,7 +49,7 @@ $ ../../smpi_script/bin/smpirun -trace -trace-resource -trace-viva -trace-file s > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'viva/uncategorized' to 'smpi_uncat.plist' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP-gamma' to '4194304' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/cpu-threshold' to '-1' > [0.003952] [instr_config/INFO] No categories declared, ignoring generation of viva graph configuration @@ -57,6 +57,6 @@ p Testing with parameters but without activating them with the safe switch (-tra $ ../../smpi_script/bin/smpirun -trace-resource -trace-viva -trace-file smpi_trace.trace -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../platforms/small_platform.xml --cfg=path:${srcdir:=.}/../msg -np 3 ./trace_simple/smpi_trace_simple --log=smpi_kernel.thres:warning > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP-gamma' to '4194304' $ rm -f smpi_trace.trace smpi_uncat.plist smpi_cat.plist diff --git a/src/msg/msg_global.cpp b/src/msg/msg_global.cpp index 19abf3dc2f..d882de4b27 100644 --- a/src/msg/msg_global.cpp +++ b/src/msg/msg_global.cpp @@ -45,7 +45,7 @@ void MSG_init_nocheck(int *argc, char **argv) { msg_global = xbt_new0(s_MSG_Global_t, 1); - xbt_cfg_register_boolean("msg/debug_multiple_use", "no", _sg_cfg_cb_msg_debug_multiple_use, + xbt_cfg_register_boolean("msg/debug-multiple-use", "no", _sg_cfg_cb_msg_debug_multiple_use, "Print backtraces of both processes when there is a conflict of multiple use of a task"); SIMIX_global_init(argc, argv); @@ -75,7 +75,7 @@ void MSG_init_nocheck(int *argc, char **argv) { XBT_DEBUG("ADD MSG LEVELS"); MSG_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, (void_f_pvoid_t) __MSG_storage_destroy); MSG_FILE_LEVEL = xbt_lib_add_level(file_lib, (void_f_pvoid_t) __MSG_file_destroy); - if(xbt_cfg_get_boolean("clean_atexit")) atexit(MSG_exit); + if(xbt_cfg_get_boolean("clean-atexit")) atexit(MSG_exit); } /** \ingroup msg_simulation diff --git a/src/msg/msg_gos.cpp b/src/msg/msg_gos.cpp index c0a95eff95..7138e569b0 100644 --- a/src/msg/msg_gos.cpp +++ b/src/msg/msg_gos.cpp @@ -307,7 +307,7 @@ static inline msg_comm_t MSG_task_isend_internal(msg_task_t task, const char *al } else { xbt_assert(t_simdata->isused == 0, "This task is still being used somewhere else. You cannot send it now. Go fix your code!" - "(use --cfg=msg/debug_multiple_use:on to get the backtrace of the other process)"); + "(use --cfg=msg/debug-multiple-use:on to get the backtrace of the other process)"); } } @@ -816,7 +816,7 @@ msg_error_t MSG_task_send_with_timeout(msg_task_t task, const char *alias, doubl } else { xbt_assert(t_simdata->isused == 0, "This task is still being used somewhere else. You cannot send it now. Go fix your code!" - " (use --cfg=msg/debug_multiple_use:on to get the backtrace of the other process)"); + " (use --cfg=msg/debug-multiple-use:on to get the backtrace of the other process)"); } } diff --git a/src/simgrid/sg_config.cpp b/src/simgrid/sg_config.cpp index 074e079b25..312d7ebe40 100644 --- a/src/simgrid/sg_config.cpp +++ b/src/simgrid/sg_config.cpp @@ -468,8 +468,9 @@ void sg_config_init(int *argc, char **argv) describe_model(description, surf_vm_model_description, "model", "The model to use for the vm"); xbt_cfg_register_string("vm/model", "default", &_sg_cfg_cb__vm_model, description); - xbt_cfg_register_double("network/TCP_gamma", 4194304.0, _sg_cfg_cb__tcp_gamma, + xbt_cfg_register_double("network/TCP-gamma", 4194304.0, _sg_cfg_cb__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_cfg_register_alias("network/TCP-gamma","network/TCP_gamma"); xbt_cfg_register_double("surf/precision", 0.00001, _sg_cfg_cb__surf_precision, "Numerical precision used when updating simulation times (in seconds)"); xbt_cfg_register_double("maxmin/precision", 0.00001, _sg_cfg_cb__maxmin_precision, @@ -477,21 +478,27 @@ void sg_config_init(int *argc, char **argv) /* The parameters of network models */ - xbt_cfg_register_double("network/sender_gap", NAN, _sg_cfg_cb__sender_gap, - "Minimum gap between two overlapping sends"); /* real default for "network/sender_gap" is set in network_smpi.cpp */ - xbt_cfg_register_double("network/latency_factor", 1.0, _sg_cfg_cb__latency_factor, + xbt_cfg_register_double("network/sender-gap", NAN, _sg_cfg_cb__sender_gap, + "Minimum gap between two overlapping sends"); /* real default for "network/sender-gap" is set in network_smpi.cpp */ + xbt_cfg_register_alias("network/sender-gap","network/sender_gap"); + xbt_cfg_register_double("network/latency-factor", 1.0, _sg_cfg_cb__latency_factor, "Correction factor to apply to the provided latency (default value set by network model)"); - xbt_cfg_register_double("network/bandwidth_factor", 1.0, _sg_cfg_cb__bandwidth_factor, "Correction factor to apply to the provided bandwidth (default value set by network model)"); - xbt_cfg_register_double("network/weight_S", NAN, _sg_cfg_cb__weight_S, /* real default for "network/weight_S" is set in network_*.cpp */ + xbt_cfg_register_alias("network/latency-factor","network/latency_factor"); + xbt_cfg_register_double("network/bandwidth-factor", 1.0, _sg_cfg_cb__bandwidth_factor, "Correction factor to apply to the provided bandwidth (default value set by network model)"); + xbt_cfg_register_alias("network/bandwidth-factor","network/bandwidth_factor"); + xbt_cfg_register_double("network/weight-S", NAN, _sg_cfg_cb__weight_S, /* real default for "network/weight-S" is set in network_*.cpp */ "Correction factor to apply to the weight of competing streams (default value set by network model)"); + xbt_cfg_register_alias("network/weight-S","network/weight_S"); /* Inclusion path */ xbt_cfg_register_string("path", "", _sg_cfg_cb__surf_path, "Lookup path for inclusions in platform and deployment XML files"); - xbt_cfg_register_boolean("cpu/maxmin_selective_update", "no", NULL, + xbt_cfg_register_boolean("cpu/maxmin-selective-update", "no", NULL, "Update the constraint set propagating recursively to others constraints (off by default when optim is set to lazy)"); - xbt_cfg_register_boolean("network/maxmin_selective_update", "no", NULL, + xbt_cfg_register_alias("cpu/maxmin-selective-update","cpu/maxmin_selective_update"); + xbt_cfg_register_boolean("network/maxmin-selective-update", "no", NULL, "Update the constraint set propagating recursively to others constraints (off by default when optim is set to lazy)"); + xbt_cfg_register_alias("network/maxmin-selective-update","network/maxmin_selective_update"); /* Replay (this part is enabled even if MC it disabled) */ xbt_cfg_register_string("model-check/replay", nullptr, _sg_cfg_cb_model_check_replay, "Model-check path to replay (as reported by SimGrid when a violation is reported)"); @@ -509,11 +516,13 @@ void sg_config_init(int *argc, char **argv) xbt_cfg_register_string("model-check/property","", _mc_cfg_cb_property, "Name of the file containing the property, as formated by the ltl2ba program."); - xbt_cfg_register_boolean("model-check/communications_determinism", "no", _mc_cfg_cb_comms_determinism, + xbt_cfg_register_boolean("model-check/communications-determinism", "no", _mc_cfg_cb_comms_determinism, "Whether to enable the detection of communication determinism"); + xbt_cfg_register_alias("model-check/communications-determinism","model-check/communications_determinism"); - xbt_cfg_register_boolean("model-check/send_determinism", "no", _mc_cfg_cb_send_determinism, + xbt_cfg_register_boolean("model-check/send-determinism", "no", _mc_cfg_cb_send_determinism, "Enable/disable the detection of send-determinism in the communications schemes"); + xbt_cfg_register_alias("model-check/send-determinism","model-check/send_determinism"); /* Specify the kind of model-checking reduction */ xbt_cfg_register_string("model-check/reduction", "dpor", _mc_cfg_cb_reduce, @@ -522,13 +531,16 @@ void sg_config_init(int *argc, char **argv) "Whether to enable timeouts for wait requests"); xbt_cfg_register_boolean("model-check/hash", "no", _mc_cfg_cb_hash, "Whether to enable state hash for state comparison (experimental)"); - xbt_cfg_register_boolean("model-check/snapshot_fds", "no", _mc_cfg_cb_snapshot_fds, + xbt_cfg_register_boolean("model-check/snapshot-fds", "no", _mc_cfg_cb_snapshot_fds, "Whether file descriptors must be snapshoted (currently unusable)"); - xbt_cfg_register_int("model-check/max_depth", 1000, _mc_cfg_cb_max_depth, "Maximal exploration depth (default: 1000)"); + xbt_cfg_register_alias("model-check/snapshot-fds","model-check/snapshot_fds"); + xbt_cfg_register_int("model-check/max-depth", 1000, _mc_cfg_cb_max_depth, "Maximal exploration depth (default: 1000)"); + xbt_cfg_register_alias("model-check/max-depth","model-check/max_depth"); xbt_cfg_register_int("model-check/visited", 0, _mc_cfg_cb_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."); - xbt_cfg_register_string("model-check/dot_output", "", _mc_cfg_cb_dot_output, "Name of dot output file corresponding to graph state"); + xbt_cfg_register_string("model-check/dot-output", "", _mc_cfg_cb_dot_output, "Name of dot output file corresponding to graph state"); + xbt_cfg_register_alias("model-check/dot-output","model-check/dot_output"); xbt_cfg_register_boolean("model-check/termination", "no", _mc_cfg_cb_termination, "Whether to enable non progressive cycle detection"); #endif @@ -551,12 +563,13 @@ void sg_config_init(int *argc, char **argv) } xbt_cfg_register_string("contexts/factory", dflt_ctx_fact, _sg_cfg_cb_context_factory, description); - xbt_cfg_register_int("contexts/stack_size", 8*1024, _sg_cfg_cb_context_stack_size, "Stack size of contexts in KiB"); + xbt_cfg_register_int("contexts/stack-size", 8*1024, _sg_cfg_cb_context_stack_size, "Stack size of contexts in KiB"); /* (FIXME: this is unpleasant) Reset this static variable that was altered when setting the default value. */ smx_context_stack_size_was_set = 0; + xbt_cfg_register_alias("contexts/stack-size","contexts/stack_size"); /* guard size for contexts stacks in memory pages */ - xbt_cfg_register_int("contexts/guard_size", + xbt_cfg_register_int("contexts/guard-size", #if defined(_WIN32) || (PTH_STACKGROWTH != -1) 0, #else @@ -565,11 +578,12 @@ void sg_config_init(int *argc, char **argv) _sg_cfg_cb_context_guard_size, "Guard size for contexts stacks in memory pages"); /* No, it was not set yet (the above setdefault() changed this to 1). */ smx_context_guard_size_was_set = 0; - + xbt_cfg_register_alias("contexts/guard-size","contexts/guard_size"); xbt_cfg_register_int("contexts/nthreads", 1, _sg_cfg_cb_contexts_nthreads, "Number of parallel threads used to execute user contexts"); - xbt_cfg_register_int("contexts/parallel_threshold", 2, _sg_cfg_cb_contexts_parallel_threshold, + xbt_cfg_register_int("contexts/parallel-threshold", 2, _sg_cfg_cb_contexts_parallel_threshold, "Minimal number of user contexts to be run in parallel (raw contexts only)"); + xbt_cfg_register_alias("contexts/parallel-threshold","contexts/parallel_threshold"); /* synchronization mode for parallel user contexts */ #if HAVE_FUTEX_H @@ -592,15 +606,18 @@ void sg_config_init(int *argc, char **argv) //For smpi/bw_factor and smpi/lat_factor // SMPI model can be used without enable_smpi, so keep this out of the ifdef. - xbt_cfg_register_string("smpi/bw_factor", + xbt_cfg_register_string("smpi/bw-factor", "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, "Bandwidth factors for smpi. Format: 'threshold0:value0;threshold1:value1;...;thresholdN:valueN', meaning if(size >=thresholdN ) return valueN."); + xbt_cfg_register_alias("smpi/bw-factor","smpi/bw_factor"); - xbt_cfg_register_string("smpi/lat_factor", + xbt_cfg_register_string("smpi/lat-factor", "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, "Latency factors for smpi."); + xbt_cfg_register_alias("smpi/lat-factor","smpi/lat_factor"); - xbt_cfg_register_string("smpi/IB_penalty_factors", "0.965;0.925;1.35", NULL, + xbt_cfg_register_string("smpi/IB-penalty-factors", "0.965;0.925;1.35", NULL, "Correction factor to communications using Infiniband model with contention (default value based on Stampede cluster profiling)"); + xbt_cfg_register_alias("smpi/IB-penalty-factors","smpi/IB_penalty_factors"); #if HAVE_SMPI xbt_cfg_register_double("smpi/running-power", 20000.0, NULL, "Power of the host running the simulation (in flop/s). Used to bench the operations."); @@ -636,11 +653,13 @@ void sg_config_init(int *argc, char **argv) xbt_cfg_register_double("smpi/test", 1e-4, _sg_cfg_cb__test_sleep, "Minimum time to inject inside a call to MPI_Test"); xbt_cfg_register_double("smpi/wtime", 0.0, _sg_cfg_cb__wtime_sleep, "Minimum time to inject inside a call to MPI_Wtime"); - xbt_cfg_register_string("smpi/coll_selector", "default", NULL, "Which collective selector to use"); + xbt_cfg_register_string("smpi/coll-selector", "default", NULL, "Which collective selector to use"); + xbt_cfg_register_alias("smpi/coll-selector","smpi/coll_selector"); xbt_cfg_register_string("smpi/gather", nullptr, &_check_coll_gather, "Which collective to use for gather"); xbt_cfg_register_string("smpi/allgather", nullptr, &_check_coll_allgather, "Which collective to use for allgather"); xbt_cfg_register_string("smpi/barrier", nullptr, &_check_coll_barrier, "Which collective to use for barrier"); - xbt_cfg_register_string("smpi/reduce_scatter",nullptr, &_check_coll_reduce_scatter, "Which collective to use for reduce_scatter"); + xbt_cfg_register_string("smpi/reduce-scatter",nullptr, &_check_coll_reduce_scatter, "Which collective to use for reduce_scatter"); + xbt_cfg_register_alias("smpi/reduce-scatter","smpi/reduce_scatter"); xbt_cfg_register_string("smpi/scatter", nullptr, &_check_coll_scatter, "Which collective to use for scatter"); xbt_cfg_register_string("smpi/allgatherv", nullptr, &_check_coll_allgatherv, "Which collective to use for allgatherv"); xbt_cfg_register_string("smpi/allreduce", nullptr, &_check_coll_allreduce, "Which collective to use for allreduce"); @@ -653,8 +672,9 @@ void sg_config_init(int *argc, char **argv) xbt_cfg_register_boolean("exception/cutpath", "no", NULL, "Whether to cut all path information from call traces, used e.g. in exceptions."); - xbt_cfg_register_boolean("clean_atexit", "yes", _sg_cfg_cb_clean_atexit, + xbt_cfg_register_boolean("clean-atexit", "yes", _sg_cfg_cb_clean_atexit, "Whether to cleanup SimGrid at exit. Disable it if your code segfaults after its end."); + xbt_cfg_register_alias("clean-atexit","clean_atexit"); if (!surf_path) { /* retrieves the current directory of the current process */ diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index e7759b98f9..a8846a2404 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -258,7 +258,7 @@ void SIMIX_global_init(int *argc, char **argv) simix_timers = xbt_heap_new(8, &free); } - if (xbt_cfg_get_boolean("clean_atexit")) + if (xbt_cfg_get_boolean("clean-atexit")) atexit(SIMIX_clean); #if HAVE_MC diff --git a/src/smpi/smpi_coll.cpp b/src/smpi/smpi_coll.cpp index 4a8806fb72..9f6d9bf8a2 100644 --- a/src/smpi/smpi_coll.cpp +++ b/src/smpi/smpi_coll.cpp @@ -125,7 +125,7 @@ int find_coll_description(s_mpi_coll_description_t * table, char *name_list = NULL; int selector_on=0; if(name==NULL){//no argument provided, use active selector's algorithm - name=(char*)xbt_cfg_get_string("smpi/coll_selector"); + name=(char*)xbt_cfg_get_string("smpi/coll-selector"); selector_on=1; } for (int i = 0; table[i].name; i++) diff --git a/src/smpi/smpi_global.cpp b/src/smpi/smpi_global.cpp index 7f6c52c4d8..9222f7ccba 100644 --- a/src/smpi/smpi_global.cpp +++ b/src/smpi/smpi_global.cpp @@ -565,7 +565,7 @@ static void smpi_init_options(){ int reduce_scatter_id = find_coll_description(mpi_coll_reduce_scatter_description, - xbt_cfg_get_string("smpi/reduce_scatter"),"reduce_scatter"); + xbt_cfg_get_string("smpi/reduce-scatter"),"reduce_scatter"); mpi_coll_reduce_scatter_fun = (int (*)(void *sbuf, void *rbuf, int *rcounts,MPI_Datatype dtype, MPI_Op op, MPI_Comm comm)) mpi_coll_reduce_scatter_description[reduce_scatter_id].coll; diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in index 6c78ae60c3..22677512fa 100755 --- a/src/smpi/smpirun.in +++ b/src/smpi/smpirun.in @@ -24,7 +24,7 @@ NETWORK_BANDWIDTH="${DEFAULT_NETWORK_BANDWIDTH}" NETWORK_LATENCY="${DEFAULT_NETWORK_LATENCY}" SPEED="${DEFAULT_SPEED}" -SIMOPTS="--cfg=surf/precision:1e-9 --cfg=network/model:SMPI --cfg=network/TCP_gamma:4194304" +SIMOPTS="--cfg=surf/precision:1e-9 --cfg=network/model:SMPI --cfg=network/TCP-gamma:4194304" #usage to print the way this script should be called usage () { diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index 9c1caf42b7..24189a472e 100644 --- a/src/surf/cpu_cas01.cpp +++ b/src/surf/cpu_cas01.cpp @@ -38,7 +38,7 @@ namespace surf { CpuCas01Model::CpuCas01Model() : simgrid::surf::CpuModel() { char *optim = xbt_cfg_get_string("cpu/optim"); - int select = xbt_cfg_get_boolean("cpu/maxmin_selective_update"); + int select = xbt_cfg_get_boolean("cpu/maxmin-selective-update"); if (!strcmp(optim, "Full")) { updateMechanism_ = UM_FULL; @@ -47,7 +47,7 @@ CpuCas01Model::CpuCas01Model() : simgrid::surf::CpuModel() updateMechanism_ = UM_LAZY; selectiveUpdate_ = 1; xbt_assert((select == 1) - || (xbt_cfg_is_default_value("cpu/maxmin_selective_update")), + || (xbt_cfg_is_default_value("cpu/maxmin-selective-update")), "Disabling selective update while using the lazy update mechanism is dumb!"); } else { xbt_die("Unsupported optimization (%s) for this model", optim); diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index 5a3ae15866..4c1cf0846a 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -43,9 +43,9 @@ void surf_network_model_init_LegrandVelho(void) surf_network_model = new simgrid::surf::NetworkCm02Model(); xbt_dynar_push(all_existing_models, &surf_network_model); - xbt_cfg_setdefault_double("network/latency_factor", 13.01); - xbt_cfg_setdefault_double("network/bandwidth_factor", 0.97); - xbt_cfg_setdefault_double("network/weight_S", 20537); + xbt_cfg_setdefault_double("network/latency-factor", 13.01); + xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97); + xbt_cfg_setdefault_double("network/weight-S", 20537); } /***************************************************************************/ @@ -68,9 +68,9 @@ void surf_network_model_init_CM02(void) surf_network_model = new simgrid::surf::NetworkCm02Model(); xbt_dynar_push(all_existing_models, &surf_network_model); - xbt_cfg_setdefault_double("network/latency_factor", 1.0); - xbt_cfg_setdefault_double("network/bandwidth_factor", 1.0); - xbt_cfg_setdefault_double("network/weight_S", 0.0); + xbt_cfg_setdefault_double("network/latency-factor", 1.0); + xbt_cfg_setdefault_double("network/bandwidth-factor", 1.0); + xbt_cfg_setdefault_double("network/weight-S", 0.0); } /***************************************************************************/ @@ -94,9 +94,9 @@ void surf_network_model_init_Reno(void) lmm_set_default_protocol_function(func_reno_f, func_reno_fp, func_reno_fpi); surf_network_model->f_networkSolve = lagrange_solve; - xbt_cfg_setdefault_double("network/latency_factor", 10.4); - xbt_cfg_setdefault_double("network/bandwidth_factor", 0.92); - xbt_cfg_setdefault_double("network/weight_S", 8775); + xbt_cfg_setdefault_double("network/latency-factor", 10.4); + xbt_cfg_setdefault_double("network/bandwidth-factor", 0.92); + xbt_cfg_setdefault_double("network/weight-S", 8775); } @@ -111,9 +111,9 @@ void surf_network_model_init_Reno2(void) lmm_set_default_protocol_function(func_reno2_f, func_reno2_fp, func_reno2_fpi); surf_network_model->f_networkSolve = lagrange_solve; - xbt_cfg_setdefault_double("network/latency_factor", 10.4); - xbt_cfg_setdefault_double("network/bandwidth_factor", 0.92); - xbt_cfg_setdefault_double("network/weight_S", 8775); + xbt_cfg_setdefault_double("network/latency-factor", 10.4); + xbt_cfg_setdefault_double("network/bandwidth-factor", 0.92); + xbt_cfg_setdefault_double("network/weight-S", 8775); } void surf_network_model_init_Vegas(void) @@ -127,9 +127,9 @@ void surf_network_model_init_Vegas(void) lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp, func_vegas_fpi); surf_network_model->f_networkSolve = lagrange_solve; - xbt_cfg_setdefault_double("network/latency_factor", 10.4); - xbt_cfg_setdefault_double("network/bandwidth_factor", 0.92); - xbt_cfg_setdefault_double("network/weight_S", 8775); + xbt_cfg_setdefault_double("network/latency-factor", 10.4); + xbt_cfg_setdefault_double("network/bandwidth-factor", 0.92); + xbt_cfg_setdefault_double("network/weight-S", 8775); } namespace simgrid { @@ -139,7 +139,7 @@ NetworkCm02Model::NetworkCm02Model() :NetworkModel() { char *optim = xbt_cfg_get_string("network/optim"); - int select = xbt_cfg_get_boolean("network/maxmin_selective_update"); + int select = xbt_cfg_get_boolean("network/maxmin-selective-update"); if (!strcmp(optim, "Full")) { updateMechanism_ = UM_FULL; @@ -147,7 +147,7 @@ NetworkCm02Model::NetworkCm02Model() } else if (!strcmp(optim, "Lazy")) { updateMechanism_ = UM_LAZY; selectiveUpdate_ = 1; - xbt_assert((select == 1) || (xbt_cfg_is_default_value("network/maxmin_selective_update")), + xbt_assert((select == 1) || (xbt_cfg_is_default_value("network/maxmin-selective-update")), "Disabling selective update while using the lazy update mechanism is dumb!"); } else { xbt_die("Unsupported optimization (%s) for this model", optim); diff --git a/src/surf/network_ib.cpp b/src/surf/network_ib.cpp index ebc4483ba9..ff2211bcd6 100644 --- a/src/surf/network_ib.cpp +++ b/src/surf/network_ib.cpp @@ -90,7 +90,7 @@ void surf_network_model_init_IB(void) networkActionStateChangedCallbacks.connect(IB_action_state_changed_callback); Link::onCommunicate.connect(IB_action_init_callback); simgrid::s4u::Host::onCreation.connect(IB_create_host_callback); - xbt_cfg_setdefault_double("network/weight_S", 8775); + xbt_cfg_setdefault_double("network/weight-S", 8775); } @@ -104,15 +104,15 @@ namespace simgrid { haveGap_=false; active_nodes=NULL; - const char* IB_factors_string=xbt_cfg_get_string("smpi/IB_penalty_factors"); + const char* IB_factors_string=xbt_cfg_get_string("smpi/IB-penalty-factors"); xbt_dynar_t radical_elements = xbt_str_split(IB_factors_string, ";"); surf_parse_assert(xbt_dynar_length(radical_elements)==3, - "smpi/IB_penalty_factors should be provided and contain 3 elements, semi-colon separated : for example 0.965;0.925;1.35"); + "smpi/IB-penalty-factors should be provided and contain 3 elements, semi-colon separated. Example: 0.965;0.925;1.35"); - Be = xbt_str_parse_double(xbt_dynar_get_as(radical_elements, 0, char *), "First part of smpi/IB_penalty_factors is not numerical: %s"); - Bs = xbt_str_parse_double(xbt_dynar_get_as(radical_elements, 1, char *), "Second part of smpi/IB_penalty_factors is not numerical: %s"); - ys = xbt_str_parse_double(xbt_dynar_get_as(radical_elements, 2, char *), "Third part of smpi/IB_penalty_factors is not numerical: %s"); + Be = xbt_str_parse_double(xbt_dynar_get_as(radical_elements, 0, char *), "First part of smpi/IB-penalty-factors is not numerical: %s"); + Bs = xbt_str_parse_double(xbt_dynar_get_as(radical_elements, 1, char *), "Second part of smpi/IB-penalty-factors is not numerical: %s"); + ys = xbt_str_parse_double(xbt_dynar_get_as(radical_elements, 2, char *), "Third part of smpi/IB-penalty-factors is not numerical: %s"); xbt_dynar_free(&radical_elements); } diff --git a/src/surf/network_smpi.cpp b/src/surf/network_smpi.cpp index ed9ece9f7d..8fcb6d452c 100644 --- a/src/surf/network_smpi.cpp +++ b/src/surf/network_smpi.cpp @@ -91,8 +91,8 @@ void surf_network_model_init_SMPI(void) surf_network_model = new simgrid::surf::NetworkSmpiModel(); xbt_dynar_push(all_existing_models, &surf_network_model); - xbt_cfg_setdefault_double("network/sender_gap", 10e-6); - xbt_cfg_setdefault_double("network/weight_S", 8775); + xbt_cfg_setdefault_double("network/sender-gap", 10e-6); + xbt_cfg_setdefault_double("network/weight-S", 8775); } namespace simgrid { @@ -172,7 +172,7 @@ namespace simgrid { double NetworkSmpiModel::bandwidthFactor(double size) { if (!smpi_bw_factor) - smpi_bw_factor = parse_factor(xbt_cfg_get_string("smpi/bw_factor")); + smpi_bw_factor = parse_factor(xbt_cfg_get_string("smpi/bw-factor")); unsigned int iter = 0; s_smpi_factor_t fact; @@ -192,7 +192,7 @@ namespace simgrid { double NetworkSmpiModel::latencyFactor(double size) { if (!smpi_lat_factor) - smpi_lat_factor = parse_factor(xbt_cfg_get_string("smpi/lat_factor")); + smpi_lat_factor = parse_factor(xbt_cfg_get_string("smpi/lat-factor")); unsigned int iter = 0; s_smpi_factor_t fact; diff --git a/teshsuite/simdag/availability/availability.tesh b/teshsuite/simdag/availability/availability.tesh index a9aed3a83a..df3f8ca676 100644 --- a/teshsuite/simdag/availability/availability.tesh +++ b/teshsuite/simdag/availability/availability.tesh @@ -1,5 +1,5 @@ -$ ${bindir:=.}/availability ../../../examples/platforms/simulacrum_7_hosts.xml ../../../examples/simdag/scheduling/Montage_25.xml --cfg=network/TCP_gamma:4194304 --log=sd_daxparse.thresh:critical -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' +$ ${bindir:=.}/availability ../../../examples/platforms/simulacrum_7_hosts.xml ../../../examples/simdag/scheduling/Montage_25.xml --cfg=network/TCP-gamma:4194304 --log=sd_daxparse.thresh:critical +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP-gamma' to '4194304' > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks. > [0.000000] [test/INFO] Scheduling DAX... > [0.000000] [test/INFO] Scheduling root to node: Host 26 diff --git a/teshsuite/simix/stack_overflow/stack_overflow.tesh b/teshsuite/simix/stack_overflow/stack_overflow.tesh index fc18efa7a9..83f666201d 100644 --- a/teshsuite/simix/stack_overflow/stack_overflow.tesh +++ b/teshsuite/simix/stack_overflow/stack_overflow.tesh @@ -1,5 +1,5 @@ ! expect signal SIGSEGV -$ ${bindir:=.}/stack_overflow --cfg=contexts/stack_size:96 ${srcdir:=.}/examples/platforms/small_platform.xml +$ ${bindir:=.}/stack_overflow --cfg=contexts/stack-size:96 ${srcdir:=.}/examples/platforms/small_platform.xml > [Tremblay:master:(0) 0.000000] [test/INFO] Launching our nice bugged recursive function... > Access violation detected. > This can result from a programming error in your code or, although less likely, diff --git a/teshsuite/smpi/bug-17132/bug-17132.tesh b/teshsuite/smpi/bug-17132/bug-17132.tesh index 57084efb4f..7778ebcf2c 100644 --- a/teshsuite/smpi/bug-17132/bug-17132.tesh +++ b/teshsuite/smpi/bug-17132/bug-17132.tesh @@ -2,6 +2,6 @@ $ ${bindir:=.}/../../../bin/smpirun -np 16 -platform ../../../examples/platforms > You requested to use 16 processes, but there is only 5 processes in your hostfile... > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP-gamma' to '4194304' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/cpu-threshold' to '-1' > Walltime = 0.468274 \ No newline at end of file diff --git a/teshsuite/smpi/macro-shared/macro-shared.tesh b/teshsuite/smpi/macro-shared/macro-shared.tesh index 169af5d6e4..7c45ae9bbb 100644 --- a/teshsuite/smpi/macro-shared/macro-shared.tesh +++ b/teshsuite/smpi/macro-shared/macro-shared.tesh @@ -5,7 +5,7 @@ p Test compute $ ${bindir:=.}/../../../bin/smpirun -hostfile ../hostfile -platform ../../../examples/platforms/small_platform.xml -np 4 ${bindir:=.}/macro-shared --log=smpi_kernel.thres:warning > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP-gamma' to '4194304' > [0] After change, the value in the shared buffer is: 16053117601147974045 > [0] The value in the shared buffer is: 4 > [1] After change, the value in the shared buffer is: 16053117601147974045 diff --git a/teshsuite/smpi/mpich3-test/runtests b/teshsuite/smpi/mpich3-test/runtests index ade3cb0bb3..1e35c24254 100755 --- a/teshsuite/smpi/mpich3-test/runtests +++ b/teshsuite/smpi/mpich3-test/runtests @@ -155,7 +155,7 @@ foreach $_ (@ARGV) { elsif (/--?maxnp=(.*)/) { $np_max = $1; } elsif (/--?tests=(.*)/) { $listfiles = $1; } elsif (/--?srcdir=(.*)/) { $srcdir = $1; - $mpiexec="$mpiexec -platform ${srcdir}/../../../../examples/platforms/small_platform_with_routers.xml -hostfile ${srcdir}/../../hostfile_coll --log=root.thr:critical --cfg=smpi/running-power:1e9 --cfg=smpi/async_small_thresh:65536"; } + $mpiexec="$mpiexec -platform ${srcdir}/../../../../examples/platforms/small_platform_with_routers.xml -hostfile ${srcdir}/../../hostfile_coll --log=root.thr:critical --cfg=smpi/running-power:1e9 --cfg=smpi/async-small-thresh:65536"; } elsif (/--?verbose/) { $verbose = 1; } elsif (/--?showprogress/) { $showProgress = 1; } elsif (/--?debug/) { $debug = 1; } diff --git a/teshsuite/smpi/pt2pt-dsend/pt2pt-dsend.tesh b/teshsuite/smpi/pt2pt-dsend/pt2pt-dsend.tesh index dc6d06e02c..32f88d6cb3 100644 --- a/teshsuite/smpi/pt2pt-dsend/pt2pt-dsend.tesh +++ b/teshsuite/smpi/pt2pt-dsend/pt2pt-dsend.tesh @@ -4,7 +4,7 @@ p Test dsend $ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/platforms/small_platform.xml -np 2 ${bindir:=.}/pt2pt-dsend -q --log=smpi_kernel.thres:warning > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP-gamma' to '4194304' > [Jupiter:1:(2) 0.000000] [dsend/INFO] rank 1: data exchanged > [Tremblay:0:(1) 0.002945] [dsend/INFO] rank 0: data exchanged > [rank 0] -> Tremblay diff --git a/teshsuite/smpi/pt2pt-pingpong/TI_output.tesh b/teshsuite/smpi/pt2pt-pingpong/TI_output.tesh index 4f39d7f6f2..b4dd15c6f6 100644 --- a/teshsuite/smpi/pt2pt-pingpong/TI_output.tesh +++ b/teshsuite/smpi/pt2pt-pingpong/TI_output.tesh @@ -17,7 +17,7 @@ $ ${bindir:=.}/../../../bin/smpirun -trace-ti --cfg=tracing/filename:out_in_ti.t > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi/computing' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP-gamma' to '4194304' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'out_in_ti.txt' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/cpu-threshold' to '-1' > [0] About to send 1st message '99' to process [1] @@ -52,7 +52,7 @@ $ ${bindir:=.}/../../../bin/smpirun -ext smpi_replay --log=replay.:critical -tra > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi/computing' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP-gamma' to '4194304' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'out_ti.txt' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/cpu-threshold' to '-1' > [Jupiter:1:(2) 0.016798] [smpi_replay/INFO] Simulation time 0.016798 @@ -123,7 +123,7 @@ $ ${bindir:=.}/../../../bin/smpirun -trace-ti --cfg=tracing/filename:out_in_ti.t > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi/computing' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP-gamma' to '4194304' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'out_in_ti.txt' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi/format/ti_one_file' to 'yes' > [0] About to send 1st message '99' to process [1] @@ -158,7 +158,7 @@ $ ${bindir:=.}/../../../bin/smpirun -ext smpi_replay --log=replay.:critical -tra > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi/computing' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP-gamma' to '4194304' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'out_ti.txt' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/smpi/format/ti_one_file' to 'yes' > [Jupiter:1:(2) 0.016798] [smpi_replay/INFO] Simulation time 0.016798 diff --git a/teshsuite/smpi/pt2pt-pingpong/pt2pt-pingpong.tesh b/teshsuite/smpi/pt2pt-pingpong/pt2pt-pingpong.tesh index 58d1ff26be..82a59faeb3 100644 --- a/teshsuite/smpi/pt2pt-pingpong/pt2pt-pingpong.tesh +++ b/teshsuite/smpi/pt2pt-pingpong/pt2pt-pingpong.tesh @@ -8,7 +8,7 @@ $ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile -platform ../../. > == pivot=2 : pingpong [2] <--> [3] > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP-gamma' to '4194304' > [0] About to send 1st message '99' to process [1] > [0] Received reply message '100' from process [1] > [1] About to send 1st message '100' to process [2] diff --git a/teshsuite/smpi/type-hvector/type-hvector.tesh b/teshsuite/smpi/type-hvector/type-hvector.tesh index 4ac0fecd58..138ed781d9 100644 --- a/teshsuite/smpi/type-hvector/type-hvector.tesh +++ b/teshsuite/smpi/type-hvector/type-hvector.tesh @@ -4,7 +4,7 @@ p Test hvector $ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/platforms/small_platform.xml -np 2 ${bindir:=.}/type-hvector -q --log=smpi_kernel.thres:warning > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP-gamma' to '4194304' > [rank 0] -> Tremblay > [rank 1] -> Jupiter > rank= 0, a[0][0]=0.000000 diff --git a/teshsuite/smpi/type-indexed/type-indexed.tesh b/teshsuite/smpi/type-indexed/type-indexed.tesh index 7ee71b54d7..a125182131 100644 --- a/teshsuite/smpi/type-indexed/type-indexed.tesh +++ b/teshsuite/smpi/type-indexed/type-indexed.tesh @@ -4,7 +4,7 @@ p Test indexed $ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/platforms/small_platform.xml -np 2 ${bindir:=.}/type-indexed -q --log=smpi_kernel.thres:warning > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP-gamma' to '4194304' > [rank 0] -> Tremblay > [rank 1] -> Jupiter > buffer[0] = 0 diff --git a/teshsuite/smpi/type-struct/type-struct.tesh b/teshsuite/smpi/type-struct/type-struct.tesh index 942ebc09b2..afeb485ab2 100644 --- a/teshsuite/smpi/type-struct/type-struct.tesh +++ b/teshsuite/smpi/type-struct/type-struct.tesh @@ -6,6 +6,6 @@ $ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile -platform ../../. > [rank 1] -> Jupiter > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP-gamma' to '4194304' > Process 0 got -2 (-2?) and 8.000000 (8.0?), tab (should be all 0): 0 0 0 0 0 0 > Process 1 got -2 (-2?) and 8.000000 (8.0?), tab (should be all 0): 0 0 0 0 0 0 diff --git a/teshsuite/smpi/type-vector/type-vector.tesh b/teshsuite/smpi/type-vector/type-vector.tesh index 27eb654e74..1be8935c20 100644 --- a/teshsuite/smpi/type-vector/type-vector.tesh +++ b/teshsuite/smpi/type-vector/type-vector.tesh @@ -4,7 +4,7 @@ p Test vector $ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile -platform ${srcdir:=.}/../../../examples/platforms/small_platform.xml -np 2 ${bindir:=.}/type-vector -q --log=smpi_kernel.thres:warning > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'surf/precision' to '1e-9' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP-gamma' to '4194304' > [rank 0] -> Tremblay > [rank 1] -> Jupiter > rank= 0, a[0][0]=0.000000 -- 2.20.1