diff options
author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2018-10-26 13:45:51 +0200 |
---|---|---|
committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2018-10-26 14:40:05 +0200 |
commit | 3a3badfd1d4b1d4c9863ecaf029512d36136fa0f (patch) | |
tree | 6c1a4052e49008e1d672775128ec31028b843ac9 /resource | |
parent | df021317a964a482cd1cd579de5a12d50faf0d08 (diff) |
resource: Serialize image processing
Fixes #5220
Diffstat (limited to 'resource')
-rw-r--r-- | resource/image.go | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/resource/image.go b/resource/image.go index d9a1dd47d..fc79cbef5 100644 --- a/resource/image.go +++ b/resource/image.go @@ -212,6 +212,15 @@ func (i *Image) isJPEG() bool { 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) { conf, err := parseImageConfig(spec) 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) { + imageProcSem <- true + defer func() { + <-imageProcSem + }() + ci := i.clone() errOp := action |