Skip to content

Commit bc6da9d

Browse files
rofaforrofafor
committed
Added support for tracing modes.
1 parent 63359e4 commit bc6da9d

21 files changed

+343
-251
lines changed

‎common.h

+9-19
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,6 @@
1212
#include <vdr/config.h>
1313
#include <vdr/i18n.h>
1414

15-
#ifdef DEBUG
16-
#define debug(x...) dsyslog("IPTV: " x);
17-
#define info(x...) isyslog("IPTV: " x);
18-
#define error(x...) esyslog("ERROR: " x);
19-
#else
20-
#define debug(x...) ;
21-
#define info(x...) isyslog("IPTV: " x);
22-
#define error(x...) esyslog("ERROR: " x);
23-
#endif
24-
2515
#define ELEMENTS(x) (sizeof(x) / sizeof(x[0]))
2616

2717
#define IPTV_BUFFER_SIZE MEGABYTE(1)
@@ -42,15 +32,15 @@
4232

4333
#define SECTION_FILTER_TABLE_SIZE 5
4434

45-
#define ERROR_IF_FUNC(exp, errstr, func, ret) \
46-
do { \
47-
if (exp) { \
48-
char tmp[64]; \
49-
error("[%s,%d]: "errstr": %s", __FILE__, __LINE__, \
50-
strerror_r(errno, tmp, sizeof(tmp))); \
51-
func; \
52-
ret; \
53-
} \
35+
#define ERROR_IF_FUNC(exp, errstr, func, ret) \
36+
do { \
37+
if (exp) { \
38+
char tmp[64]; \
39+
esyslog("[%s,%d]: "errstr": %s", __FILE__, __LINE__, \
40+
strerror_r(errno, tmp, sizeof(tmp))); \
41+
func; \
42+
ret; \
43+
} \
5444
} while (0)
5545

5646

‎config.c

+5-3
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55
*
66
*/
77

8+
#include "log.h"
89
#include "config.h"
910

1011
cIptvConfig IptvConfig;
1112

1213
cIptvConfig::cIptvConfig(void)
13-
: protocolBasePortM(4321),
14+
: traceModeM(eTraceModeNormal),
15+
protocolBasePortM(4321),
1416
useBytesM(1),
1517
sectionFilteringM(1)
1618
{
@@ -41,12 +43,12 @@ void cIptvConfig::SetDisabledFilters(unsigned int indexP, int numberP)
4143

4244
void cIptvConfig::SetConfigDirectory(const char *directoryP)
4345
{
44-
debug("cIptvConfig::%s(%s)", __FUNCTION__, directoryP);
46+
debug1("%s (%s)", __PRETTY_FUNCTION__, directoryP);
4547
ERROR_IF(!realpath(directoryP, configDirectoryM), "Cannot canonicalize configuration directory");
4648
}
4749

4850
void cIptvConfig::SetResourceDirectory(const char *directoryP)
4951
{
50-
debug("cIptvConfig::%s(%s)", __FUNCTION__, directoryP);
52+
debug1("%s (%s)", __PRETTY_FUNCTION__, directoryP);
5153
ERROR_IF(!realpath(directoryP, resourceDirectoryM), "Cannot canonicalize resource directory");
5254
}

‎config.h

+24
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
class cIptvConfig
1515
{
1616
private:
17+
unsigned int traceModeM;
1718
unsigned int protocolBasePortM;
1819
unsigned int useBytesM;
1920
unsigned int sectionFilteringM;
@@ -22,14 +23,37 @@ class cIptvConfig
2223
char resourceDirectoryM[PATH_MAX];
2324

2425
public:
26+
enum eTraceMode {
27+
eTraceModeNormal = 0x0000,
28+
eTraceModeDebug1 = 0x0001,
29+
eTraceModeDebug2 = 0x0002,
30+
eTraceModeDebug3 = 0x0004,
31+
eTraceModeDebug4 = 0x0008,
32+
eTraceModeDebug5 = 0x0010,
33+
eTraceModeDebug6 = 0x0020,
34+
eTraceModeDebug7 = 0x0040,
35+
eTraceModeDebug8 = 0x0080,
36+
eTraceModeDebug9 = 0x0100,
37+
eTraceModeDebug10 = 0x0200,
38+
eTraceModeDebug11 = 0x0400,
39+
eTraceModeDebug12 = 0x0800,
40+
eTraceModeDebug13 = 0x1000,
41+
eTraceModeDebug14 = 0x2000,
42+
eTraceModeDebug15 = 0x4000,
43+
eTraceModeDebug16 = 0x8000,
44+
eTraceModeMask = 0xFFFF
45+
};
2546
cIptvConfig();
47+
unsigned int GetTraceMode(void) const { return traceModeM; }
48+
bool IsTraceMode(eTraceMode modeP) const { return (traceModeM & modeP); }
2649
unsigned int GetProtocolBasePort(void) const { return protocolBasePortM; }
2750
unsigned int GetUseBytes(void) const { return useBytesM; }
2851
unsigned int GetSectionFiltering(void) const { return sectionFilteringM; }
2952
const char *GetConfigDirectory(void) const { return configDirectoryM; }
3053
const char *GetResourceDirectory(void) const { return resourceDirectoryM; }
3154
unsigned int GetDisabledFiltersCount(void) const;
3255
int GetDisabledFilters(unsigned int indexP) const;
56+
void SetTraceMode(unsigned int modeP) { traceModeM = (modeP & eTraceModeMask); }
3357
void SetProtocolBasePort(unsigned int portNumberP) { protocolBasePortM = portNumberP; }
3458
void SetUseBytes(unsigned int onOffP) { useBytesM = onOffP; }
3559
void SetSectionFiltering(unsigned int onOffP) { sectionFilteringM = onOffP; }

‎device.c

+31-31
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ cIptvDevice::cIptvDevice(unsigned int indexP)
2424
{
2525
unsigned int bufsize = (unsigned int)IPTV_BUFFER_SIZE;
2626
bufsize -= (bufsize % TS_SIZE);
27-
isyslog("creating IPTV device %d (CardIndex=%d)", deviceIndexM, CardIndex());
27+
info("Creating IPTV device %d (CardIndex=%d)", deviceIndexM, CardIndex());
2828
tsBufferM = new cRingBufferLinear(bufsize + 1, TS_SIZE, false,
2929
*cString::sprintf("IPTV TS %d", deviceIndexM));
3030
if (tsBufferM) {
@@ -50,13 +50,13 @@ cIptvDevice::cIptvDevice(unsigned int indexP)
5050
if (S_ISFIFO(sb.st_mode)) {
5151
dvrFdM = open(filename, O_RDWR | O_NONBLOCK);
5252
if (dvrFdM >= 0)
53-
dsyslog("IPTV device %d redirecting input stream to '%s'", deviceIndexM, *filename);
53+
info("IPTV device %d redirecting input stream to '%s'", deviceIndexM, *filename);
5454
}
5555
}
5656

5757
cIptvDevice::~cIptvDevice()
5858
{
59-
debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
59+
debug1("%s [device %d]", __PRETTY_FUNCTION__, deviceIndexM);
6060
// Stop section handler of iptv device
6161
StopSectionHandler();
6262
DELETE_POINTER(pIptvSectionM);
@@ -79,7 +79,7 @@ cIptvDevice::~cIptvDevice()
7979

8080
bool cIptvDevice::Initialize(unsigned int deviceCountP)
8181
{
82-
debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceCountP);
82+
debug1("%s (%u)", __PRETTY_FUNCTION__, deviceCountP);
8383
new cIptvSourceParam(IPTV_SOURCE_CHARACTER, "IPTV");
8484
if (deviceCountP > IPTV_MAX_DEVICES)
8585
deviceCountP = IPTV_MAX_DEVICES;
@@ -92,7 +92,7 @@ bool cIptvDevice::Initialize(unsigned int deviceCountP)
9292

9393
void cIptvDevice::Shutdown(void)
9494
{
95-
debug("cIptvDevice::%s()", __FUNCTION__);
95+
debug1("%s", __PRETTY_FUNCTION__);
9696
for (int i = 0; i < IPTV_MAX_DEVICES; ++i) {
9797
if (IptvDevicesS[i])
9898
IptvDevicesS[i]->CloseDvr();
@@ -102,7 +102,7 @@ void cIptvDevice::Shutdown(void)
102102
unsigned int cIptvDevice::Count(void)
103103
{
104104
unsigned int count = 0;
105-
debug("cIptvDevice::%s()", __FUNCTION__);
105+
debug1("%s", __PRETTY_FUNCTION__);
106106
for (unsigned int i = 0; i < IPTV_MAX_DEVICES; ++i) {
107107
if (IptvDevicesS[i] != NULL)
108108
count++;
@@ -112,10 +112,10 @@ unsigned int cIptvDevice::Count(void)
112112

113113
cIptvDevice *cIptvDevice::GetIptvDevice(int cardIndexP)
114114
{
115-
//debug("cIptvDevice::%s(%d)", __FUNCTION__, cardIndexP);
115+
debug16("%s (%d)", __PRETTY_FUNCTION__, cardIndexP);
116116
for (unsigned int i = 0; i < IPTV_MAX_DEVICES; ++i) {
117117
if (IptvDevicesS[i] && (IptvDevicesS[i]->CardIndex() == cardIndexP)) {
118-
//debug("cIptvDevice::%s(%d): found!", __FUNCTION__, cardIndexP);
118+
debug16("%s (%d) Found", __PRETTY_FUNCTION__, cardIndexP);
119119
return IptvDevicesS[i];
120120
}
121121
}
@@ -124,7 +124,7 @@ cIptvDevice *cIptvDevice::GetIptvDevice(int cardIndexP)
124124

125125
cString cIptvDevice::GetGeneralInformation(void)
126126
{
127-
//debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
127+
debug16("%s [device %d]", __PRETTY_FUNCTION__, deviceIndexM);
128128
return cString::sprintf("IPTV device: %d\nCardIndex: %d\nStream: %s\nStream bitrate: %s\n%sChannel: %s",
129129
deviceIndexM, CardIndex(),
130130
pIptvStreamerM ? *pIptvStreamerM->GetInformation() : "",
@@ -135,13 +135,13 @@ cString cIptvDevice::GetGeneralInformation(void)
135135

136136
cString cIptvDevice::GetPidsInformation(void)
137137
{
138-
//debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
138+
debug16("%s [device %d]", __PRETTY_FUNCTION__, deviceIndexM);
139139
return GetPidStatistic();
140140
}
141141

142142
cString cIptvDevice::GetFiltersInformation(void)
143143
{
144-
//debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
144+
debug16("%s [device %d]", __PRETTY_FUNCTION__, deviceIndexM);
145145
return cString::sprintf("Active section filters:\n%s", pIptvSectionM ? *pIptvSectionM->GetInformation() : "");
146146
}
147147

@@ -177,37 +177,37 @@ cString cIptvDevice::GetInformation(unsigned int pageP)
177177

178178
cString cIptvDevice::DeviceType(void) const
179179
{
180-
//debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
180+
debug16("%s [device %d]", __PRETTY_FUNCTION__, deviceIndexM);
181181
return "IPTV";
182182
}
183183

184184
cString cIptvDevice::DeviceName(void) const
185185
{
186-
debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
186+
debug1("%s [device %d]", __PRETTY_FUNCTION__, deviceIndexM);
187187
return cString::sprintf("IPTV %d", deviceIndexM);
188188
}
189189

190190
int cIptvDevice::SignalStrength(void) const
191191
{
192-
debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
192+
debug1("%s [device %d]", __PRETTY_FUNCTION__, deviceIndexM);
193193
return (100);
194194
}
195195

196196
int cIptvDevice::SignalQuality(void) const
197197
{
198-
debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
198+
debug1("%s [device %d]", __PRETTY_FUNCTION__, deviceIndexM);
199199
return (100);
200200
}
201201

202202
bool cIptvDevice::ProvidesSource(int sourceP) const
203203
{
204-
debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
204+
debug1("%s [device %d]", __PRETTY_FUNCTION__, deviceIndexM);
205205
return (cSource::IsType(sourceP, IPTV_SOURCE_CHARACTER));
206206
}
207207

208208
bool cIptvDevice::ProvidesTransponder(const cChannel *channelP) const
209209
{
210-
debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
210+
debug1("%s [device %d]", __PRETTY_FUNCTION__, deviceIndexM);
211211
return (ProvidesSource(channelP->Source()));
212212
}
213213

@@ -217,7 +217,7 @@ bool cIptvDevice::ProvidesChannel(const cChannel *channelP, int priorityP, bool
217217
bool hasPriority = (priorityP == IDLEPRIORITY) || (priorityP > this->Priority());
218218
bool needsDetachReceivers = false;
219219

220-
debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
220+
debug1("%s [device %d]", __PRETTY_FUNCTION__, deviceIndexM);
221221

222222
if (channelP && ProvidesTransponder(channelP)) {
223223
result = hasPriority;
@@ -263,7 +263,7 @@ bool cIptvDevice::SetChannelDevice(const cChannel *channelP, bool liveViewP)
263263
cIptvProtocolIf *protocol;
264264
cIptvTransponderParameters itp(channelP->Parameters());
265265

266-
debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
266+
debug1("%s [device %d]", __PRETTY_FUNCTION__, deviceIndexM);
267267

268268
if (isempty(itp.Address())) {
269269
error("Unrecognized IPTV address: %s", channelP->Parameters());
@@ -304,15 +304,15 @@ bool cIptvDevice::SetChannelDevice(const cChannel *channelP, bool liveViewP)
304304

305305
bool cIptvDevice::SetPid(cPidHandle *handleP, int typeP, bool onP)
306306
{
307-
debug("cIptvDevice::%s(%d): pid=%d type=%d on=%d", __FUNCTION__, deviceIndexM, handleP ? handleP->pid : -1, typeP, onP);
307+
debug1("%s (%d, %d, %d) [device %d]", __PRETTY_FUNCTION__, handleP ? handleP->pid : -1, typeP, onP, deviceIndexM);
308308
if (pIptvStreamerM && handleP)
309309
return pIptvStreamerM->SetPid(handleP->pid, typeP, onP);
310310
return true;
311311
}
312312

313313
int cIptvDevice::OpenFilter(u_short pidP, u_char tidP, u_char maskP)
314314
{
315-
//debug("cIptvDevice::%s(%d): pid=%d tid=%d mask=%d", __FUNCTION__, deviceIndexM, pidP, tidP, maskP);
315+
debug16("%s (%d, %d, %d) [device %d]", __PRETTY_FUNCTION__, pidP, tidP, maskP, deviceIndexM);
316316
if (pIptvSectionM && IptvConfig.GetSectionFiltering()) {
317317
if (pIptvStreamerM)
318318
pIptvStreamerM->SetPid(pidP, ptOther, true);
@@ -323,7 +323,7 @@ int cIptvDevice::OpenFilter(u_short pidP, u_char tidP, u_char maskP)
323323

324324
void cIptvDevice::CloseFilter(int handleP)
325325
{
326-
//debug("cIptvDevice::%s(%d): handle=%d", __FUNCTION__, deviceIndexM, handleP);
326+
debug16("%s (%d) [device %d]", __PRETTY_FUNCTION__, handleP, deviceIndexM);
327327
if (pIptvSectionM) {
328328
if (pIptvStreamerM)
329329
pIptvStreamerM->SetPid(pIptvSectionM->GetPid(handleP), ptOther, false);
@@ -333,7 +333,7 @@ void cIptvDevice::CloseFilter(int handleP)
333333

334334
bool cIptvDevice::OpenDvr(void)
335335
{
336-
debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
336+
debug1("%s [device %d]", __PRETTY_FUNCTION__, deviceIndexM);
337337
isPacketDeliveredM = false;
338338
tsBufferM->Clear();
339339
if (pIptvStreamerM)
@@ -348,7 +348,7 @@ bool cIptvDevice::OpenDvr(void)
348348

349349
void cIptvDevice::CloseDvr(void)
350350
{
351-
debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
351+
debug1("%s [device %d]", __PRETTY_FUNCTION__, deviceIndexM);
352352
if (pidScanEnabledM && pPidScannerM)
353353
pPidScannerM->Close();
354354
if (sidScanEnabledM && pSidScannerM)
@@ -360,19 +360,19 @@ void cIptvDevice::CloseDvr(void)
360360

361361
bool cIptvDevice::HasLock(int timeoutMsP) const
362362
{
363-
//debug("cIptvDevice::%s(%d): timeoutMs=%d", __FUNCTION__, deviceIndexM, timeoutMsP);
363+
debug16("%s (%d) [device %d]", __PRETTY_FUNCTION__, timeoutMsP, deviceIndexM);
364364
return (pIptvStreamerM && pIptvStreamerM->Active());
365365
}
366366

367367
bool cIptvDevice::HasInternalCam(void)
368368
{
369-
//debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
369+
debug16("%s [device %d]", __PRETTY_FUNCTION__, deviceIndexM);
370370
return false;
371371
}
372372

373373
void cIptvDevice::WriteData(uchar *bufferP, int lengthP)
374374
{
375-
//debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
375+
debug16("%s (, %d) [device %d]", __PRETTY_FUNCTION__, lengthP, deviceIndexM);
376376
int len;
377377
// Send data to dvr fifo
378378
if (dvrFdM >= 0)
@@ -390,15 +390,15 @@ void cIptvDevice::WriteData(uchar *bufferP, int lengthP)
390390

391391
unsigned int cIptvDevice::CheckData(void)
392392
{
393-
//debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
393+
debug16("%s [device %d]", __PRETTY_FUNCTION__, deviceIndexM);
394394
if (tsBufferM)
395395
return (unsigned int)tsBufferM->Free();
396396
return 0;
397397
}
398398

399399
uchar *cIptvDevice::GetData(int *availableP)
400400
{
401-
//debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
401+
debug16("%s [device %d]", __PRETTY_FUNCTION__, deviceIndexM);
402402
if (isOpenDvrM && tsBufferM) {
403403
int count = 0;
404404
if (isPacketDeliveredM)
@@ -429,7 +429,7 @@ uchar *cIptvDevice::GetData(int *availableP)
429429

430430
void cIptvDevice::SkipData(int countP)
431431
{
432-
//debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
432+
debug16("%s (%d) [device %d]]", __PRETTY_FUNCTION__, countP, deviceIndexM);
433433
tsBufferM->Del(countP);
434434
isPacketDeliveredM = false;
435435
// Update buffer statistics
@@ -438,7 +438,7 @@ void cIptvDevice::SkipData(int countP)
438438

439439
bool cIptvDevice::GetTSPacket(uchar *&dataP)
440440
{
441-
//debug("cIptvDevice::%s(%d)", __FUNCTION__, deviceIndexM);
441+
debug16("%s [device %d]", __PRETTY_FUNCTION__, deviceIndexM);
442442
if (tsBufferM) {
443443
if (cCamSlot *cs = CamSlot()) {
444444
if (cs->WantsTsData()) {

0 commit comments

Comments
 (0)