diff options
author | Simon Ser <contact@emersion.fr> | 2019-05-19 09:50:19 +0000 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2019-05-19 11:51:22 -0400 |
commit | f27db333052aa24a0aad135c09ce7969bf31bc56 (patch) | |
tree | 92acd47ded90d7c1a5e0c283c446122ff9aef594 /worker/types/worker.go | |
parent | 34dd6bc6354cd3592ed51da83de1a0839e08a37d (diff) | |
download | aerc-f27db333052aa24a0aad135c09ce7969bf31bc56.tar.gz |
worker/types/worker: make ID allocation atomic
Message IDs are allocated for both messages from UI to workers and the other way around. Hence, the global nextId variable is accessed from multiple goroutines. Instead, use atomic to access the global counter.
Diffstat (limited to 'worker/types/worker.go')
-rw-r--r-- | worker/types/worker.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/worker/types/worker.go b/worker/types/worker.go index 5647ae3..2ca142b 100644 --- a/worker/types/worker.go +++ b/worker/types/worker.go @@ -3,9 +3,10 @@ package types import ( "log" "sync" + "sync/atomic" ) -var nextId int = 1 +var lastId int64 = 1 // access via atomic type Backend interface { Run() @@ -17,7 +18,7 @@ type Worker struct { Messages chan WorkerMessage Logger *log.Logger - callbacks map[int]func(msg WorkerMessage) // protected by mutex + callbacks map[int64]func(msg WorkerMessage) // protected by mutex mutex sync.Mutex } @@ -26,13 +27,13 @@ func NewWorker(logger *log.Logger) *Worker { Actions: make(chan WorkerMessage, 50), Messages: make(chan WorkerMessage, 50), Logger: logger, - callbacks: make(map[int]func(msg WorkerMessage)), + callbacks: make(map[int64]func(msg WorkerMessage)), } } func (worker *Worker) setId(msg WorkerMessage) { - msg.setId(nextId) - nextId++ + id := atomic.AddInt64(&lastId, 1) + msg.setId(id) } func (worker *Worker) setCallback(msg WorkerMessage, |