tools/syz-stress: switch to the new corpus database format

1 files changed, 6 insertions, 17 deletions

diff --git a/tools/syz-stress/stress.go b/tools/syz-stress/stress.go
index 52a3f40b4..0b8de48d8 100644
--- a/tools/syz-stress/stress.go
+++ b/tools/syz-stress/stress.go
@@ -4,10 +4,8 @@
 package main
 
 import (
-	"archive/zip"
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"math/rand"
 	"os"
 	"regexp"
@@ -16,6 +14,7 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/google/syzkaller/db"
 	"github.com/google/syzkaller/host"
 	"github.com/google/syzkaller/ipc"
 	. "github.com/google/syzkaller/log"
@@ -24,7 +23,7 @@ import (
 )
 
 var (
-	flagCorpus   = flag.String("corpus", "", "zip file with corpus")
+	flagCorpus   = flag.String("corpus", "", "corpus database")
 	flagExecutor = flag.String("executor", "./syz-executor", "path to executor binary")
 	flagOutput   = flag.Bool("output", false, "print executor output to console")
 	flagProcs    = flag.Int("procs", 2*runtime.NumCPU(), "number of parallel processes")
@@ -119,28 +118,18 @@ func readCorpus() []*prog.Prog {
 	if *flagCorpus == "" {
 		return nil
 	}
-	zipr, err := zip.OpenReader(*flagCorpus)
+	db, err := db.Open(*flagCorpus)
 	if err != nil {
-		Fatalf("failed to open bin file: %v", err)
+		Fatalf("failed to open corpus database: %v", err)
 	}
 	var progs []*prog.Prog
-	for _, zipf := range zipr.File {
-		r, err := zipf.Open()
-		if err != nil {
-			Fatalf("failed to uzip file from input archive: %v", err)
-		}
-		data, err := ioutil.ReadAll(r)
-		if err != nil {
-			Fatalf("failed to read corpus file: %v", err)
-		}
-		p, err := prog.Deserialize(data)
+	for _, rec := range db.Records {
+		p, err := prog.Deserialize(rec.Val)
 		if err != nil {
 			Fatalf("failed to deserialize corpus program: %v", err)
 		}
 		progs = append(progs, p)
-		r.Close()
 	}
-	zipr.Close()
 	return progs
 }