mirror of
				https://github.com/containers/podman.git
				synced 2025-11-04 08:56:05 +08:00 
			
		
		
		
	Podman adds an Error: to every error message. So starting an error message with "error" ends up being reported to the user as Error: error ... This patch removes the stutter. Also ioutil.ReadFile errors report the Path, so wrapping the err message with the path causes a stutter. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
		
			
				
	
	
		
			76 lines
		
	
	
		
			1.8 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			76 lines
		
	
	
		
			1.8 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
package parallel
 | 
						|
 | 
						|
import (
 | 
						|
	"context"
 | 
						|
	"errors"
 | 
						|
	"fmt"
 | 
						|
	"sync"
 | 
						|
 | 
						|
	"github.com/sirupsen/logrus"
 | 
						|
	"golang.org/x/sync/semaphore"
 | 
						|
)
 | 
						|
 | 
						|
var (
 | 
						|
	// Maximum number of jobs that will be used.
 | 
						|
	// Set a low, but non-zero, default. We'll be overriding it by default
 | 
						|
	// anyways.
 | 
						|
	numThreads uint = 8
 | 
						|
	// Semaphore to control thread creation and ensure numThreads is
 | 
						|
	// respected.
 | 
						|
	jobControl *semaphore.Weighted
 | 
						|
	// Lock to control changing the semaphore - we don't want to do it
 | 
						|
	// while anyone is using it.
 | 
						|
	jobControlLock sync.RWMutex
 | 
						|
)
 | 
						|
 | 
						|
// SetMaxThreads sets the number of threads that will be used for parallel jobs.
 | 
						|
func SetMaxThreads(threads uint) error {
 | 
						|
	if threads == 0 {
 | 
						|
		return errors.New("must give a non-zero number of threads to execute with")
 | 
						|
	}
 | 
						|
 | 
						|
	jobControlLock.Lock()
 | 
						|
	defer jobControlLock.Unlock()
 | 
						|
 | 
						|
	numThreads = threads
 | 
						|
	jobControl = semaphore.NewWeighted(int64(threads))
 | 
						|
	logrus.Infof("Setting parallel job count to %d", threads)
 | 
						|
 | 
						|
	return nil
 | 
						|
}
 | 
						|
 | 
						|
// GetMaxThreads returns the current number of threads that will be used for
 | 
						|
// parallel jobs.
 | 
						|
func GetMaxThreads() uint {
 | 
						|
	return numThreads
 | 
						|
}
 | 
						|
 | 
						|
// Enqueue adds a single function to the parallel jobs queue. This function will
 | 
						|
// be run when an unused thread is available.
 | 
						|
// Returns a receive-only error channel that will return the error (if any) from
 | 
						|
// the provided function fn when fn has finished executing. The channel will be
 | 
						|
// closed after this.
 | 
						|
func Enqueue(ctx context.Context, fn func() error) <-chan error {
 | 
						|
	retChan := make(chan error)
 | 
						|
 | 
						|
	go func() {
 | 
						|
		jobControlLock.RLock()
 | 
						|
		defer jobControlLock.RUnlock()
 | 
						|
 | 
						|
		defer close(retChan)
 | 
						|
 | 
						|
		if err := jobControl.Acquire(ctx, 1); err != nil {
 | 
						|
			retChan <- fmt.Errorf("acquiring job control semaphore: %w", err)
 | 
						|
			return
 | 
						|
		}
 | 
						|
 | 
						|
		err := fn()
 | 
						|
 | 
						|
		jobControl.Release(1)
 | 
						|
 | 
						|
		retChan <- err
 | 
						|
	}()
 | 
						|
 | 
						|
	return retChan
 | 
						|
}
 |