github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-01-01 19:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

resource: Serialize image processing

Browse source 
Fixes #5220
This commit is contained in:
Bjørn Erik Pedersen 2018-10-26 13:45:51 +02:00
parent df021317a9
commit 3a3badfd1d
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
resource/image.go
View file

@ -212,6 +212,15 @@ func (i *Image) isJPEG() bool {
return strings.HasSuffix(name, ".jpg") || strings.HasSuffix(name, ".jpeg") return strings.HasSuffix(name, ".jpg") || strings.HasSuffix(name, ".jpeg")
} }
// Serialize image processing. The imaging library spins up its own set of Go routines,
// so there is not much to gain from adding more load to the mix. That
// can even have negative effect in low resource scenarios.
// Note that this only effects the non-cached scenario. Once the processed
// image is written to disk, everything is fast, fast fast.
const imageProcWorkers = 1
var imageProcSem = make(chan bool, imageProcWorkers)
func (i *Image) doWithImageConfig(action, spec string, f func(src image.Image, conf imageConfig) (image.Image, error)) (*Image, error) { func (i *Image) doWithImageConfig(action, spec string, f func(src image.Image, conf imageConfig) (image.Image, error)) (*Image, error) {
conf, err := parseImageConfig(spec) conf, err := parseImageConfig(spec)
if err != nil { if err != nil {
@ -237,6 +246,11 @@ func (i *Image) doWithImageConfig(action, spec string, f func(src image.Image, c
} }
return i.spec.imageCache.getOrCreate(i, conf, func(resourceCacheFilename string) (*Image, error) { return i.spec.imageCache.getOrCreate(i, conf, func(resourceCacheFilename string) (*Image, error) {
imageProcSem <- true
defer func() {
<-imageProcSem
}()
ci := i.clone() ci := i.clone()
errOp := action errOp := action