Permalink
Browse files
text/template: shut down lexing goroutine on error
When a parse error occurred, the lexing goroutine would lay idle. It's not likely a problem but if the program is for some reason accepting badly formed data repeatedly, it's wasteful. The solution is easy: Just drain the input on error. We know this will succeed because the input is always a string and is therefore guaranteed finite. With debugging prints in the package tests I've shown this is effective, shutting down 79 goroutines that would otherwise linger, out of 123 total. Fixes #10574. Change-Id: I8aa536e327b219189a7e7f604a116fa562ae1c39 Reviewed-on: https://go-review.googlesource.com/9658 Reviewed-by: Russ Cox <rsc@golang.org>
- Loading branch information...
Showing
with
41 additions
and 0 deletions.
12
src/text/template/parse/lex.go
| @@ -167,12 +167,23 @@ func (l *lexer) errorf(format string, args ...interface{}) stateFn { | ||
| } | ||
| // nextItem returns the next item from the input. | ||
| +// Called by the parser, not in the lexing goroutine. | ||
| func (l *lexer) nextItem() item { | ||
| item := <-l.items | ||
| l.lastPos = item.pos | ||
| return item | ||
| } | ||
| +// drain drains the output so the lexing goroutine will exit. | ||
| +// Called by the parser, not in the lexing goroutine. | ||
| +func (l *lexer) drain() { | ||
| + if l == nil { | ||
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
|
||
| + return | ||
| + } | ||
| + for range l.items { | ||
| + } | ||
| +} | ||
| + | ||
| // lex creates a new scanner for the input string. | ||
| func lex(name, input, left, right string) *lexer { | ||
| if left == "" { | ||
| @@ -197,6 +208,7 @@ func (l *lexer) run() { | ||
| for l.state = lexText; l.state != nil; { | ||
| l.state = l.state(l) | ||
| } | ||
| + close(l.items) | ||
| } | ||
| // state functions | ||
28
src/text/template/parse/lex_test.go
1
src/text/template/parse/parse.go
how l could be nil here?
It can't. Well spotted.
This was added during testing but is no longer necessary. See CL 9841.