mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-01 03:03:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Try to reduce allocations further

Browse source
This commit is contained in:
Neil Alexander 2022-04-06 12:33:04 +01:00
parent ca73cf09b3
commit e6f72a8870
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
syncapi/notifier/notifier.go
View file

@ -258,6 +258,17 @@ func (n *Notifier) SharedUsers(userID string) (sharedUsers []string) {
return sharedUsers
}
func (n *Notifier) IsSharedUser(userA, userB string) bool {
for _, users := range n.roomIDToJoinedUsers {
_, okA := users[userA]
_, okB := users[userB]
if okA && okB {
return true
}
}
return false
}
// GetListener returns a UserStreamListener that can be used to wait for
// updates for a user. Must be closed.
// notify for anything before sincePos

14
syncapi/streams/stream_presence.go
View file

@ -64,17 +64,6 @@ func (p *PresenceStreamProvider) IncrementalSync(
return to
}
// get all joined users
// TODO: SharedUsers might get out of sync
sharedUsers := p.notifier.SharedUsers(req.Device.UserID)
// convert array to a map for easier checking if a user exists
sharedUsersMap := make(map[string]bool, len(sharedUsers))
sharedUsersMap[req.Device.UserID] = true
for i := range sharedUsers {
sharedUsersMap[sharedUsers[i]] = true
}
// add newly joined rooms user presences
newlyJoined := joinedRooms(req.Response, req.Device.UserID)
if len(newlyJoined) > 0 {
@ -87,7 +76,6 @@ func (p *PresenceStreamProvider) IncrementalSync(
for _, roomID := range newlyJoined {
roomUsers := p.notifier.JoinedUsers(roomID)
for i := range roomUsers {
sharedUsersMap[roomUsers[i]] = true
// we already got a presence from this user
if _, ok := presences[roomUsers[i]]; ok {
continue
@ -108,7 +96,7 @@ func (p *PresenceStreamProvider) IncrementalSync(
for i := range presences {
presence := presences[i]
// Ignore users we don't share a room with
if !sharedUsersMap[presence.UserID] {
if req.Device.UserID != presence.UserID && !p.notifier.IsSharedUser(req.Device.UserID, presence.UserID) {
continue
}
cacheKey := req.Device.UserID + req.Device.ID + presence.UserID