diff options
author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2015-06-22 19:40:12 +0200 |
---|---|---|
committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2015-06-22 20:30:20 +0200 |
commit | e764a6e638b8a9e31df6d929c071c5a289441735 (patch) | |
tree | 56d4f3805facc4d07f2b0145f5d89835f4397ca5 /hugolib/shortcode.go | |
parent | 67209dbfb31550cde05c7f8ea23bf67d9727d855 (diff) |
Use pooled buffer in replaceShortcodes
Even as a copy at the end is needed, this consumes way less memory on Go 1.4.2:
```benchmark old ns/op new ns/op delta
BenchmarkParsePage 145979 139964 -4.12%
BenchmarkReplaceShortcodeTokens 633574 631946 -0.26%
BenchmarkShortcodeLexer 195842 187938 -4.04%
benchmark old allocs new allocs delta
BenchmarkParsePage 87 87 +0.00%
BenchmarkReplaceShortcodeTokens 9424 9415 -0.10%
BenchmarkShortcodeLexer 274 274 +0.00%
benchmark old bytes new bytes delta
BenchmarkParsePage 141830 141830 +0.00%
BenchmarkReplaceShortcodeTokens 35219 25385 -27.92%
BenchmarkShortcodeLexer 30178 30177 -0.00%
```
See #1148
Diffstat (limited to 'hugolib/shortcode.go')
-rw-r--r-- | hugolib/shortcode.go | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/hugolib/shortcode.go b/hugolib/shortcode.go index 630d17daf..ac1a7f1d3 100644 --- a/hugolib/shortcode.go +++ b/hugolib/shortcode.go @@ -458,7 +458,8 @@ func replaceShortcodeTokens(source []byte, prefix string, replacements map[strin return source, nil } - var buff bytes.Buffer + buff := bp.GetBuffer() + defer bp.PutBuffer(buff) sourceLen := len(source) start := 0 @@ -507,7 +508,11 @@ func replaceShortcodeTokens(source []byte, prefix string, replacements map[strin if err != nil { return nil, errors.New("buff write failed") } - return buff.Bytes(), nil + + bc := make([]byte, buff.Len(), buff.Len()) + copy(bc, buff.Bytes()) + + return bc, nil } func getShortcodeTemplate(name string, t tpl.Template) *template.Template { |