From 41d7a8a64b82c7b7212f7865b691f68d62683b6b Mon Sep 17 00:00:00 2001
From: Andrey Konovalov <andreyknvl@google.com>
Date: Fri, 23 Jun 2017 19:09:50 +0200
Subject: repro: add 1 minute duration

---
 pkg/repro/repro.go | 56 +++++++++++++++++++++---------------------------------
 1 file changed, 22 insertions(+), 34 deletions(-)

(limited to 'pkg')

diff --git a/pkg/repro/repro.go b/pkg/repro/repro.go
index 91f6dab82..b335a2ccc 100644
--- a/pkg/repro/repro.go
+++ b/pkg/repro/repro.go
@@ -187,42 +187,30 @@ func (ctx *context) reproExtractProg(entries []*prog.LogEntry) (*Result, error)
 		lastEntries = append(lastEntries, entries[indices[i]])
 	}
 
-	// Execute each program separately for 10 seconds, that should detect simple crashes (i.e. no races and no hangs).
-	// Programs are executed in reverse order, usually the last program is the guilty one.
-	res, err := ctx.reproExtractProgSingle(reverseEntries(lastEntries), 10*time.Second)
-	if err != nil {
-		return res, err
-	}
-	if res != nil {
-		return res, nil
-	}
-
-	// Execute all programs and bisect the log to find guilty programs.
-	res, err = ctx.reproExtractProgBisect(reverseEntries(entries), 10*time.Second)
-	if err != nil {
-		return res, err
-	}
-	if res != nil {
-		return res, nil
-	}
-
-	// Execute each program separately for 5 minutes to catch races and hangs. Note that the max duration must be larger
+	// The shortest duration is 10 seconds to detect simple crashes (i.e. no races and no hangs).
+	// The longest duration is 5 minutes to catch races and hangs. Note that this value must be larger
 	// than hang/no output detection duration in vm.MonitorExecution, which is currently set to 3 mins.
-	res, err = ctx.reproExtractProgSingle(reverseEntries(lastEntries), 5*time.Minute)
-	if err != nil {
-		return res, err
-	}
-	if res != nil {
-		return res, nil
-	}
+	timeouts := []time.Duration{10*time.Second, 1*time.Minute, 5*time.Minute}
 
-	// Execute all programs and bisect the log with 5 minute timeout.
-	res, err = ctx.reproExtractProgBisect(reverseEntries(entries), 5*time.Minute)
-	if err != nil {
-		return res, err
-	}
-	if res != nil {
-		return res, nil
+	for _, timeout := range timeouts {
+		// Execute each program separately to detect simple crashes caused by a single program.
+		// Programs are executed in reverse order, usually the last program is the guilty one.
+		res, err := ctx.reproExtractProgSingle(reverseEntries(lastEntries), timeout)
+		if err != nil {
+			return res, err
+		}
+		if res != nil {
+			return res, nil
+		}
+
+		// Execute all programs and bisect the log to find multiple guilty programs.
+		res, err = ctx.reproExtractProgBisect(reverseEntries(entries), timeout)
+		if err != nil {
+			return res, err
+		}
+		if res != nil {
+			return res, nil
+		}
 	}
 
 	Logf(0, "reproducing crash '%v': no program crashed", ctx.crashDesc)
-- 
cgit mrf-deployment