StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

fix(coreav): avoid deadlock between CoreAV, main and Audio thread

Browse Source 
This actually fixes two problems:

1) CoreAV and Audio thread both locked the callsLock and audioLock in
different orders, resulting in a deadlock of both threads. This fixed by
using a ReadWriteLock in the CoreAV thread.

2) Multiple functions were emitting signals while holding a lock. This
is unsafe, because the connected slot may acquire any other lock. This
is fixed by releasing the locks before emitting signals.
This commit is contained in:
sudden6 2019-12-02 21:26:49 +01:00
parent 9499925fb2
commit 4b9e4a571d
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
2 changed files with 39 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/core/coreav.cpp
View File

@ -181,7 +181,7 @@ void CoreAV::process()
*/ */
bool CoreAV::isCallStarted(const Friend* f) const bool CoreAV::isCallStarted(const Friend* f) const
{ {
QMutexLocker locker{&callsLock}; QReadLocker locker{&callsLock};
return f && (calls.find(f->getId()) != calls.end()); return f && (calls.find(f->getId()) != calls.end());
} }
@ -192,7 +192,7 @@ bool CoreAV::isCallStarted(const Friend* f) const
*/ */
bool CoreAV::isCallStarted(const Group* g) const bool CoreAV::isCallStarted(const Group* g) const
{ {
QMutexLocker locker{&callsLock}; QReadLocker locker{&callsLock};
return g && (groupCalls.find(g->getId()) != groupCalls.end()); return g && (groupCalls.find(g->getId()) != groupCalls.end());
} }
@ -203,7 +203,7 @@ bool CoreAV::isCallStarted(const Group* g) const
*/ */
bool CoreAV::isCallActive(const Friend* f) const bool CoreAV::isCallActive(const Friend* f) const
{ {
QMutexLocker locker{&callsLock}; QReadLocker locker{&callsLock};
auto it = calls.find(f->getId()); auto it = calls.find(f->getId());
if (it == calls.end()) { if (it == calls.end()) {
return false; return false;
@ -218,7 +218,7 @@ bool CoreAV::isCallActive(const Friend* f) const
*/ */
bool CoreAV::isCallActive(const Group* g) const bool CoreAV::isCallActive(const Group* g) const
{ {
QMutexLocker locker{&callsLock}; QReadLocker locker{&callsLock};
auto it = groupCalls.find(g->getId()); auto it = groupCalls.find(g->getId());
if (it == groupCalls.end()) { if (it == groupCalls.end()) {
return false; return false;
@ -228,14 +228,14 @@ bool CoreAV::isCallActive(const Group* g) const
bool CoreAV::isCallVideoEnabled(const Friend* f) const bool CoreAV::isCallVideoEnabled(const Friend* f) const
{ {
QMutexLocker locker{&callsLock}; QReadLocker locker{&callsLock};
auto it = calls.find(f->getId()); auto it = calls.find(f->getId());
return isCallStarted(f) && it->second->getVideoEnabled(); return isCallStarted(f) && it->second->getVideoEnabled();
} }
bool CoreAV::answerCall(uint32_t friendNum, bool video) bool CoreAV::answerCall(uint32_t friendNum, bool video)
{ {
QMutexLocker locker{&callsLock}; QWriteLocker locker{&callsLock};
QMutexLocker coreLocker{&coreLock}; QMutexLocker coreLocker{&coreLock};
qDebug() << QString("Answering call %1").arg(friendNum); qDebug() << QString("Answering call %1").arg(friendNum);
@ -258,7 +258,7 @@ bool CoreAV::answerCall(uint32_t friendNum, bool video)
bool CoreAV::startCall(uint32_t friendNum, bool video) bool CoreAV::startCall(uint32_t friendNum, bool video)
{ {
QMutexLocker locker{&callsLock}; QWriteLocker locker{&callsLock};
QMutexLocker coreLocker{&coreLock}; QMutexLocker coreLocker{&coreLock};
qDebug() << QString("Starting call with %1").arg(friendNum); qDebug() << QString("Starting call with %1").arg(friendNum);
@ -283,7 +283,7 @@ bool CoreAV::startCall(uint32_t friendNum, bool video)
bool CoreAV::cancelCall(uint32_t friendNum) bool CoreAV::cancelCall(uint32_t friendNum)
{ {
QMutexLocker locker{&callsLock}; QWriteLocker locker{&callsLock};
QMutexLocker coreLocker{&coreLock}; QMutexLocker coreLocker{&coreLock};
qDebug() << QString("Cancelling call with %1").arg(friendNum); qDebug() << QString("Cancelling call with %1").arg(friendNum);
@ -293,13 +293,15 @@ bool CoreAV::cancelCall(uint32_t friendNum)
} }
calls.erase(friendNum); calls.erase(friendNum);
locker.unlock();
emit avEnd(friendNum); emit avEnd(friendNum);
return true; return true;
} }
void CoreAV::timeoutCall(uint32_t friendNum) void CoreAV::timeoutCall(uint32_t friendNum)
{ {
QMutexLocker locker{&callsLock}; QWriteLocker locker{&callsLock};
if (!cancelCall(friendNum)) { if (!cancelCall(friendNum)) {
qWarning() << QString("Failed to timeout call with %1").arg(friendNum); qWarning() << QString("Failed to timeout call with %1").arg(friendNum);
@ -320,7 +322,7 @@ void CoreAV::timeoutCall(uint32_t friendNum)
bool CoreAV::sendCallAudio(uint32_t callId, const int16_t* pcm, size_t samples, uint8_t chans, bool CoreAV::sendCallAudio(uint32_t callId, const int16_t* pcm, size_t samples, uint8_t chans,
uint32_t rate) const uint32_t rate) const
{ {
QMutexLocker locker{&callsLock}; QReadLocker locker{&callsLock};
auto it = calls.find(callId); auto it = calls.find(callId);
if (it == calls.end()) { if (it == calls.end()) {
@ -356,7 +358,7 @@ bool CoreAV::sendCallAudio(uint32_t callId, const int16_t* pcm, size_t samples,
void CoreAV::sendCallVideo(uint32_t callId, std::shared_ptr<VideoFrame> vframe) void CoreAV::sendCallVideo(uint32_t callId, std::shared_ptr<VideoFrame> vframe)
{ {
QMutexLocker locker{&callsLock}; QReadLocker locker{&callsLock};
// We might be running in the FFmpeg thread and holding the CameraSource lock // We might be running in the FFmpeg thread and holding the CameraSource lock
// So be careful not to deadlock with anything while toxav locks in toxav_video_send_frame // So be careful not to deadlock with anything while toxav locks in toxav_video_send_frame
@ -411,7 +413,7 @@ void CoreAV::sendCallVideo(uint32_t callId, std::shared_ptr<VideoFrame> vframe)
*/ */
void CoreAV::toggleMuteCallInput(const Friend* f) void CoreAV::toggleMuteCallInput(const Friend* f)
{ {
QMutexLocker locker{&callsLock}; QReadLocker locker{&callsLock};
auto it = calls.find(f->getId()); auto it = calls.find(f->getId());
if (f && (it != calls.end())) { if (f && (it != calls.end())) {
@ -426,7 +428,7 @@ void CoreAV::toggleMuteCallInput(const Friend* f)
*/ */
void CoreAV::toggleMuteCallOutput(const Friend* f) void CoreAV::toggleMuteCallOutput(const Friend* f)
{ {
QMutexLocker locker{&callsLock}; QReadLocker locker{&callsLock};
auto it = calls.find(f->getId()); auto it = calls.find(f->getId());
if (f && (it != calls.end())) { if (f && (it != calls.end())) {
@ -454,7 +456,7 @@ void CoreAV::groupCallCallback(void* tox, uint32_t group, uint32_t peer, const i
Core* c = static_cast<Core*>(core); Core* c = static_cast<Core*>(core);
CoreAV* cav = c->getAv(); CoreAV* cav = c->getAv();
QMutexLocker locker{&cav->callsLock}; QReadLocker locker{&cav->callsLock};
assert(QThread::currentThread() == cav->coreavThread.get()); assert(QThread::currentThread() == cav->coreavThread.get());
const ToxPk peerPk = c->getGroupPeerPk(group, peer); const ToxPk peerPk = c->getGroupPeerPk(group, peer);
@ -487,7 +489,7 @@ void CoreAV::groupCallCallback(void* tox, uint32_t group, uint32_t peer, const i
*/ */
void CoreAV::invalidateGroupCallPeerSource(int group, ToxPk peerPk) void CoreAV::invalidateGroupCallPeerSource(int group, ToxPk peerPk)
{ {
QMutexLocker locker{&callsLock}; QReadLocker locker{&callsLock};
auto it = groupCalls.find(group); auto it = groupCalls.find(group);
if (it == groupCalls.end()) { if (it == groupCalls.end()) {
@ -503,7 +505,7 @@ void CoreAV::invalidateGroupCallPeerSource(int group, ToxPk peerPk)
*/ */
VideoSource* CoreAV::getVideoSourceFromCall(int friendNum) const VideoSource* CoreAV::getVideoSourceFromCall(int friendNum) const
{ {
QMutexLocker locker{&callsLock}; QReadLocker locker{&callsLock};
auto it = calls.find(friendNum); auto it = calls.find(friendNum);
if (it == calls.end()) { if (it == calls.end()) {
@ -521,7 +523,7 @@ VideoSource* CoreAV::getVideoSourceFromCall(int friendNum) const
*/ */
void CoreAV::joinGroupCall(int groupId) void CoreAV::joinGroupCall(int groupId)
{ {
QMutexLocker locker{&callsLock}; QWriteLocker locker{&callsLock};
qDebug() << QString("Joining group call %1").arg(groupId); qDebug() << QString("Joining group call %1").arg(groupId);
@ -544,7 +546,7 @@ void CoreAV::joinGroupCall(int groupId)
*/ */
void CoreAV::leaveGroupCall(int groupId) void CoreAV::leaveGroupCall(int groupId)
{ {
QMutexLocker locker{&callsLock}; QWriteLocker locker{&callsLock};
qDebug() << QString("Leaving group call %1").arg(groupId); qDebug() << QString("Leaving group call %1").arg(groupId);
@ -554,7 +556,7 @@ void CoreAV::leaveGroupCall(int groupId)
bool CoreAV::sendGroupCallAudio(int groupId, const int16_t* pcm, size_t samples, uint8_t chans, bool CoreAV::sendGroupCallAudio(int groupId, const int16_t* pcm, size_t samples, uint8_t chans,
uint32_t rate) const uint32_t rate) const
{ {
QMutexLocker locker{&callsLock}; QReadLocker locker{&callsLock};
std::map<int, ToxGroupCallPtr>::const_iterator it = groupCalls.find(groupId); std::map<int, ToxGroupCallPtr>::const_iterator it = groupCalls.find(groupId);
if (it == groupCalls.end()) { if (it == groupCalls.end()) {
@ -578,7 +580,7 @@ bool CoreAV::sendGroupCallAudio(int groupId, const int16_t* pcm, size_t samples,
*/ */
void CoreAV::muteCallInput(const Group* g, bool mute) void CoreAV::muteCallInput(const Group* g, bool mute)
{ {
QMutexLocker locker{&callsLock}; QReadLocker locker{&callsLock};
auto it = groupCalls.find(g->getId()); auto it = groupCalls.find(g->getId());
if (g && (it != groupCalls.end())) { if (g && (it != groupCalls.end())) {
@ -593,7 +595,7 @@ void CoreAV::muteCallInput(const Group* g, bool mute)
*/ */
void CoreAV::muteCallOutput(const Group* g, bool mute) void CoreAV::muteCallOutput(const Group* g, bool mute)
{ {
QMutexLocker locker{&callsLock}; QReadLocker locker{&callsLock};
auto it = groupCalls.find(g->getId()); auto it = groupCalls.find(g->getId());
if (g && (it != groupCalls.end())) { if (g && (it != groupCalls.end())) {
@ -608,7 +610,7 @@ void CoreAV::muteCallOutput(const Group* g, bool mute)
*/ */
bool CoreAV::isGroupCallInputMuted(const Group* g) const bool CoreAV::isGroupCallInputMuted(const Group* g) const
{ {
QMutexLocker locker{&callsLock}; QReadLocker locker{&callsLock};
if (!g) { if (!g) {
return false; return false;
@ -626,7 +628,7 @@ bool CoreAV::isGroupCallInputMuted(const Group* g) const
*/ */
bool CoreAV::isGroupCallOutputMuted(const Group* g) const bool CoreAV::isGroupCallOutputMuted(const Group* g) const
{ {
QMutexLocker locker{&callsLock}; QReadLocker locker{&callsLock};
if (!g) { if (!g) {
return false; return false;
@ -644,7 +646,7 @@ bool CoreAV::isGroupCallOutputMuted(const Group* g) const
*/ */
bool CoreAV::isCallInputMuted(const Friend* f) const bool CoreAV::isCallInputMuted(const Friend* f) const
{ {
QMutexLocker locker{&callsLock}; QReadLocker locker{&callsLock};
if (!f) { if (!f) {
return false; return false;
@ -661,7 +663,7 @@ bool CoreAV::isCallInputMuted(const Friend* f) const
*/ */
bool CoreAV::isCallOutputMuted(const Friend* f) const bool CoreAV::isCallOutputMuted(const Friend* f) const
{ {
QMutexLocker locker{&callsLock}; QReadLocker locker{&callsLock};
if (!f) { if (!f) {
return false; return false;
@ -677,7 +679,7 @@ bool CoreAV::isCallOutputMuted(const Friend* f) const
*/ */
void CoreAV::sendNoVideo() void CoreAV::sendNoVideo()
{ {
QMutexLocker locker{&callsLock}; QReadLocker locker{&callsLock};
// We don't change the audio bitrate, but we signal that we're not sending video anymore // We don't change the audio bitrate, but we signal that we're not sending video anymore
qDebug() << "CoreAV: Signaling end of video sending"; qDebug() << "CoreAV: Signaling end of video sending";
@ -692,7 +694,7 @@ void CoreAV::callCallback(ToxAV* toxav, uint32_t friendNum, bool audio, bool vid
{ {
CoreAV* self = static_cast<CoreAV*>(vSelf); CoreAV* self = static_cast<CoreAV*>(vSelf);
QMutexLocker locker{&self->callsLock}; QWriteLocker locker{&self->callsLock};
// Audio backend must be set before receiving a call // Audio backend must be set before receiving a call
assert(self->audio != nullptr); assert(self->audio != nullptr);
@ -715,6 +717,8 @@ void CoreAV::callCallback(ToxAV* toxav, uint32_t friendNum, bool audio, bool vid
state |= TOXAV_FRIEND_CALL_STATE_SENDING_V | TOXAV_FRIEND_CALL_STATE_ACCEPTING_V; state |= TOXAV_FRIEND_CALL_STATE_SENDING_V | TOXAV_FRIEND_CALL_STATE_ACCEPTING_V;
it.first->second->setState(static_cast<TOXAV_FRIEND_CALL_STATE>(state)); it.first->second->setState(static_cast<TOXAV_FRIEND_CALL_STATE>(state));
locker.unlock();
emit reinterpret_cast<CoreAV*>(self)->avInvite(friendNum, video); emit reinterpret_cast<CoreAV*>(self)->avInvite(friendNum, video);
} }
@ -723,7 +727,7 @@ void CoreAV::stateCallback(ToxAV* toxav, uint32_t friendNum, uint32_t state, voi
Q_UNUSED(toxav); Q_UNUSED(toxav);
CoreAV* self = static_cast<CoreAV*>(vSelf); CoreAV* self = static_cast<CoreAV*>(vSelf);
QMutexLocker locker{&self->callsLock}; QWriteLocker locker{&self->callsLock};
auto it = self->calls.find(friendNum); auto it = self->calls.find(friendNum);
if (it == self->calls.end()) { if (it == self->calls.end()) {
@ -736,15 +740,18 @@ void CoreAV::stateCallback(ToxAV* toxav, uint32_t friendNum, uint32_t state, voi
if (state & TOXAV_FRIEND_CALL_STATE_ERROR) { if (state & TOXAV_FRIEND_CALL_STATE_ERROR) {
qWarning() << "Call with friend" << friendNum << "died of unnatural causes!"; qWarning() << "Call with friend" << friendNum << "died of unnatural causes!";
self->calls.erase(friendNum); self->calls.erase(friendNum);
locker.unlock();
emit self->avEnd(friendNum, true); emit self->avEnd(friendNum, true);
} else if (state & TOXAV_FRIEND_CALL_STATE_FINISHED) { } else if (state & TOXAV_FRIEND_CALL_STATE_FINISHED) {
qDebug() << "Call with friend" << friendNum << "finished quietly"; qDebug() << "Call with friend" << friendNum << "finished quietly";
self->calls.erase(friendNum); self->calls.erase(friendNum);
locker.unlock();
emit self->avEnd(friendNum); emit self->avEnd(friendNum);
} else { } else {
// If our state was null, we started the call and were still ringing // If our state was null, we started the call and were still ringing
if (!call.getState() && state) { if (!call.getState() && state) {
call.setActive(true); call.setActive(true);
locker.unlock();
emit self->avStart(friendNum, call.getVideoEnabled()); emit self->avStart(friendNum, call.getVideoEnabled());
} else if ((call.getState() & TOXAV_FRIEND_CALL_STATE_SENDING_V) } else if ((call.getState() & TOXAV_FRIEND_CALL_STATE_SENDING_V)
&& !(state & TOXAV_FRIEND_CALL_STATE_SENDING_V)) { && !(state & TOXAV_FRIEND_CALL_STATE_SENDING_V)) {
@ -806,7 +813,7 @@ void CoreAV::audioFrameCallback(ToxAV*, uint32_t friendNum, const int16_t* pcm,
CoreAV* self = static_cast<CoreAV*>(vSelf); CoreAV* self = static_cast<CoreAV*>(vSelf);
// This callback should come from the CoreAV thread // This callback should come from the CoreAV thread
assert(QThread::currentThread() == self->coreavThread.get()); assert(QThread::currentThread() == self->coreavThread.get());
QMutexLocker locker{&self->callsLock}; QReadLocker locker{&self->callsLock};
auto it = self->calls.find(friendNum); auto it = self->calls.find(friendNum);
if (it == self->calls.end()) { if (it == self->calls.end()) {
@ -829,7 +836,7 @@ void CoreAV::videoFrameCallback(ToxAV*, uint32_t friendNum, uint16_t w, uint16_t
auto self = static_cast<CoreAV*>(vSelf); auto self = static_cast<CoreAV*>(vSelf);
// This callback should come from the CoreAV thread // This callback should come from the CoreAV thread
assert(QThread::currentThread() == self->coreavThread.get()); assert(QThread::currentThread() == self->coreavThread.get());
QMutexLocker locker{&self->callsLock}; QReadLocker locker{&self->callsLock};
auto it = self->calls.find(friendNum); auto it = self->calls.find(friendNum);
if (it == self->calls.end()) { if (it == self->calls.end()) {

3
src/core/coreav.h
View File

@ -24,6 +24,7 @@
#include "src/core/toxcall.h" #include "src/core/toxcall.h"
#include <QObject> #include <QObject>
#include <QMutex> #include <QMutex>
#include <QReadWriteLock>
#include <atomic> #include <atomic>
#include <memory> #include <memory>
#include <tox/toxav.h> #include <tox/toxav.h>
@ -148,7 +149,7 @@ private:
std::map<int, ToxGroupCallPtr> groupCalls; std::map<int, ToxGroupCallPtr> groupCalls;
// protect 'calls' and 'groupCalls' from being modified by ToxAV and Tox threads // protect 'calls' and 'groupCalls' from being modified by ToxAV and Tox threads
mutable QMutex callsLock{QMutex::Recursive}; mutable QReadWriteLock callsLock{QReadWriteLock::Recursive};
/** /**
* @brief needed to synchronize with the Core thread, some toxav_* functions * @brief needed to synchronize with the Core thread, some toxav_* functions