2 files changed, 23 insertions, 16 deletions
diff --git a/lib/Core/Searcher.cpp b/lib/Core/Searcher.cpp
index db295468..47457a91 100644
--- a/lib/Core/Searcher.cpp
+++ b/lib/Core/Searcher.cpp
@@ -351,9 +351,11 @@ BatchingSearcher::~BatchingSearcher() {
 }
 
 ExecutionState &BatchingSearcher::selectState() {
-  if (!lastState || 
-      (time::getWallTime() - lastStartTime) > timeBudget ||
-      (stats::instructions - lastStartInstructions) > instructionBudget) {
+  if (!lastState ||
+      (((timeBudget.toSeconds() > 0) &&
+        (time::getWallTime() - lastStartTime) > timeBudget)) ||
+      ((instructionBudget > 0) &&
+       (stats::instructions - lastStartInstructions) > instructionBudget)) {
     if (lastState) {
       time::Span delta = time::getWallTime() - lastStartTime;
       auto t = timeBudget;
diff --git a/lib/Core/UserSearcher.cpp b/lib/Core/UserSearcher.cpp
index 754b3796..7efdb30d 100644
--- a/lib/Core/UserSearcher.cpp
+++ b/lib/Core/UserSearcher.cpp
@@ -56,25 +56,30 @@ cl::opt<bool> UseIterativeDeepeningTimeSearch(
     "use-iterative-deepening-time-search",
     cl::desc(
         "Use iterative deepening time search (experimental) (default=false)"),
-    cl::init(false), cl::cat(SearchCat));
+    cl::init(false),
+    cl::cat(SearchCat));
 
 cl::opt<bool> UseBatchingSearch(
     "use-batching-search",
     cl::desc("Use batching searcher (keep running selected state for N "
              "instructions/time, see --batch-instructions and --batch-time) "
              "(default=false)"),
-    cl::init(false), cl::cat(SearchCat));
-
-cl::opt<unsigned>
-    BatchInstructions("batch-instructions",
-                      cl::desc("Number of instructions to batch when using "
-                               "--use-batching-search (default=10000)"),
-                      cl::init(10000), cl::cat(SearchCat));
-
-cl::opt<std::string> BatchTime("batch-time",
-                               cl::desc("Amount of time to batch when using "
-                                        "--use-batching-search (default=5s)"),
-                               cl::init("5s"), cl::cat(SearchCat));
+    cl::init(false),
+    cl::cat(SearchCat));
+
+cl::opt<unsigned> BatchInstructions(
+    "batch-instructions",
+    cl::desc("Number of instructions to batch when using "
+             "--use-batching-search.  Set to 0 to disable (default=10000)"),
+    cl::init(10000),
+    cl::cat(SearchCat));
+
+cl::opt<std::string> BatchTime(
+    "batch-time",
+    cl::desc("Amount of time to batch when using "
+             "--use-batching-search.  Set to 0s to disable (default=5s)"),
+    cl::init("5s"),
+    cl::cat(SearchCat));
 
 } // namespace