Allow concurrent access NetConn wrapper reading

nhooyr · nhooyr · commit 8c54bd9b44d1 · 2019-09-22T15:12:11.000-05:00
Updates #88
diff --git a/netconn.go b/netconn.go
@@ -7,6 +7,7 @@ import (
 	"io"
 	"math"
 	"net"
+	"sync"
 	"sync/atomic"
 	"time"
 )
@@ -69,8 +70,9 @@ type netConn struct {
 
 	readTimer   *time.Timer
 	readContext context.Context
-	eofed       bool
 
+	readMu sync.Mutex
+	eofed  bool
 	reader io.Reader
 }
 
@@ -89,6 +91,9 @@ func (c *netConn) Write(p []byte) (int, error) {
 }
 
 func (c *netConn) Read(p []byte) (int, error) {
+	c.readMu.Lock()
+	defer c.readMu.Unlock()
+
 	if c.eofed {
 		return 0, io.EOF
 	}

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import (`
`7`	`7`	`"io"`
`8`	`8`	`"math"`
`9`	`9`	`"net"`
	`10`	`+ "sync"`
`10`	`11`	`"sync/atomic"`
`11`	`12`	`"time"`
`12`	`13`	`)`
`@@ -69,8 +70,9 @@ type netConn struct {`
`69`	`70`
`70`	`71`	`readTimer *time.Timer`
`71`	`72`	`readContext context.Context`
`72`		`- eofed bool`
`73`	`73`
	`74`	`+ readMu sync.Mutex`
	`75`	`+ eofed bool`
`74`	`76`	`reader io.Reader`
`75`	`77`	`}`
`76`	`78`
`@@ -89,6 +91,9 @@ func (c *netConn) Write(p []byte) (int, error) {`
`89`	`91`	`}`
`90`	`92`
`91`	`93`	`func (c *netConn) Read(p []byte) (int, error) {`
	`94`	`+ c.readMu.Lock()`
	`95`	`+ defer c.readMu.Unlock()`
	`96`	`+`
`92`	`97`	`if c.eofed {`
`93`	`98`	`return 0, io.EOF`
`94`	`99`	`}`