From f3f08fb7202dc1e5ab3e7478f40954917585b765 Mon Sep 17 00:00:00 2001
From: Arran Walker <arran.walker@fiveturns.org>
Date: Fri, 9 Jun 2023 11:02:24 +0100
Subject: [PATCH] Use GOMAXPROCS for concurrency default, not NumCPU

---
 archiver.go          | 2 +-
 archiver_options.go  | 2 +-
 extractor.go         | 2 +-
 extractor_options.go | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/archiver.go b/archiver.go
index 999dba8..7fe256f 100644
--- a/archiver.go
+++ b/archiver.go
@@ -67,7 +67,7 @@ func NewArchiver(w io.Writer, chroot string, opts ...ArchiverOption) (*Archiver,
 	}
 
 	a.options.method = zip.Deflate
-	a.options.concurrency = runtime.NumCPU()
+	a.options.concurrency = runtime.GOMAXPROCS(0)
 	a.options.stageDir = chroot
 	a.options.bufferSize = -1
 	for _, o := range opts {
diff --git a/archiver_options.go b/archiver_options.go
index 524fec3..ebbe7d6 100644
--- a/archiver_options.go
+++ b/archiver_options.go
@@ -28,7 +28,7 @@ func WithArchiverMethod(method uint16) ArchiverOption {
 }
 
 // WithArchiverConcurrency will set the maximum number of files to be
-// compressed concurrently. The default is set to runtime.NumCPU().
+// compressed concurrently. The default is set to GOMAXPROCS.
 func WithArchiverConcurrency(n int) ArchiverOption {
 	return func(o *archiverOptions) error {
 		if n <= 0 {
diff --git a/extractor.go b/extractor.go
index 3bb3513..2eaba08 100644
--- a/extractor.go
+++ b/extractor.go
@@ -87,7 +87,7 @@ func newExtractor(r *zip.Reader, c io.Closer, chroot string, opts []ExtractorOpt
 		closer: c,
 	}
 
-	e.options.concurrency = runtime.NumCPU()
+	e.options.concurrency = runtime.GOMAXPROCS(0)
 	for _, o := range opts {
 		err := o(&e.options)
 		if err != nil {
diff --git a/extractor_options.go b/extractor_options.go
index a2f9df0..696c203 100644
--- a/extractor_options.go
+++ b/extractor_options.go
@@ -9,7 +9,7 @@ type extractorOptions struct {
 }
 
 // WithExtractorConcurrency will set the maximum number of files being
-// extracted concurrently. The default is GOMAXPROCS.
+// extracted concurrently. The default is set to GOMAXPROCS.
 func WithExtractorConcurrency(n int) ExtractorOption {
 	return func(o *extractorOptions) error {
 		if n <= 0 {