mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #4030: src/mumble/ClientUser.cpp: Narrow down the scope of QWriteLocker

Browse Source
This commit is contained in:
Davide Beatrici 2020-04-03 19:30:27 +02:00 committed by GitHub
commit f85b4f0d97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/mumble/ClientUser.cpp
View File

@ -80,21 +80,37 @@ ClientUser *ClientUser::match(const ClientUser *other, bool matchname) {
}
void ClientUser::remove(unsigned int uiSession) {
QWriteLocker lock(&c_qrwlUsers);
ClientUser *p = c_qmUsers.take(uiSession);
if (p) {
if (p->cChannel)
p->cChannel->removeUser(p);
ClientUser *p;
{
QWriteLocker lock(&c_qrwlUsers);
p = c_qmUsers.take(uiSession);
AudioOutputPtr ao = g.ao;
if (ao)
ao->removeBuffer(p);
if (p) {
if (p->cChannel)
p->cChannel->removeUser(p);
if (p->tsState != Settings::Passive) {
QWriteLocker writeLock(&c_qrwlTalking);
c_qlTalking.removeAll(p);
if (p->tsState != Settings::Passive) {
QWriteLocker writeLock(&c_qrwlTalking);
c_qlTalking.removeAll(p);
}
}
}
if (p) {
AudioOutputPtr ao = g.ao;
if (ao) {
// It is safe to call this function and to give the ClientUser pointer
// to it even though we don't hold the lock anymore as it will only take
// the pointer to use as the key in a HashMap lookup. At no point in the
// code triggered by this function call will the ClientUser pointer be
// dereferenced.
// Furthermore ClientUser objects are deleted in UserModel::removeUser which
// calls this very function before doing so. Thus the object shouldn't be
// deleted before this function returns anyways.
ao->removeBuffer(p);
}
}
}
void ClientUser::remove(ClientUser *p) {