Merge pull request #215 from klauspost/s2-single-threaded-readerfrom

Fix single threaded S2 ReadFrom
klauspost · Jan 31, 2020 · ccd3322 · ccd3322
2 parents b69de4d + 7388447
commit ccd3322
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/s2/cmd/s2c/main.go b/s2/cmd/s2c/main.go
@@ -143,7 +143,7 @@ Options:`)
 			file, err := os.Open(filename)
 			exitErr(err)
 			defer closeOnce.Do(func() { file.Close() })
-			src, err := readahead.NewReaderSize(file, *cpu, 1<<20)
+			src, err := readahead.NewReaderSize(file, *cpu+1, 1<<20)
 			exitErr(err)
 			defer src.Close()
 			finfo, err := file.Stat()

diff --git a/s2/encode.go b/s2/encode.go
@@ -558,6 +558,11 @@ func (w *Writer) writeFull(inbuf []byte) (errRet error) {
 		return err
 	}
 
+	if w.concurrency == 1 {
+		_, err := w.writeSync(inbuf[obufHeaderLen:])
+		return err
+	}
+
 	// Spawn goroutine and write block to output channel.
 	if !w.wroteStreamHeader {
 		w.wroteStreamHeader = true