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

Mutexes

Browse source
This commit is contained in:
Neil Alexander 2022-04-13 11:08:56 +01:00
parent 05dfb93815
commit 4463e42129
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
syncapi/notifier/notifier.go
View file

@ -262,7 +262,10 @@ func (n *Notifier) SharedUsers(userID string) []string {
func (n *Notifier) _sharedUsers(userID string) []string { func (n *Notifier) _sharedUsers(userID string) []string {
n._sharedUserMap[userID] = struct{}{} n._sharedUserMap[userID] = struct{}{}
for roomID, users := range n.roomIDToJoinedUsers { for roomID, users := range n.roomIDToJoinedUsers {
if _, ok := users.set[userID]; !ok { users.Lock()
_, ok := users.set[userID]
users.Unlock()
if !ok {
continue continue
} }
for _, userID := range n._joinedUsers(roomID) { for _, userID := range n._joinedUsers(roomID) {
@ -282,8 +285,10 @@ func (n *Notifier) IsSharedUser(userA, userB string) bool {
defer n.lock.RUnlock() defer n.lock.RUnlock()
var okA, okB bool var okA, okB bool
for _, users := range n.roomIDToJoinedUsers { for _, users := range n.roomIDToJoinedUsers {
users.Lock()
_, okA = users.set[userA] _, okA = users.set[userA]
_, okB = users.set[userB] _, okB = users.set[userB]
users.Unlock()
if okA && okB { if okA && okB {
return true return true
} }
@ -350,7 +355,7 @@ func (n *Notifier) setUsersJoinedToRooms(roomIDToUserIDs map[string][]string) {
for _, userID := range userIDs { for _, userID := range userIDs {
n.roomIDToJoinedUsers[roomID].add(userID) n.roomIDToJoinedUsers[roomID].add(userID)
} }
n.roomIDToJoinedUsers[roomID]._precompute() n.roomIDToJoinedUsers[roomID].precompute()
} }
} }
@ -441,18 +446,18 @@ func (n *Notifier) _fetchUserStreams(userID string) []*UserDeviceStream {
func (n *Notifier) _addJoinedUser(roomID, userID string) { func (n *Notifier) _addJoinedUser(roomID, userID string) {
if _, ok := n.roomIDToJoinedUsers[roomID]; !ok { if _, ok := n.roomIDToJoinedUsers[roomID]; !ok {
n.roomIDToJoinedUsers[roomID] = newUserIDSet(1) n.roomIDToJoinedUsers[roomID] = newUserIDSet(32)
} }
n.roomIDToJoinedUsers[roomID].add(userID) n.roomIDToJoinedUsers[roomID].add(userID)
n.roomIDToJoinedUsers[roomID]._precompute() n.roomIDToJoinedUsers[roomID].precompute()
} }
func (n *Notifier) _removeJoinedUser(roomID, userID string) { func (n *Notifier) _removeJoinedUser(roomID, userID string) {
if _, ok := n.roomIDToJoinedUsers[roomID]; !ok { if _, ok := n.roomIDToJoinedUsers[roomID]; !ok {
n.roomIDToJoinedUsers[roomID] = newUserIDSet(0) n.roomIDToJoinedUsers[roomID] = newUserIDSet(7)
} }
n.roomIDToJoinedUsers[roomID].remove(userID) n.roomIDToJoinedUsers[roomID].remove(userID)
n.roomIDToJoinedUsers[roomID]._precompute() n.roomIDToJoinedUsers[roomID].precompute()
} }
func (n *Notifier) JoinedUsers(roomID string) (userIDs []string) { func (n *Notifier) JoinedUsers(roomID string) (userIDs []string) {
@ -551,7 +556,7 @@ func (s *userIDSet) remove(str string) {
s.precomputed = s.precomputed[:0] // invalidate cache s.precomputed = s.precomputed[:0] // invalidate cache
} }
func (s *userIDSet) _precompute() { func (s *userIDSet) precompute() {
s.Lock() s.Lock()
defer s.Unlock() defer s.Unlock()
s.precomputed = s.values() s.precomputed = s.values()