From 7ee405c0c792aef83435a2a6fc0a10734f47ba97 Mon Sep 17 00:00:00 2001 From: Cristian Cadar Date: Sun, 8 Apr 2012 23:46:46 +0000 Subject: Fixed --max-stp-time, which wasn't working unless --use-forked-stp was also used. Thanks to Paul Marinescu for reporting and debugging this. The patch also disables the STP timeout by default. git-svn-id: https://llvm.org/svn/llvm-project/klee/trunk@154300 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Core/Executor.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'lib/Core/Executor.cpp') diff --git a/lib/Core/Executor.cpp b/lib/Core/Executor.cpp index 462db18b..917a746d 100644 --- a/lib/Core/Executor.cpp +++ b/lib/Core/Executor.cpp @@ -209,7 +209,7 @@ namespace { cl::opt MaxInstructionTime("max-instruction-time", - cl::desc("Only allow a single instruction to take this much time (default=0 (off))"), + cl::desc("Only allow a single instruction to take this much time (default=0s (off)). Enables --use-forked-stp"), cl::init(0)); cl::opt @@ -219,8 +219,8 @@ namespace { cl::opt MaxSTPTime("max-stp-time", - cl::desc("Maximum amount of time for a single query (default=120s)"), - cl::init(120.0)); + cl::desc("Maximum amount of time for a single query (default=0s (off)). Enables --use-forked-stp"), + cl::init(0.0)); cl::opt StopAfterNInstructions("stop-after-n-instructions", @@ -249,7 +249,7 @@ namespace { cl::opt UseForkedSTP("use-forked-stp", - cl::desc("Run STP in forked process")); + cl::desc("Run STP in a forked process (default=off)")); cl::opt STPOptimizeDivides("stp-optimize-divides", @@ -317,6 +317,7 @@ Executor::Executor(const InterpreterOptions &opts, stpTimeout(MaxSTPTime != 0 && MaxInstructionTime != 0 ? std::min(MaxSTPTime,MaxInstructionTime) : std::max(MaxSTPTime,MaxInstructionTime)) { + if (stpTimeout) UseForkedSTP = true; STPSolver *stpSolver = new STPSolver(UseForkedSTP, STPOptimizeDivides); Solver *solver = constructSolverChain(stpSolver, -- cgit 1.4.1