From a235f4233cb2495709ecd10086515851b9948017 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 24 Apr 2016 21:49:05 +0200 Subject: [PATCH] start converting option names to kebab-case --- ChangeLog | 1 - doc/doxygen/options.doc | 9 ++++----- examples/msg/mc/bugged1_liveness_sparse.tesh | 2 +- examples/msg/mc/bugged1_liveness_visited_sparse.tesh | 2 +- src/simgrid/sg_config.cpp | 2 +- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9a2002761f..5a5649d99c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,7 +4,6 @@ SimGrid (3.13) UNRELEASED; urgency=low Backwards Compatibility breaks - Some command line options were renamed for consistency sake: - - model-check/sparse-checkpoint -> model-check/sparse_checkpoint - smpi/async_small_thres -> smpi/async_small_thresh - smpi/send_is_detached_thres -> smpi/send_is_detached_thresh diff --git a/doc/doxygen/options.doc b/doc/doxygen/options.doc index 4488c39acf..0fd9af96db 100644 --- a/doc/doxygen/options.doc +++ b/doc/doxygen/options.doc @@ -439,7 +439,7 @@ reach GiB ou Tib of memory. However, for many workloads, the memory does not change much between different snapshots and taking a complete copy of each snapshot is a waste of memory. -The \b model-check/sparse_checkpoint option item can be set to \b yes in order +The \b model-check/sparse-checkpoint option item can be set to \b yes in order to avoid making a complete copy of each snapshot: instead, each snapshot will be decomposed in blocks which will be stored separately. If multiple snapshots share the same block (or if the same block @@ -465,7 +465,7 @@ really meaningful: you should expect the contribution of the memory consumption of the snapshots to be \f$ \mbox{number of processes} \times \mbox{stack size} \times \mbox{number of states} \f$. -The \b model-check/sparse_checkpoint can be used to reduce the memory +The \b model-check/sparse-checkpoint can be used to reduce the memory consumption by trying to share memory between the different snapshots. When compiled against the model checker, the stacks are not @@ -1083,7 +1083,6 @@ silently overflow on other parts of the memory. - \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/send_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 @@ -1091,8 +1090,8 @@ silently overflow on other parts of the memory. - \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_sparse_checkpoint -- \c model-check/sparse_checkpoint: \ref options_modelchecking_sparse_checkpoint +- \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 diff --git a/examples/msg/mc/bugged1_liveness_sparse.tesh b/examples/msg/mc/bugged1_liveness_sparse.tesh index d91a7ce841..89db44558d 100644 --- a/examples/msg/mc/bugged1_liveness_sparse.tesh +++ b/examples/msg/mc/bugged1_liveness_sparse.tesh @@ -3,7 +3,7 @@ ! expect return 2 ! timeout 20 ! ignore output -$ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/bugged1_liveness ${srcdir:=.}/../../platforms/platform.xml ${srcdir:=.}/deploy_bugged1_liveness.xml --log=xbt_cfg.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext --cfg=contexts/stack_size:256 --cfg=model-check/sparse_checkpoint:yes --cfg=model-check/property:promela_bugged1_liveness +$ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/bugged1_liveness ${srcdir:=.}/../../platforms/platform.xml ${srcdir:=.}/deploy_bugged1_liveness.xml --log=xbt_cfg.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext --cfg=contexts/stack_size:256 --cfg=model-check/sparse-checkpoint:yes --cfg=model-check/property:promela_bugged1_liveness > [ 0.000000] (0:maestro@) Check the liveness property promela_bugged1_liveness > [ 0.000000] (2:client@Boivin) Ask the request > [ 0.000000] (3:client@Fafard) Ask the request diff --git a/examples/msg/mc/bugged1_liveness_visited_sparse.tesh b/examples/msg/mc/bugged1_liveness_visited_sparse.tesh index ebea952d7f..a717b1ecec 100644 --- a/examples/msg/mc/bugged1_liveness_visited_sparse.tesh +++ b/examples/msg/mc/bugged1_liveness_visited_sparse.tesh @@ -3,7 +3,7 @@ ! expect return 2 ! timeout 20 ! output ignore -$ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/bugged1_liveness ${srcdir:=.}/../../platforms/platform.xml ${srcdir:=.}/deploy_bugged1_liveness_visited.xml --log=xbt_cfg.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext --cfg=model-check/visited:100 --cfg=contexts/stack_size:256 --cfg=model-check/sparse_checkpoint:yes --cfg=model-check/property:promela_bugged1_liveness +$ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/bugged1_liveness ${srcdir:=.}/../../platforms/platform.xml ${srcdir:=.}/deploy_bugged1_liveness_visited.xml --log=xbt_cfg.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext --cfg=model-check/visited:100 --cfg=contexts/stack_size:256 --cfg=model-check/sparse-checkpoint:yes --cfg=model-check/property:promela_bugged1_liveness > [ 0.000000] (0:maestro@) Check the liveness property promela_bugged1_liveness > [ 0.000000] (2:client@Boivin) Ask the request > [ 0.000000] (3:client@Fafard) Ask the request diff --git a/src/simgrid/sg_config.cpp b/src/simgrid/sg_config.cpp index 98142d3d58..f188ea5e91 100644 --- a/src/simgrid/sg_config.cpp +++ b/src/simgrid/sg_config.cpp @@ -504,7 +504,7 @@ void sg_config_init(int *argc, char **argv) "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."); - xbt_cfg_register_boolean("model-check/sparse_checkpoint", "no", _mc_cfg_cb_sparse_checkpoint, "Use sparse per-page snapshots."); + xbt_cfg_register_boolean("model-check/sparse-checkpoint", "no", _mc_cfg_cb_sparse_checkpoint, "Use sparse per-page snapshots."); xbt_cfg_register_boolean("model-check/ksm", "no", _mc_cfg_cb_ksm, "Kernel same-page merging"); xbt_cfg_register_string("model-check/property","", _mc_cfg_cb_property, -- 2.20.1