chore: update

This commit is contained in:
Bo-Yi Wu 2020-05-03 18:11:23 +08:00
parent 4427ca4a60
commit 76511522da
2 changed files with 27 additions and 11 deletions

View File

@ -53,8 +53,13 @@ type Context struct {
engine *Engine engine *Engine
EnablekeysMutex bool
// This mutex protect Keys map // This mutex protect Keys map
KeysMutex *sync.RWMutex keysMutex *sync.RWMutex
// only initial keysMutex once
once sync.Once
// Keys is a key/value pair exclusively for the context of each request. // Keys is a key/value pair exclusively for the context of each request.
Keys map[string]interface{} Keys map[string]interface{}
@ -86,13 +91,16 @@ func (c *Context) reset() {
c.Params = c.Params[0:0] c.Params = c.Params[0:0]
c.handlers = nil c.handlers = nil
c.index = -1 c.index = -1
c.KeysMutex = &sync.RWMutex{}
c.fullPath = "" c.fullPath = ""
c.Keys = nil c.Keys = nil
c.Errors = c.Errors[0:0] c.Errors = c.Errors[0:0]
c.Accepted = nil c.Accepted = nil
c.queryCache = nil c.queryCache = nil
c.formCache = nil c.formCache = nil
if c.EnablekeysMutex {
c.keysMutex = &sync.RWMutex{}
}
} }
// Copy returns a copy of the current context that can be safely used outside the request's scope. // Copy returns a copy of the current context that can be safely used outside the request's scope.
@ -228,29 +236,37 @@ func (c *Context) Error(err error) *Error {
// Set is used to store a new key/value pair exclusively for this context. // 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. // It also lazy initializes c.Keys if it was not used previously.
func (c *Context) Set(key string, value interface{}) { func (c *Context) Set(key string, value interface{}) {
if c.KeysMutex == nil { if c.EnablekeysMutex {
c.KeysMutex = &sync.RWMutex{} if c.keysMutex == nil {
c.once.Do(func() {
c.keysMutex = &sync.RWMutex{}
})
}
c.keysMutex.Lock()
defer c.keysMutex.Unlock()
} }
c.KeysMutex.Lock()
if c.Keys == nil { if c.Keys == nil {
c.Keys = make(map[string]interface{}) c.Keys = make(map[string]interface{})
} }
c.Keys[key] = value c.Keys[key] = value
c.KeysMutex.Unlock()
} }
// Get returns the value for the given key, ie: (value, true). // Get returns the value for the given key, ie: (value, true).
// If the value does not exists it returns (nil, false) // If the value does not exists it returns (nil, false)
func (c *Context) Get(key string) (value interface{}, exists bool) { func (c *Context) Get(key string) (value interface{}, exists bool) {
if c.KeysMutex == nil { if c.EnablekeysMutex {
c.KeysMutex = &sync.RWMutex{} if c.keysMutex == nil {
c.once.Do(func() {
c.keysMutex = &sync.RWMutex{}
})
}
c.keysMutex.RLock()
defer c.keysMutex.RUnlock()
} }
c.KeysMutex.RLock()
value, exists = c.Keys[key] value, exists = c.Keys[key]
c.KeysMutex.RUnlock()
return return
} }

2
gin.go
View File

@ -162,7 +162,7 @@ func Default() *Engine {
} }
func (engine *Engine) allocateContext() *Context { 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. // Delims sets template left and right delims and returns a Engine instance.