fix race condition on 43 msg creation/closure. Speed up game object insert to db (from 10-12s to 1-2s)
This commit is contained in:
@@ -64,25 +64,26 @@ func NewFoundryTransport(data *FoundryTransportData) *FoundryTransport {
|
||||
}
|
||||
}
|
||||
|
||||
func (t *FoundryTransport) CloseMsgChannel(id int, timeout time.Duration) bool {
|
||||
func (t *FoundryTransport) CloseMsgChannel(msgChan chan []byte, id int, timeout time.Duration) bool {
|
||||
time.Sleep(timeout)
|
||||
|
||||
t.ChanMutex.Lock()
|
||||
defer t.ChanMutex.Unlock()
|
||||
|
||||
ok := true
|
||||
if _, ok = t.ExchangeChan.Msgs[id]; !ok {
|
||||
return false
|
||||
}
|
||||
select {
|
||||
case _, ok = <-t.ExchangeChan.Msgs[id]:
|
||||
case _, ok = <-msgChan:
|
||||
if ok {
|
||||
close(t.ExchangeChan.Msgs[id])
|
||||
delete(t.ExchangeChan.Msgs, id)
|
||||
if msgChan == t.ExchangeChan.Msgs[id] {
|
||||
delete(t.ExchangeChan.Msgs, id)
|
||||
}
|
||||
close(msgChan)
|
||||
}
|
||||
default:
|
||||
close(t.ExchangeChan.Msgs[id])
|
||||
delete(t.ExchangeChan.Msgs, id)
|
||||
if msgChan == t.ExchangeChan.Msgs[id] {
|
||||
delete(t.ExchangeChan.Msgs, id)
|
||||
}
|
||||
close(msgChan)
|
||||
}
|
||||
|
||||
return ok
|
||||
|
||||
Reference in New Issue
Block a user