From 929808190fb0649dcfa6def39cd1afe1d380087c Mon Sep 17 00:00:00 2001 From: Bjørn Erik Pedersen Date: Thu, 17 Feb 2022 16:51:19 +0100 Subject: tpl/partials: Fix recently introduced deadlock in partials cache MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The change in lock logic for `partialCached` in 0927cf739fee9646c7fb917965799d9acf080922 was naive as it didn't consider cached partials calling other cached partials. This changeset may look on the large side for this particular issue, but it pulls in part of a working branch, introducing `context.Context` in the template execution. Note that the context is only partially implemented in this PR, but the upcoming use cases will, as one example, include having access to the top "dot" (e.g. `Page`) all the way down into partials and shortcodes etc. The earlier benchmarks rerun against master: ```bash name old time/op new time/op delta IncludeCached-10 13.6ms ± 2% 13.8ms ± 1% ~ (p=0.343 n=4+4) name old alloc/op new alloc/op delta IncludeCached-10 5.30MB ± 0% 5.35MB ± 0% +0.96% (p=0.029 n=4+4) name old allocs/op new allocs/op delta IncludeCached-10 74.7k ± 0% 75.3k ± 0% +0.77% (p=0.029 n=4+4) ``` Fixes #9519 --- tpl/collections/apply_test.go | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'tpl/collections') diff --git a/tpl/collections/apply_test.go b/tpl/collections/apply_test.go index 98cb78b51..1afb66808 100644 --- a/tpl/collections/apply_test.go +++ b/tpl/collections/apply_test.go @@ -14,6 +14,7 @@ package collections import ( + "context" "fmt" "io" "reflect" @@ -51,6 +52,10 @@ func (templateFinder) Execute(t tpl.Template, wr io.Writer, data interface{}) er return nil } +func (templateFinder) ExecuteWithContext(ctx context.Context, t tpl.Template, wr io.Writer, data interface{}) error { + return nil +} + func (templateFinder) GetFunc(name string) (reflect.Value, bool) { if name == "dobedobedo" { return reflect.Value{}, false -- cgit v1.2.3