mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

timerd: prevent events from being deleted while sending them to neutrino

Browse Source 
in neutrino's timer list sometimes appears an entry with random values
after deleting one because thread safety is not guaranteed for timerd's
event list while sending items to neutrino, so let's lock the mutex
earlier and unlock it later

Signed-off-by: Christian Schuett <Gaucho316@hotmail.com>
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: a96fb7b7f0
Author: Christian Schuett <Gaucho316@hotmail.com>
Date: 2014-02-14 (Fri, 14 Feb 2014)



------------------
This commit was generated by Migit
This commit is contained in:
Christian Schuett
2014-02-14 18:40:22 +01:00
committed by Jacek Jendrzej
parent 7dc314700c
commit 25290a0317
3 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/timerd/timermanager.cpp
View File

@@ -277,12 +277,24 @@ bool CTimerManager::stopEvent(int peventID)
}
//------------------------------------------------------------
int CTimerManager::lockEvents()
{
return pthread_mutex_lock(&tm_eventsMutex);
}
//------------------------------------------------------------
int CTimerManager::unlockEvents()
{
return pthread_mutex_unlock(&tm_eventsMutex);
}
//------------------------------------------------------------
bool CTimerManager::listEvents(CTimerEventMap &Events)
{
if(!&Events)
return false;
pthread_mutex_lock(&tm_eventsMutex);
Events.clear();
for (CTimerEventMap::iterator pos = events.begin(); pos != events.end(); ++pos)
@@ -290,7 +302,6 @@ bool CTimerManager::listEvents(CTimerEventMap &Events)
pos->second->Refresh();
Events[pos->second->eventID] = pos->second;
}
pthread_mutex_unlock(&tm_eventsMutex);
return true;
}
//------------------------------------------------------------