mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-07 20:30:36 -05:00
4576c82ed4
The isolated benchmark for the function is obviously much faster: ```bash name old time/op new time/op delta GetMethodByName-10 1.21µs ± 7% 0.23µs ± 5% -81.42% (p=0.029 n=4+4) name old alloc/op new alloc/op delta GetMethodByName-10 680B ± 0% 0B -100.00% (p=0.029 n=4+4) name old allocs/op new allocs/op delta GetMethodByName-10 20.0 ± 0% 0.0 -100.00% (p=0.029 n=4+4) ``` But more pleasing is the overall performance looking at the site benchmarks: ```bash name old time/op new time/op delta SiteNew/Regular_Bundle_with_image-10 6.25ms ± 2% 6.10ms ± 2% ~ (p=0.057 n=4+4) SiteNew/Regular_Bundle_with_JSON_file-10 6.30ms ± 2% 5.66ms ±11% ~ (p=0.057 n=4+4) SiteNew/Regular_Tags_and_categories-10 22.2ms ± 2% 17.4ms ± 1% -21.88% (p=0.029 n=4+4) SiteNew/Regular_Canonify_URLs-10 108ms ± 0% 107ms ± 0% -1.20% (p=0.029 n=4+4) SiteNew/Regular_Deep_content_tree-10 36.1ms ± 1% 33.8ms ± 1% -6.44% (p=0.029 n=4+4) SiteNew/Regular_TOML_front_matter-10 24.9ms ± 1% 22.6ms ± 1% -9.30% (p=0.029 n=4+4) SiteNew/Regular_Many_HTML_templates-10 17.9ms ± 1% 16.7ms ± 1% -6.43% (p=0.029 n=4+4) SiteNew/Regular_Page_collections-10 23.3ms ± 1% 22.0ms ± 0% -5.58% (p=0.029 n=4+4) SiteNew/Regular_List_terms-10 8.00ms ± 1% 7.63ms ± 0% -4.62% (p=0.029 n=4+4) name old alloc/op new alloc/op delta SiteNew/Regular_Bundle_with_image-10 2.10MB ± 0% 2.07MB ± 0% -1.46% (p=0.029 n=4+4) SiteNew/Regular_Bundle_with_JSON_file-10 1.88MB ± 0% 1.85MB ± 0% -1.76% (p=0.029 n=4+4) SiteNew/Regular_Tags_and_categories-10 13.5MB ± 0% 11.6MB ± 0% -13.99% (p=0.029 n=4+4) SiteNew/Regular_Canonify_URLs-10 96.1MB ± 0% 95.8MB ± 0% -0.40% (p=0.029 n=4+4) SiteNew/Regular_Deep_content_tree-10 28.4MB ± 0% 27.3MB ± 0% -3.83% (p=0.029 n=4+4) SiteNew/Regular_TOML_front_matter-10 16.9MB ± 0% 15.1MB ± 0% -10.58% (p=0.029 n=4+4) SiteNew/Regular_Many_HTML_templates-10 8.98MB ± 0% 8.44MB ± 0% -6.04% (p=0.029 n=4+4) SiteNew/Regular_Page_collections-10 17.1MB ± 0% 16.5MB ± 0% -3.91% (p=0.029 n=4+4) SiteNew/Regular_List_terms-10 3.92MB ± 0% 3.72MB ± 0% -5.03% (p=0.029 n=4+4) name old allocs/op new allocs/op delta SiteNew/Regular_Bundle_with_image-10 25.8k ± 0% 24.9k ± 0% -3.49% (p=0.029 n=4+4) SiteNew/Regular_Bundle_with_JSON_file-10 25.8k ± 0% 24.9k ± 0% -3.49% (p=0.029 n=4+4) SiteNew/Regular_Tags_and_categories-10 288k ± 0% 233k ± 0% -18.90% (p=0.029 n=4+4) SiteNew/Regular_Canonify_URLs-10 375k ± 0% 364k ± 0% -2.80% (p=0.029 n=4+4) SiteNew/Regular_Deep_content_tree-10 314k ± 0% 283k ± 0% -9.77% (p=0.029 n=4+4) SiteNew/Regular_TOML_front_matter-10 302k ± 0% 252k ± 0% -16.55% (p=0.029 n=4+4) SiteNew/Regular_Many_HTML_templates-10 133k ± 0% 117k ± 0% -11.81% (p=0.029 n=4+4) SiteNew/Regular_Page_collections-10 202k ± 0% 183k ± 0% -9.55% (p=0.029 n=4+4) SiteNew/Regular_List_terms-10 55.6k ± 0% 49.8k ± 0% -10.40% (p=0.029 n=4+4) ``` Thanks to @quasilyte for the suggestion. Fixes 9386
204 lines
5.9 KiB
Go
204 lines
5.9 KiB
Go
// Copyright 2017-present The Hugo Authors. All rights reserved.
|
|
//
|
|
// Portions Copyright The Go Authors.
|
|
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package tplimpl
|
|
|
|
import (
|
|
"context"
|
|
"reflect"
|
|
"strings"
|
|
|
|
"github.com/gohugoio/hugo/common/hreflect"
|
|
"github.com/gohugoio/hugo/common/maps"
|
|
"github.com/gohugoio/hugo/tpl"
|
|
|
|
template "github.com/gohugoio/hugo/tpl/internal/go_templates/htmltemplate"
|
|
texttemplate "github.com/gohugoio/hugo/tpl/internal/go_templates/texttemplate"
|
|
|
|
"github.com/gohugoio/hugo/deps"
|
|
|
|
"github.com/gohugoio/hugo/tpl/internal"
|
|
|
|
// Init the namespaces
|
|
_ "github.com/gohugoio/hugo/tpl/cast"
|
|
_ "github.com/gohugoio/hugo/tpl/collections"
|
|
_ "github.com/gohugoio/hugo/tpl/compare"
|
|
_ "github.com/gohugoio/hugo/tpl/crypto"
|
|
_ "github.com/gohugoio/hugo/tpl/data"
|
|
_ "github.com/gohugoio/hugo/tpl/debug"
|
|
_ "github.com/gohugoio/hugo/tpl/diagrams"
|
|
_ "github.com/gohugoio/hugo/tpl/encoding"
|
|
_ "github.com/gohugoio/hugo/tpl/fmt"
|
|
_ "github.com/gohugoio/hugo/tpl/hugo"
|
|
_ "github.com/gohugoio/hugo/tpl/images"
|
|
_ "github.com/gohugoio/hugo/tpl/inflect"
|
|
_ "github.com/gohugoio/hugo/tpl/js"
|
|
_ "github.com/gohugoio/hugo/tpl/lang"
|
|
_ "github.com/gohugoio/hugo/tpl/math"
|
|
_ "github.com/gohugoio/hugo/tpl/openapi/openapi3"
|
|
_ "github.com/gohugoio/hugo/tpl/os"
|
|
_ "github.com/gohugoio/hugo/tpl/partials"
|
|
_ "github.com/gohugoio/hugo/tpl/path"
|
|
_ "github.com/gohugoio/hugo/tpl/reflect"
|
|
_ "github.com/gohugoio/hugo/tpl/resources"
|
|
_ "github.com/gohugoio/hugo/tpl/safe"
|
|
_ "github.com/gohugoio/hugo/tpl/site"
|
|
_ "github.com/gohugoio/hugo/tpl/strings"
|
|
_ "github.com/gohugoio/hugo/tpl/templates"
|
|
_ "github.com/gohugoio/hugo/tpl/time"
|
|
_ "github.com/gohugoio/hugo/tpl/transform"
|
|
_ "github.com/gohugoio/hugo/tpl/urls"
|
|
)
|
|
|
|
var (
|
|
_ texttemplate.ExecHelper = (*templateExecHelper)(nil)
|
|
zero reflect.Value
|
|
contextInterface = reflect.TypeOf((*context.Context)(nil)).Elem()
|
|
)
|
|
|
|
type templateExecHelper struct {
|
|
running bool // whether we're in server mode.
|
|
funcs map[string]reflect.Value
|
|
}
|
|
|
|
func (t *templateExecHelper) GetFunc(ctx context.Context, tmpl texttemplate.Preparer, name string) (fn reflect.Value, firstArg reflect.Value, found bool) {
|
|
if fn, found := t.funcs[name]; found {
|
|
if fn.Type().NumIn() > 0 {
|
|
first := fn.Type().In(0)
|
|
if first.Implements(contextInterface) {
|
|
// TODO(bep) check if we can void this conversion every time -- and if that matters.
|
|
// The first argument may be context.Context. This is never provided by the end user, but it's used to pass down
|
|
// contextual information, e.g. the top level data context (e.g. Page).
|
|
return fn, reflect.ValueOf(ctx), true
|
|
}
|
|
}
|
|
|
|
return fn, zero, true
|
|
}
|
|
return zero, zero, false
|
|
}
|
|
|
|
func (t *templateExecHelper) Init(ctx context.Context, tmpl texttemplate.Preparer) {
|
|
}
|
|
|
|
func (t *templateExecHelper) GetMapValue(ctx context.Context, tmpl texttemplate.Preparer, receiver, key reflect.Value) (reflect.Value, bool) {
|
|
if params, ok := receiver.Interface().(maps.Params); ok {
|
|
// Case insensitive.
|
|
keystr := strings.ToLower(key.String())
|
|
v, found := params[keystr]
|
|
if !found {
|
|
return zero, false
|
|
}
|
|
return reflect.ValueOf(v), true
|
|
}
|
|
|
|
v := receiver.MapIndex(key)
|
|
|
|
return v, v.IsValid()
|
|
}
|
|
|
|
func (t *templateExecHelper) GetMethod(ctx context.Context, tmpl texttemplate.Preparer, receiver reflect.Value, name string) (method reflect.Value, firstArg reflect.Value) {
|
|
if t.running {
|
|
switch name {
|
|
case "GetPage", "Render":
|
|
if info, ok := tmpl.(tpl.Info); ok {
|
|
if m := receiver.MethodByName(name + "WithTemplateInfo"); m.IsValid() {
|
|
return m, reflect.ValueOf(info)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
fn := hreflect.GetMethodByName(receiver, name)
|
|
if !fn.IsValid() {
|
|
return zero, zero
|
|
}
|
|
|
|
if fn.Type().NumIn() > 0 {
|
|
first := fn.Type().In(0)
|
|
if first.Implements(contextInterface) {
|
|
// The first argument may be context.Context. This is never provided by the end user, but it's used to pass down
|
|
// contextual information, e.g. the top level data context (e.g. Page).
|
|
return fn, reflect.ValueOf(ctx)
|
|
}
|
|
}
|
|
|
|
return fn, zero
|
|
}
|
|
|
|
func newTemplateExecuter(d *deps.Deps) (texttemplate.Executer, map[string]reflect.Value) {
|
|
funcs := createFuncMap(d)
|
|
funcsv := make(map[string]reflect.Value)
|
|
|
|
for k, v := range funcs {
|
|
vv := reflect.ValueOf(v)
|
|
funcsv[k] = vv
|
|
}
|
|
|
|
// Duplicate Go's internal funcs here for faster lookups.
|
|
for k, v := range template.GoFuncs {
|
|
if _, exists := funcsv[k]; !exists {
|
|
vv, ok := v.(reflect.Value)
|
|
if !ok {
|
|
vv = reflect.ValueOf(v)
|
|
}
|
|
funcsv[k] = vv
|
|
}
|
|
}
|
|
|
|
for k, v := range texttemplate.GoFuncs {
|
|
if _, exists := funcsv[k]; !exists {
|
|
funcsv[k] = v
|
|
}
|
|
}
|
|
|
|
exeHelper := &templateExecHelper{
|
|
running: d.Running,
|
|
funcs: funcsv,
|
|
}
|
|
|
|
return texttemplate.NewExecuter(
|
|
exeHelper,
|
|
), funcsv
|
|
}
|
|
|
|
func createFuncMap(d *deps.Deps) map[string]interface{} {
|
|
funcMap := template.FuncMap{}
|
|
|
|
// Merge the namespace funcs
|
|
for _, nsf := range internal.TemplateFuncsNamespaceRegistry {
|
|
ns := nsf(d)
|
|
if _, exists := funcMap[ns.Name]; exists {
|
|
panic(ns.Name + " is a duplicate template func")
|
|
}
|
|
funcMap[ns.Name] = ns.Context
|
|
for _, mm := range ns.MethodMappings {
|
|
for _, alias := range mm.Aliases {
|
|
if _, exists := funcMap[alias]; exists {
|
|
panic(alias + " is a duplicate template func")
|
|
}
|
|
funcMap[alias] = mm.Method
|
|
}
|
|
}
|
|
}
|
|
|
|
if d.OverloadedTemplateFuncs != nil {
|
|
for k, v := range d.OverloadedTemplateFuncs {
|
|
funcMap[k] = v
|
|
}
|
|
}
|
|
|
|
return funcMap
|
|
}
|