mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 15:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

avoid double mutex lock

Browse Source
This commit is contained in:
Jacek Jendrzej
2024-09-02 20:07:12 +02:00
parent 3c998d4807
commit 562511a62f
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/driver/record.cpp
View File

@@ -1409,11 +1409,14 @@ int CRecordManager::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data
} }
else if(data == check_timer) { else if(data == check_timer) {
if(CNeutrinoApp::getInstance()->getMode() != NeutrinoModes::mode_standby) { if(CNeutrinoApp::getInstance()->getMode() != NeutrinoModes::mode_standby) {
mutex.lock();
int have_err = 0; int have_err = 0;
bool locked = mutex.trylock();
if (!locked) {
have_err = 0;
for(recmap_iterator_t it = recmap.begin(); it != recmap.end(); it++) for(recmap_iterator_t it = recmap.begin(); it != recmap.end(); it++)
have_err |= it->second->GetStatus(); have_err |= it->second->GetStatus();
mutex.unlock(); mutex.unlock();
}
//printf("%s: check status: show err %d warn %d have_err %d\n", __FUNCTION__, error_display, warn_display, have_err); //FIXME //printf("%s: check status: show err %d warn %d have_err %d\n", __FUNCTION__, error_display, warn_display, have_err); //FIXME
if (have_err) { if (have_err) {
if ((have_err & REC_STATUS_OVERFLOW) && error_display) { if ((have_err & REC_STATUS_OVERFLOW) && error_display) {