Skip to content

Commit

Permalink
chore(performance): Change *sync.RWMutex to sync.RWMutex (#2351)
Browse files Browse the repository at this point in the history
  • Loading branch information
appleboy committed May 3, 2020
1 parent 724a883 commit 16c91a8
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 16 deletions.
27 changes: 12 additions & 15 deletions context.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ type Context struct {
engine *Engine

// This mutex protect Keys map
KeysMutex *sync.RWMutex
mu sync.RWMutex

// Keys is a key/value pair exclusively for the context of each request.
Keys map[string]interface{}
Expand Down Expand Up @@ -86,7 +86,7 @@ func (c *Context) reset() {
c.Params = c.Params[0:0]
c.handlers = nil
c.index = -1
c.KeysMutex = &sync.RWMutex{}

c.fullPath = ""
c.Keys = nil
c.Errors = c.Errors[0:0]
Expand All @@ -98,7 +98,12 @@ func (c *Context) reset() {
// Copy returns a copy of the current context that can be safely used outside the request's scope.
// This has to be used when the context has to be passed to a goroutine.
func (c *Context) Copy() *Context {
var cp = *c
cp := Context{
writermem: c.writermem,
Request: c.Request,
Params: c.Params,
engine: c.engine,
}
cp.writermem.ResponseWriter = nil
cp.Writer = &cp.writermem
cp.index = abortIndex
Expand Down Expand Up @@ -228,29 +233,21 @@ func (c *Context) Error(err error) *Error {
// Set is used to store a new key/value pair exclusively for this context.
// It also lazy initializes c.Keys if it was not used previously.
func (c *Context) Set(key string, value interface{}) {
if c.KeysMutex == nil {
c.KeysMutex = &sync.RWMutex{}
}

c.KeysMutex.Lock()
c.mu.Lock()
if c.Keys == nil {
c.Keys = make(map[string]interface{})
}

c.Keys[key] = value
c.KeysMutex.Unlock()
c.mu.Unlock()
}

// Get returns the value for the given key, ie: (value, true).
// If the value does not exists it returns (nil, false)
func (c *Context) Get(key string) (value interface{}, exists bool) {
if c.KeysMutex == nil {
c.KeysMutex = &sync.RWMutex{}
}

c.KeysMutex.RLock()
c.mu.RLock()
value, exists = c.Keys[key]
c.KeysMutex.RUnlock()
c.mu.RUnlock()
return
}

Expand Down
2 changes: 1 addition & 1 deletion gin.go
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ func Default() *Engine {
}

func (engine *Engine) allocateContext() *Context {
return &Context{engine: engine, KeysMutex: &sync.RWMutex{}}
return &Context{engine: engine}
}

// Delims sets template left and right delims and returns a Engine instance.
Expand Down

0 comments on commit 16c91a8

Please sign in to comment.