mirror
/
websocket
mirror of https://github.com/gorilla/websocket.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8 from smith-30/feature/remove_dict_lock 

mod: remove mutex.
This commit is contained in:
smith30 2018-01-24 23:09:56 +09:00 committed by GitHub
parent 538a96d70f cecdf7ced4
commit bf99740cc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
conn.go
View File

@ -267,7 +267,6 @@ type Conn struct {
contextTakeover bool contextTakeover bool
txDict []byte txDict []byte
rxDict []byte rxDict []byte
mutex sync.RWMutex
} }
func newConn(conn net.Conn, isServer bool, readBufferSize, writeBufferSize int) *Conn { func newConn(conn net.Conn, isServer bool, readBufferSize, writeBufferSize int) *Conn {
@ -1168,13 +1167,8 @@ func (c *Conn) SetCompressionLevel(level int) error {
return nil return nil
} }
// AddTxDict adds payload to txDict.
func (c *Conn) AddTxDict(b []byte) { func (c *Conn) AddTxDict(b []byte) {
c.mutex.Lock()
defer c.mutex.Unlock()
// Todo I do not know whether to leave the dictionary with 32768 bytes or more
// If it is recognized as a duplicate character string,
// deleting a part of the character may make it impossible to decrypt it.
c.txDict = append(b, c.txDict...) c.txDict = append(b, c.txDict...)
if len(c.txDict) > maxWindowBits { if len(c.txDict) > maxWindowBits {
@ -1182,13 +1176,8 @@ func (c *Conn) AddTxDict(b []byte) {
} }
} }
// AddTxDict adds payload to rxDict.
func (c *Conn) AddRxDict(b []byte) { func (c *Conn) AddRxDict(b []byte) {
c.mutex.Lock()
defer c.mutex.Unlock()
// Todo I do not know whether to leave the dictionary with 32768 bytes or more
// If it is recognized as a duplicate character string,
// deleting a part of the character may make it impossible to decrypt it.
c.rxDict = append(b, c.rxDict...) c.rxDict = append(b, c.rxDict...)
if len(c.rxDict) > maxWindowBits { if len(c.rxDict) > maxWindowBits {