Skip to content

fix goroutine safe #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ccl0326 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix goroutine safe #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions wetsock/wetsock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,18 @@ import (
"encoding/json"
"errors"
"reflect"
"sync"

"github.com/gorilla/websocket"
"github.com/tv42/birpc"
)

type codec struct {
WS *websocket.Conn
// https://godoc.org/github.com/gorilla/websocket#hdr-Concurrency
// As above document.Only one concurrent reader and one concurrent writer are allowed.
readMu sync.Mutex
writeMu sync.Mutex
}

// This is ugly, but i need to override the unmarshaling logic for
Expand All @@ -27,6 +32,9 @@ type jsonMessage struct {
}

func (c *codec) ReadMessage(msg *birpc.Message) error {
c.readMu.Lock()
defer c.readMu.Unlock()

var jm jsonMessage
err := c.WS.ReadJSON(&jm)
if err != nil {
Expand All @@ -41,6 +49,9 @@ func (c *codec) ReadMessage(msg *birpc.Message) error {
}

func (c *codec) WriteMessage(msg *birpc.Message) error {
c.writeMu.Lock()
defer c.writeMu.Unlock()

return c.WS.WriteJSON(msg)
}

Expand Down