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

Move mutex

Browse source
This commit is contained in:
Neil Alexander 2021-06-29 15:28:14 +01:00
parent 7779960c9d
commit 89c16d132b
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
federationapi/routing/send.go
View file

@ -497,7 +497,12 @@ func (t *txnReq) getServers(ctx context.Context, roomID string) []gomatrixserver
return t.servers
}
var processEventMutexes = internal.NewMutexByRoom()
func (t *txnReq) processEvent(ctx context.Context, e *gomatrixserverlib.Event) error {
processEventMutexes.Lock(e.RoomID())
defer processEventMutexes.Unlock(e.RoomID())
logger := util.GetLogger(ctx).WithField("event_id", e.EventID()).WithField("room_id", e.RoomID())
t.work = "" // reset from previous event
@ -618,14 +623,9 @@ func checkAllowedByState(e *gomatrixserverlib.Event, stateEvents []*gomatrixserv
return gomatrixserverlib.Allowed(e, &authUsingState)
}
var processEventWithMissingStateMutexes = internal.NewMutexByRoom()
func (t *txnReq) processEventWithMissingState(
ctx context.Context, e *gomatrixserverlib.Event, roomVersion gomatrixserverlib.RoomVersion,
) error {
processEventWithMissingStateMutexes.Lock(string(t.Origin) + e.RoomID())
defer processEventWithMissingStateMutexes.Unlock(string(t.Origin) + e.RoomID())
// 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
// side retries, we'll have fetched the missing state.