hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2024-12-27 07:28:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use internal.MutexByRoom

Browse source
This commit is contained in:
Neil Alexander 2021-06-28 13:59:44 +01:00
parent 6e6f026cfa
commit 138cddcac7
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
federationapi/routing/send.go
View file

@ -620,18 +620,13 @@ func checkAllowedByState(e *gomatrixserverlib.Event, stateEvents []*gomatrixserv
return gomatrixserverlib.Allowed(e, &authUsingState) return gomatrixserverlib.Allowed(e, &authUsingState)
} }
var processEventWithMissingStateMutexes = map[string]*sync.Mutex{} var processEventWithMissingStateMutexes = &internal.MutexByRoom{}
func (t *txnReq) processEventWithMissingState( func (t *txnReq) processEventWithMissingState(
ctx context.Context, e *gomatrixserverlib.Event, roomVersion gomatrixserverlib.RoomVersion, ctx context.Context, e *gomatrixserverlib.Event, roomVersion gomatrixserverlib.RoomVersion,
) error { ) error {
mu, ok := processEventWithMissingStateMutexes[e.RoomID()] processEventWithMissingStateMutexes.Lock(e.RoomID())
if !ok { defer processEventWithMissingStateMutexes.Unlock(e.RoomID())
processEventWithMissingStateMutexes[e.RoomID()] = &sync.Mutex{}
mu = processEventWithMissingStateMutexes[e.RoomID()]
}
mu.Lock()
defer mu.Unlock()
// Do this with a fresh context, so that we keep working even if the // Do this with a fresh context, so that we keep working even if the
// original request times out. With any luck, by the time the remote // original request times out. With any luck, by the time the remote