Use safe map to fix data race

This commit is contained in:
Jinzhu 2013-12-15 10:09:19 +08:00
parent bd93629e32
commit ab67ec5a4e
1 changed files with 26 additions and 15 deletions

View File

@ -9,20 +9,33 @@ import (
"sync" "sync"
) )
type SnakeMap struct { type safeMap struct {
Map map[string]string m map[string]string
mu sync.RWMutex l *sync.RWMutex
} }
var snake = SnakeMap{Map:map[string]string{}}
var toUpperMap = map[string]string{} func (s *safeMap) Set(key string, value string) {
s.l.Lock()
defer s.l.Unlock()
s.m[key] = value
}
func (s *safeMap) Get(key string) string {
s.l.RLock()
defer s.l.RUnlock()
return s.m[key]
}
func newSafeMap() *safeMap {
return &safeMap{l: new(sync.RWMutex), m: make(map[string]string)}
}
var smap = newSafeMap()
var umap = newSafeMap()
func toSnake(u string) string { func toSnake(u string) string {
snake.mu.RLock() if v := smap.Get(u); v != "" {
if v := snake.Map[u]; v != "" {
snake.mu.RUnlock()
return v return v
} else {
snake.mu.RUnlock()
} }
buf := bytes.NewBufferString("") buf := bytes.NewBufferString("")
@ -34,14 +47,12 @@ func toSnake(u string) string {
} }
s := strings.ToLower(buf.String()) s := strings.ToLower(buf.String())
snake.mu.Lock() go smap.Set(u, s)
defer snake.mu.Unlock()
snake.Map[u] = s
return s return s
} }
func snakeToUpperCamel(s string) string { func snakeToUpperCamel(s string) string {
if v := toUpperMap[s]; v != "" { if v := umap.Get(s); v != "" {
return v return v
} }
@ -54,7 +65,7 @@ func snakeToUpperCamel(s string) string {
} }
u := buf.String() u := buf.String()
toUpperMap[s] = u go umap.Set(s, u)
return u return u
} }