From db2a0dc056d5baf46cc47790b833d0f96ad6a4ac Mon Sep 17 00:00:00 2001 From: Horst Schirmeier Date: Thu, 18 Sep 2014 13:43:40 +0200 Subject: [PATCH] prune-trace: fix pruner listing change Commit 89817cf13fad6ee1c71d42179784fe1c0d5d15a2 did not completely remove the manual pruner instantiation code. Change-Id: I00dab9e3f4f3e2acf1d0f285237cc03a968aabfb --- tools/prune-trace/main.cc | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/tools/prune-trace/main.cc b/tools/prune-trace/main.cc index 1bcd96ec..03a5ac6a 100644 --- a/tools/prune-trace/main.cc +++ b/tools/prune-trace/main.cc @@ -81,30 +81,10 @@ int main(int argc, char *argv[]) { std::cerr << "Available pruning methods: " << pruners << std::endl; exit(-1); } + registry.getPrimeAlias(pruner, pruner_name); + LOG << "Using " << pruner_name << endl; - if (cmd[PRUNER]) { - std::string imp(cmd[PRUNER].first()->arg); - if (imp == "BasicPruner" || imp == "basic") { - LOG << "Using BasicPruner" << endl; - pruner = new BasicPruner(); - } else if (imp == "BasicPrunerLeft" || imp == "basic-left") { - LOG << "Using BasicPruner (use left border, instr1)" << endl; - pruner = new BasicPruner(true); - } else if (imp == "FESamplingPruner" || imp == "sampling") { - LOG << "Using FESamplingPruner" << endl; - pruner = new FESamplingPruner; - - } else { - LOG << "Unknown pruning method: " << imp << endl; - exit(-1); - } - - } else { - LOG << "Using BasicPruner" << endl; - pruner = new BasicPruner(); - } - - if (pruner && !(pruner->commandline_init())) { + if (!(pruner->commandline_init())) { std::cerr << "Pruner's commandline initialization failed" << std::endl; exit(-1); }