frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Now logging the description (if present) in case a thread is canceled

This commit is contained in:
Klaus Schmidinger 2006-02-12 12:26:06 +01:00
parent 0e22c9ff9e
commit be2dbbd938
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -1309,6 +1309,7 @@ Marco Schl
for adding an 'Id' parameter to cDevice::PlayAudio() to allow plugins to easier for adding an 'Id' parameter to cDevice::PlayAudio() to allow plugins to easier
process the audio data process the audio data
for improving OSD area handling in cDvbSpuDecoder for improving OSD area handling in cDvbSpuDecoder
for suggesting to log the description (if present) in case a thread is canceled
Jürgen Schmitz <j.schmitz@web.de> Jürgen Schmitz <j.schmitz@web.de>
for reporting a bug in displaying the current channel when switching via the SVDRP for reporting a bug in displaying the current channel when switching via the SVDRP

2
HISTORY
View File

@ -4327,3 +4327,5 @@ Video Disk Recorder Revision History
symbolic links, which might indicate a recursive link loop (based on a patch symbolic links, which might indicate a recursive link loop (based on a patch
from Helmut Auer). from Helmut Auer).
- Improved OSD area handling in cDvbSpuDecoder (thanks to Marco Schlüßler). - Improved OSD area handling in cDvbSpuDecoder (thanks to Marco Schlüßler).
- Now logging the description (if present) in case a thread is canceled (suggested
by Marco Schlüßler).

4
thread.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: thread.c 1.52 2006/01/28 11:34:35 kls Exp $ * $Id: thread.c 1.53 2006/02/12 12:24:39 kls Exp $
*/ */
#include "thread.h" #include "thread.h"
@ -300,7 +300,7 @@ void cThread::Cancel(int WaitSeconds)
return; return;
cCondWait::SleepMs(10); cCondWait::SleepMs(10);
} }
esyslog("ERROR: thread %d won't end (waited %d seconds) - canceling it...", childThreadId, WaitSeconds); esyslog("ERROR: %s thread %d won't end (waited %d seconds) - canceling it...", description ? description : "", childThreadId, WaitSeconds);
} }
pthread_cancel(childTid); pthread_cancel(childTid);
childTid = 0; childTid = 0;