diff options
| -rw-r--r-- | HISTORY | 4 | ||||
| -rw-r--r-- | device.c | 6 | ||||
| -rw-r--r-- | dvbci.c | 4 | ||||
| -rw-r--r-- | dvbdevice.c | 4 | ||||
| -rw-r--r-- | dvbsubtitle.c | 4 | ||||
| -rw-r--r-- | sections.c | 5 | ||||
| -rw-r--r-- | thread.h | 10 |
7 files changed, 23 insertions, 14 deletions
@@ -8365,3 +8365,7 @@ Video Disk Recorder Revision History and it may be made 'protected' in a future version, since it doesn't work with TrueColor OSDs. Plugin authors may want to modify their code so that it works without this function. +- Modified the descriptions of several threads, so that the important information + (like device or frontend numbers) is within the first 15 characters of the + string, because only these are displayed in thread listings. Plugin authors may + want to do the same. @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: device.c 3.17 2015/01/12 14:38:23 kls Exp $ + * $Id: device.c 3.18 2015/01/14 11:06:13 kls Exp $ */ #include "device.h" @@ -77,7 +77,7 @@ cDevice::cDevice(void) cardIndex = nextCardIndex++; dsyslog("new device number %d", CardIndex() + 1); - SetDescription("receiver on device %d", CardIndex() + 1); + SetDescription("device %d receiver", CardIndex() + 1); mute = false; volume = Setup.CurrentVolume; @@ -1735,7 +1735,7 @@ void cDevice::DetachAllReceivers(void) cTSBuffer::cTSBuffer(int File, int Size, int CardIndex) { - SetDescription("TS buffer on device %d", CardIndex); + SetDescription("device %d TS buffer", CardIndex); f = File; cardIndex = CardIndex; delivered = false; @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: dvbci.c 1.1 2007/01/07 14:38:00 kls Exp $ + * $Id: dvbci.c 3.1 2015/01/14 11:13:49 kls Exp $ */ #include "dvbci.h" @@ -17,7 +17,7 @@ cDvbCiAdapter::cDvbCiAdapter(cDevice *Device, int Fd) { device = Device; - SetDescription("CI adapter on device %d", device->DeviceNumber()); + SetDescription("device %d CI adapter", device->DeviceNumber()); fd = Fd; ca_caps_t Caps; if (ioctl(fd, CA_GET_CAP, &Caps) == 0) { diff --git a/dvbdevice.c b/dvbdevice.c index da97567a..d361127b 100644 --- a/dvbdevice.c +++ b/dvbdevice.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: dvbdevice.c 3.12 2015/01/12 11:24:51 kls Exp $ + * $Id: dvbdevice.c 3.13 2015/01/14 11:06:42 kls Exp $ */ #include "dvbdevice.h" @@ -372,7 +372,7 @@ cDvbTuner::cDvbTuner(const cDvbDevice *Device, int Fd_Frontend, int Adapter, int tunerStatus = tsIdle; bondedTuner = NULL; bondedMaster = false; - SetDescription("tuner on frontend %d/%d", adapter, frontend); + SetDescription("frontend %d/%d tuner", adapter, frontend); Start(); } diff --git a/dvbsubtitle.c b/dvbsubtitle.c index 4bf613b9..5df8cdb6 100644 --- a/dvbsubtitle.c +++ b/dvbsubtitle.c @@ -7,7 +7,7 @@ * Original author: Marco Schluessler <marco@lordzodiac.de> * With some input from the "subtitles plugin" by Pekka Virtanen <pekka.virtanen@sci.fi> * - * $Id: dvbsubtitle.c 3.8 2015/01/14 10:30:50 kls Exp $ + * $Id: dvbsubtitle.c 3.9 2015/01/14 11:31:09 kls Exp $ */ #include "dvbsubtitle.h" @@ -1320,7 +1320,7 @@ void cDvbSubtitleBitmaps::DbgDump(int WindowWidth, int WindowHeight) int cDvbSubtitleConverter::setupLevel = 0; cDvbSubtitleConverter::cDvbSubtitleConverter(void) -:cThread("subtitleConverter") +:cThread("subtitle converter") { dvbSubtitleAssembler = new cDvbSubtitleAssembler; osd = NULL; @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: sections.c 2.2 2012/10/04 12:21:59 kls Exp $ + * $Id: sections.c 3.1 2015/01/14 11:35:53 kls Exp $ */ #include "sections.h" @@ -40,10 +40,11 @@ public: // --- cSectionHandler ------------------------------------------------------- cSectionHandler::cSectionHandler(cDevice *Device) -:cThread("section handler", true) +:cThread(NULL, true) { shp = new cSectionHandlerPrivate; device = Device; + SetDescription("device %d section handler", device->CardIndex() + 1); statusCount = 0; on = false; waitForLock = false; @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: thread.h 3.1 2013/04/11 08:47:31 kls Exp $ + * $Id: thread.h 3.2 2015/01/14 11:39:55 kls Exp $ */ #ifndef __THREAD_H @@ -110,12 +110,16 @@ public: cThread(const char *Description = NULL, bool LowPriority = false); ///< Creates a new thread. ///< If Description is present, a log file entry will be made when - ///< the thread starts and stops. The Start() function must be called - ///< to actually start the thread. + ///< the thread starts and stops (see SetDescription()). + ///< The Start() function must be called to actually start the thread. ///< LowPriority can be set to true to make this thread run at a lower ///< priority. virtual ~cThread(); void SetDescription(const char *Description, ...) __attribute__ ((format (printf, 2, 3))); + ///< Sets the description of this thread, which will be used when logging + ///< starting or stopping of the thread. Make sure any important information + ///< is within the first 15 characters of Description, because only these + ///< may be displayed in thread listings (like 'htop', for instance). bool Start(void); ///< Actually starts the thread. ///< If the thread is already running, nothing happens. |