christoph/fail
1
Fork 0
Code Releases Activity

prune-trace+DBCampaign: default to variant/benchmark %

Browse Source 
If no --variant / --benchmark is specified, it's more reasonable to
prune or run *all* variants/benchmarks (using the wildcard "%")
instead of defaulting to "none"/"none".  The trivial case with only
one single variant/benchmark (which may still be "none"/"none" if
import-trace's default is used) is still covered by this new default
behavior.

Change-Id: I0e9001137d5e052183dd74211e2edbcfab749528
This commit is contained in:
Horst Schirmeier
2014-05-09 00:46:30 +02:00
parent 0da8ba0dec
commit 0e1ed1feab
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/cpn/DatabaseCampaign.cc
View File

@ -29,9 +29,9 @@ bool DatabaseCampaign::run() {
if (!cb_commandline_init()) return false; if (!cb_commandline_init()) return false;
CommandLine::option_handle VARIANT = cmd.addOption("v", "variant", Arg::Required, CommandLine::option_handle VARIANT = cmd.addOption("v", "variant", Arg::Required,
"-v/--variant \tVariant label (default: \"none\"; use % and _ as wildcard characters)"); "-v/--variant \tVariant label (default: \"%\"; use % and _ as wildcard characters)");
CommandLine::option_handle BENCHMARK = cmd.addOption("b", "benchmark", Arg::Required, CommandLine::option_handle BENCHMARK = cmd.addOption("b", "benchmark", Arg::Required,
"-b/--benchmark \tBenchmark label (default: \"none\"; use % and _ as wildcard characters)\n"); "-b/--benchmark \tBenchmark label (default: \"%\"; use % and _ as wildcard characters)\n");
CommandLine::option_handle PRUNER = cmd.addOption("p", "prune-method", Arg::Required, CommandLine::option_handle PRUNER = cmd.addOption("p", "prune-method", Arg::Required,
"-p/--prune-method \tWhich import method to use (default: basic)"); "-p/--prune-method \tWhich import method to use (default: basic)");
@ -50,12 +50,12 @@ bool DatabaseCampaign::run() {
if (cmd[VARIANT].count() > 0) if (cmd[VARIANT].count() > 0)
variant = std::string(cmd[VARIANT].first()->arg); variant = std::string(cmd[VARIANT].first()->arg);
else else
variant = "none"; variant = "%";
if (cmd[BENCHMARK].count() > 0) if (cmd[BENCHMARK].count() > 0)
benchmark = std::string(cmd[BENCHMARK].first()->arg); benchmark = std::string(cmd[BENCHMARK].first()->arg);
else else
benchmark = "none"; benchmark = "%";
if (cmd[PRUNER].count() > 0) if (cmd[PRUNER].count() > 0)
pruner = std::string(cmd[PRUNER].first()->arg); pruner = std::string(cmd[PRUNER].first()->arg);

12
tools/prune-trace/main.cc
View File

@ -29,13 +29,13 @@ int main(int argc, char *argv[]) {
CommandLine::option_handle VARIANT = CommandLine::option_handle VARIANT =
cmd.addOption("v", "variant", Arg::Required, cmd.addOption("v", "variant", Arg::Required,
"-v/--variant \tVariant label (default: \"none\"; use % and _ as wildcard characters; may be used more than once)"); "-v/--variant \tVariant label (default: \"%\"; use % and _ as wildcard characters; may be used more than once)");
CommandLine::option_handle VARIANT_EXCLUDE = CommandLine::option_handle VARIANT_EXCLUDE =
cmd.addOption("", "variant-exclude", Arg::Required, cmd.addOption("", "variant-exclude", Arg::Required,
"--variant-exclude \tVariant to exclude (default: UNSET; use % and _ as wildcard characters; may be used more than once)"); "--variant-exclude \tVariant to exclude (default: UNSET; use % and _ as wildcard characters; may be used more than once)");
CommandLine::option_handle BENCHMARK = CommandLine::option_handle BENCHMARK =
cmd.addOption("b", "benchmark", Arg::Required, cmd.addOption("b", "benchmark", Arg::Required,
"-b/--benchmark \tBenchmark label (default: \"none\"; use % and _ as wildcard characters; may be used more than once)"); "-b/--benchmark \tBenchmark label (default: \"%\"; use % and _ as wildcard characters; may be used more than once)");
CommandLine::option_handle BENCHMARK_EXCLUDE = CommandLine::option_handle BENCHMARK_EXCLUDE =
cmd.addOption("", "benchmark-exclude", Arg::Required, cmd.addOption("", "benchmark-exclude", Arg::Required,
"--benchmark-exclude \tBenchmark to exclude (default: UNSET; use % and _ as wildcard characters; may be used more than once)"); "--benchmark-exclude \tBenchmark to exclude (default: UNSET; use % and _ as wildcard characters; may be used more than once)");
@ -103,8 +103,8 @@ int main(int argc, char *argv[]) {
} }
// fallback // fallback
if (variants.size() == 0 && variants_exclude.size() == 0) { if (variants.size() == 0) {
variants.push_back(std::string("none")); variants.push_back("%");
} }
if (cmd[BENCHMARK]) { if (cmd[BENCHMARK]) {
@ -120,8 +120,8 @@ int main(int argc, char *argv[]) {
} }
// fallback // fallback
if (benchmarks.size() == 0 && benchmarks_exclude.size() == 0) { if (benchmarks.size() == 0) {
benchmarks.push_back(std::string("none")); benchmarks.push_back("%");
} }
if (!pruner->init(db, variants, variants_exclude, benchmarks, benchmarks_exclude)) { if (!pruner->init(db, variants, variants_exclude, benchmarks, benchmarks_exclude)) {