From 0975b8ae050388e9bfbd8fa076ca1ed50643d2a6 Mon Sep 17 00:00:00 2001 From: Christian Heinrich Date: Sat, 30 Jan 2016 18:45:20 +0100 Subject: [PATCH] [MC] Renamed option sparse-checkpoint to sparse_checkpoint We need to have a common naming scheme for options in place. --- ChangeLog | 6 ++++++ doc/doxygen/options.doc | 6 +++--- examples/msg/mc/bugged1_liveness_sparse.tesh | 2 +- examples/msg/mc/bugged1_liveness_visited_sparse.tesh | 2 +- src/simgrid/sg_config.c | 4 ++-- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5fe765cbaa..b1d47060a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,12 @@ SimGrid (3.13) UNRELEASED; urgency=low the lambda or closure passed as a parameter will run in kernel mode. Every callbacks should be rewritten to that interface at some point. + MC + * BC breaks: + - The option "model-check/sparse-checkpoint" was renamed to + "model-check/sparse_checkpoint" as we attempt to unify our naming + schemes. + Surf * Reorganizing and cleaning the internals all around the place. diff --git a/doc/doxygen/options.doc b/doc/doxygen/options.doc index c01adfc150..a690ad3957 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 @@ -1092,7 +1092,7 @@ silently overflow on other parts of the memory. - \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/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 fec3097584..2cb31c9d68 100644 --- a/examples/msg/mc/bugged1_liveness_sparse.tesh +++ b/examples/msg/mc/bugged1_liveness_sparse.tesh @@ -2,7 +2,7 @@ ! expect return 2 ! timeout 10 -$ ${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 58993e3b2d..8e42ec9eb6 100644 --- a/examples/msg/mc/bugged1_liveness_visited_sparse.tesh +++ b/examples/msg/mc/bugged1_liveness_visited_sparse.tesh @@ -2,7 +2,7 @@ ! expect return 2 ! timeout 10 -$ ${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.c b/src/simgrid/sg_config.c index c6316bb6f5..760acb6994 100644 --- a/src/simgrid/sg_config.c +++ b/src/simgrid/sg_config.c @@ -614,10 +614,10 @@ void sg_config_init(int *argc, char **argv) xbt_cfg_setdefault_int(_sg_cfg_set, "model-check/checkpoint", 0); /* do stateful model-checking */ - xbt_cfg_register(&_sg_cfg_set, "model-check/sparse-checkpoint", + xbt_cfg_register(&_sg_cfg_set, "model-check/sparse_checkpoint", "Use sparse per-page snapshots.", xbt_cfgelm_boolean, 1, 1, _mc_cfg_cb_sparse_checkpoint, NULL); - xbt_cfg_setdefault_boolean(_sg_cfg_set, "model-check/sparse-checkpoint", "no"); + xbt_cfg_setdefault_boolean(_sg_cfg_set, "model-check/sparse_checkpoint", "no"); /* do stateful model-checking */ xbt_cfg_register(&_sg_cfg_set, "model-check/soft-dirty", -- 2.20.1