From 0e66a66bce4e4cca02a6a5bdb420bf3bb24b3540 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <alexander@bumpern.de>
Date: Sun, 6 Dec 2015 17:09:06 +0100
Subject: [PATCH] read packs concurrently

---
 checker/checker.go      | 43 +++++++++++++++++++++++++++++++----------
 cmd/restic/cmd_check.go | 13 +++++++++++++
 2 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/checker/checker.go b/checker/checker.go
index 43a125336..8f9a39905 100644
--- a/checker/checker.go
+++ b/checker/checker.go
@@ -693,18 +693,41 @@ func checkPack(r *repository.Repository, id backend.ID) error {
 func (c *Checker) ReadData(errChan chan<- error, done <-chan struct{}) {
 	defer close(errChan)
 
-	for packID := range c.repo.List(backend.Data, done) {
-		debug.Log("Checker.ReadData", "checking pack %v", packID.Str())
+	worker := func(wg *sync.WaitGroup, in <-chan backend.ID) {
+		defer wg.Done()
+		for {
+			var id backend.ID
+			var ok bool
 
-		err := checkPack(c.repo, packID)
-		if err == nil {
-			continue
-		}
+			select {
+			case <-done:
+				return
+			case id, ok = <-in:
+				if !ok {
+					return
+				}
+			}
 
-		select {
-		case <-done:
-			return
-		case errChan <- err:
+			err := checkPack(c.repo, id)
+			if err == nil {
+				continue
+			}
+
+			select {
+			case <-done:
+				return
+			case errChan <- err:
+			}
 		}
 	}
+
+	ch := c.repo.List(backend.Data, done)
+
+	var wg sync.WaitGroup
+	for i := 0; i < defaultParallelism; i++ {
+		wg.Add(1)
+		go worker(&wg, ch)
+	}
+
+	wg.Wait()
 }
diff --git a/cmd/restic/cmd_check.go b/cmd/restic/cmd_check.go
index c3ba1dd83..4712ba004 100644
--- a/cmd/restic/cmd_check.go
+++ b/cmd/restic/cmd_check.go
@@ -109,6 +109,19 @@ func (cmd CmdCheck) Execute(args []string) error {
 		}
 	}
 
+	if cmd.ReadData {
+		cmd.global.Verbosef("reading all data\n")
+
+		errChan := make(chan error)
+
+		go chkr.ReadData(errChan, done)
+
+		for err := range errChan {
+			errorsFound = true
+			fmt.Fprintf(os.Stderr, "%v\n", err)
+		}
+	}
+
 	if errorsFound {
 		return errors.New("repository contains errors")
 	}