TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-25 11:05:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine/magicsock: fix latent data race in test

Browse Source 
logBufWriter had no serialization.
It just so happens that none of its users currently ever log concurrently.
Make it safe for concurrent use.

Signed-off-by: Josh Bleecher Snyder <josh@tailscale.com>
This commit is contained in:
Josh Bleecher Snyder 2021-07-08 16:16:09 -07:00 committed by Josh Bleecher Snyder
parent 01e159b610
commit 4f4dae32dd
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wgengine/magicsock/magicsock_test.go
View File

@ -1431,8 +1431,13 @@ func BenchmarkReceiveFrom_Native(b *testing.B) {
} }
} }
// logBufWriterMu serializes writes made by logBufWriter.
var logBufWriterMu sync.Mutex
func logBufWriter(buf *bytes.Buffer) logger.Logf { func logBufWriter(buf *bytes.Buffer) logger.Logf {
return func(format string, a ...interface{}) { return func(format string, a ...interface{}) {
logBufWriterMu.Lock()
defer logBufWriterMu.Unlock()
fmt.Fprintf(buf, format, a...) fmt.Fprintf(buf, format, a...)
if !bytes.HasSuffix(buf.Bytes(), []byte("\n")) { if !bytes.HasSuffix(buf.Bytes(), []byte("\n")) {
buf.WriteByte('\n') buf.WriteByte('\n')