mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 17:01:08 +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

6
src/timerd/timerd.cpp
View File

@@ -59,6 +59,7 @@ bool timerd_parse_command(CBasicMessage::Header &rmsg, int connfd)
case CTimerdMsg::CMD_GETSLEEPTIMER: case CTimerdMsg::CMD_GETSLEEPTIMER:
rspGetSleeptimer.eventID = 0; rspGetSleeptimer.eventID = 0;
CTimerManager::getInstance()->lockEvents();
if (CTimerManager::getInstance()->listEvents(events)) if (CTimerManager::getInstance()->listEvents(events))
{ {
for (pos = events.begin(); pos != events.end(); ++pos) for (pos = events.begin(); pos != events.end(); ++pos)
@@ -71,6 +72,7 @@ bool timerd_parse_command(CBasicMessage::Header &rmsg, int connfd)
} }
} }
} }
CTimerManager::getInstance()->unlockEvents();
CBasicServer::send_data(connfd, &rspGetSleeptimer, sizeof(rspGetSleeptimer)); CBasicServer::send_data(connfd, &rspGetSleeptimer, sizeof(rspGetSleeptimer));
break; break;
@@ -78,6 +80,7 @@ bool timerd_parse_command(CBasicMessage::Header &rmsg, int connfd)
CTimerdMsg::commandGetTimer msgGetTimer; CTimerdMsg::commandGetTimer msgGetTimer;
CTimerd::responseGetTimer resp; CTimerd::responseGetTimer resp;
CBasicServer::receive_data(connfd,&msgGetTimer, sizeof(msgGetTimer)); CBasicServer::receive_data(connfd,&msgGetTimer, sizeof(msgGetTimer));
CTimerManager::getInstance()->lockEvents();
if(CTimerManager::getInstance()->listEvents(events)) if(CTimerManager::getInstance()->listEvents(events))
{ {
if(events[msgGetTimer.eventID]) if(events[msgGetTimer.eventID])
@@ -134,11 +137,13 @@ bool timerd_parse_command(CBasicMessage::Header &rmsg, int connfd)
} }
} }
} }
CTimerManager::getInstance()->unlockEvents();
CBasicServer::send_data(connfd, &resp, sizeof(CTimerd::responseGetTimer)); CBasicServer::send_data(connfd, &resp, sizeof(CTimerd::responseGetTimer));
break; break;
case CTimerdMsg::CMD_GETTIMERLIST: case CTimerdMsg::CMD_GETTIMERLIST:
CTimerdMsg::generalInteger responseInteger; CTimerdMsg::generalInteger responseInteger;
CTimerManager::getInstance()->lockEvents();
responseInteger.number = (CTimerManager::getInstance()->listEvents(events)) ? events.size() : 0; responseInteger.number = (CTimerManager::getInstance()->listEvents(events)) ? events.size() : 0;
if (CBasicServer::send_data(connfd, &responseInteger, sizeof(responseInteger)) == true) if (CBasicServer::send_data(connfd, &responseInteger, sizeof(responseInteger)) == true)
@@ -200,6 +205,7 @@ bool timerd_parse_command(CBasicMessage::Header &rmsg, int connfd)
CBasicServer::send_data(connfd, &lresp, sizeof(CTimerd::responseGetTimer)); CBasicServer::send_data(connfd, &lresp, sizeof(CTimerd::responseGetTimer));
} }
} }
CTimerManager::getInstance()->unlockEvents();
break; break;
case CTimerdMsg::CMD_RESCHEDULETIMER: // event nach vorne oder hinten schieben case CTimerdMsg::CMD_RESCHEDULETIMER: // event nach vorne oder hinten schieben

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) bool CTimerManager::listEvents(CTimerEventMap &Events)
{ {
if(!&Events) if(!&Events)
return false; return false;
pthread_mutex_lock(&tm_eventsMutex);
Events.clear(); Events.clear();
for (CTimerEventMap::iterator pos = events.begin(); pos != events.end(); ++pos) for (CTimerEventMap::iterator pos = events.begin(); pos != events.end(); ++pos)
@@ -290,7 +302,6 @@ bool CTimerManager::listEvents(CTimerEventMap &Events)
pos->second->Refresh(); pos->second->Refresh();
Events[pos->second->eventID] = pos->second; Events[pos->second->eventID] = pos->second;
} }
pthread_mutex_unlock(&tm_eventsMutex);
return true; return true;
} }
//------------------------------------------------------------ //------------------------------------------------------------

2
src/timerd/timermanager.h
View File

@@ -237,6 +237,8 @@ public:
bool removeEvent(int eventID); bool removeEvent(int eventID);
bool stopEvent(int eventID); bool stopEvent(int eventID);
CTimerEvent* getNextEvent(); CTimerEvent* getNextEvent();
int lockEvents();
int unlockEvents();
bool listEvents(CTimerEventMap &Events); bool listEvents(CTimerEventMap &Events);
CTimerd::CTimerEventTypes *getEventType(int eventID); CTimerd::CTimerEventTypes *getEventType(int eventID);
// int modifyEvent(int eventID, time_t announceTime, time_t alarmTime, time_t stopTime, uint32_t repeatcount, CTimerd::CTimerEventRepeat evrepeat = CTimerd::TIMERREPEAT_ONCE); // int modifyEvent(int eventID, time_t announceTime, time_t alarmTime, time_t stopTime, uint32_t repeatcount, CTimerd::CTimerEventRepeat evrepeat = CTimerd::TIMERREPEAT_ONCE);