Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/gohugoio/hugo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2022-02-17 18:51:19 +0300
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2022-02-17 20:47:36 +0300
commit929808190fb0649dcfa6def39cd1afe1d380087c (patch)
treea4405f12f93815351793da666b7ec0dc2d97a7a7 /tpl/template.go
parent667f3a4ba880b14f346161891cd43e2ba9ce9b9d (diff)
tpl/partials: Fix recently introduced deadlock in partials cache
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
Diffstat (limited to 'tpl/template.go')
-rw-r--r--tpl/template.go19
1 files changed, 19 insertions, 0 deletions
diff --git a/tpl/template.go b/tpl/template.go
index c5a6a44c0..1d8c98ded 100644
--- a/tpl/template.go
+++ b/tpl/template.go
@@ -14,6 +14,7 @@
package tpl
import (
+ "context"
"io"
"reflect"
"regexp"
@@ -53,6 +54,7 @@ type UnusedTemplatesProvider interface {
type TemplateHandler interface {
TemplateFinder
Execute(t Template, wr io.Writer, data interface{}) error
+ ExecuteWithContext(ctx context.Context, t Template, wr io.Writer, data interface{}) error
LookupLayout(d output.LayoutDescriptor, f output.Format) (Template, bool, error)
HasTemplate(name string) bool
}
@@ -144,3 +146,20 @@ func extractBaseOf(err string) string {
type TemplateFuncGetter interface {
GetFunc(name string) (reflect.Value, bool)
}
+
+// GetDataFromContext returns the template data context (usually .Page) from ctx if set.
+// NOte: This is not fully implemented yet.
+func GetDataFromContext(ctx context.Context) interface{} {
+ return ctx.Value(texttemplate.DataContextKey)
+}
+
+func GetHasLockFromContext(ctx context.Context) bool {
+ if v := ctx.Value(texttemplate.HasLockContextKey); v != nil {
+ return v.(bool)
+ }
+ return false
+}
+
+func SetHasLockInContext(ctx context.Context, hasLock bool) context.Context {
+ return context.WithValue(ctx, texttemplate.HasLockContextKey, hasLock)
+}