frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Added cDevice::mutexReceiver to avoid a race condition when attaching/detaching receivers from different threads

Browse Source
This commit is contained in:
Klaus Schmidinger 2004-12-24 15:37:11 +01:00
parent c49253824a
commit f97b1069c6
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HISTORY
View File

@ -3160,7 +3160,7 @@ Video Disk Recorder Revision History
right day of week for timers in the future. right day of week for timers in the future.
- Some improvements to cPoller (thanks to Marco Schlüßler). - Some improvements to cPoller (thanks to Marco Schlüßler).
2004-12-19: Version 1.3.18 2004-12-24: Version 1.3.18
- Removed an unused variable from cTimer::GetWDayFromMDay() (thanks to Wayne Keer - Removed an unused variable from cTimer::GetWDayFromMDay() (thanks to Wayne Keer
for reporting this one). for reporting this one).
@ -3224,3 +3224,5 @@ Video Disk Recorder Revision History
- Removed delay_ms(), using cCondWait::SleepMs() instead. - Removed delay_ms(), using cCondWait::SleepMs() instead.
- Replaced time_ms() with a threadsafe and non-overflowing cTimeMs (thanks to Rainer - Replaced time_ms() with a threadsafe and non-overflowing cTimeMs (thanks to Rainer
Zocholl for pointing out this problem). Zocholl for pointing out this problem).
- Added cDevice::mutexReceiver to avoid a race condition when attaching/detaching
receivers from different threads.

4
device.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: device.c 1.63 2004/12/17 13:51:44 kls Exp $ * $Id: device.c 1.64 2004/12/24 15:37:11 kls Exp $
*/ */
#include "device.h" #include "device.h"
@ -990,6 +990,7 @@ bool cDevice::AttachReceiver(cReceiver *Receiver)
esyslog("ERROR: device %d has no lock, can't attach receiver!", CardIndex() + 1); esyslog("ERROR: device %d has no lock, can't attach receiver!", CardIndex() + 1);
return false; return false;
} }
cMutexLock MutexLock(&mutexReceiver);
for (int i = 0; i < MAXRECEIVERS; i++) { for (int i = 0; i < MAXRECEIVERS; i++) {
if (!receiver[i]) { if (!receiver[i]) {
for (int n = 0; n < MAXRECEIVEPIDS; n++) { for (int n = 0; n < MAXRECEIVEPIDS; n++) {
@ -1017,6 +1018,7 @@ void cDevice::Detach(cReceiver *Receiver)
if (!Receiver || Receiver->device != this) if (!Receiver || Receiver->device != this)
return; return;
bool receiversLeft = false; bool receiversLeft = false;
cMutexLock MutexLock(&mutexReceiver);
for (int i = 0; i < MAXRECEIVERS; i++) { for (int i = 0; i < MAXRECEIVERS; i++) {
if (receiver[i] == Receiver) { if (receiver[i] == Receiver) {
Receiver->Activate(false); Receiver->Activate(false);

3
device.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: device.h 1.47 2004/12/17 13:44:34 kls Exp $ * $Id: device.h 1.48 2004/12/24 14:57:24 kls Exp $
*/ */
#ifndef __DEVICE_H #ifndef __DEVICE_H
@ -448,6 +448,7 @@ public:
// Receiver facilities // Receiver facilities
private: private:
cMutex mutexReceiver;
cReceiver *receiver[MAXRECEIVERS]; cReceiver *receiver[MAXRECEIVERS];
int CanShift(int Ca, int Priority, int UsedCards = 0) const; int CanShift(int Ca, int Priority, int UsedCards = 0) const;
protected: protected: