From: Kostya Serebryany <kcc@google.com>
Date: Tue, 26 May 2015 20:57:47 +0000 (+0000)
Subject: [lib/Fuzzer] make the fuzzing timeout 1200 seconds by default (was: infinity)
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=commitdiff_plain;h=ea8a3963b4098f0f87fba384747bc32b15243f03

[lib/Fuzzer] make the fuzzing timeout 1200 seconds by default (was: infinity)

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@238251 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/docs/LibFuzzer.rst b/docs/LibFuzzer.rst
index 412087ac726..47bdfd3a27d 100644
--- a/docs/LibFuzzer.rst
+++ b/docs/LibFuzzer.rst
@@ -59,7 +59,7 @@ The most important flags are::
   max_len                            	64	Maximum length of the test input.
   cross_over                         	1	If 1, cross over inputs.
   mutate_depth                       	5	Apply this number of consecutive mutations to each input.
-  timeout                            	-1	Timeout in seconds (if positive). If one unit runs more than this number of seconds the process will abort.
+  timeout                            	1200	Timeout in seconds (if positive). If one unit runs more than this number of seconds the process will abort.
   help                               	0	Print help.
   save_minimized_corpus              	0	If 1, the minimized corpus is saved into the first input directory
   jobs                               	0	Number of jobs to run. If jobs >= 1 we spawn this number of jobs in separate worker processes with stdout/stderr redirected to fuzz-JOB.log.
diff --git a/lib/Fuzzer/FuzzerFlags.def b/lib/Fuzzer/FuzzerFlags.def
index 8157714b65e..742f672e201 100644
--- a/lib/Fuzzer/FuzzerFlags.def
+++ b/lib/Fuzzer/FuzzerFlags.def
@@ -28,7 +28,7 @@ FUZZER_FLAG_INT(
 FUZZER_FLAG_INT(exit_on_first, 0,
             "If 1, exit after the first new interesting input is found.")
 FUZZER_FLAG_INT(
-    timeout, -1,
+    timeout, 1200,
     "Timeout in seconds (if positive). "
     "If one unit runs more than this number of seconds the process will abort.")
 FUZZER_FLAG_INT(help, 0, "Print help.")
diff --git a/lib/Fuzzer/FuzzerLoop.cpp b/lib/Fuzzer/FuzzerLoop.cpp
index 1b6a82fe4a8..4c8b247a72e 100644
--- a/lib/Fuzzer/FuzzerLoop.cpp
+++ b/lib/Fuzzer/FuzzerLoop.cpp
@@ -66,6 +66,8 @@ void Fuzzer::AlarmCallback() {
     Printf("AlarmCallback %zd\n", Seconds);
   if (Seconds >= (size_t)Options.UnitTimeoutSec) {
     Printf("ALARM: working on the last Unit for %zd seconds\n", Seconds);
+    Printf("       and the timeout value is %d (use -timeout=N to change)\n",
+           Options.UnitTimeoutSec);
     Print(CurrentUnit, "\n");
     PrintUnitInASCIIOrTokens(CurrentUnit, "\n");
     WriteToCrash(CurrentUnit, "timeout-");