mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 01:11:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

sectionsd: work around buggy cDemux in libcoolstream

Browse Source 
Origin commit data
------------------
Commit: 4bb5d1bdc0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-09 (Sat, 09 Nov 2013)
This commit is contained in:
Stefan Seyfried
2013-11-09 17:02:44 +01:00
parent 7313f23ef4
commit 6661750313
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/eitd/sectionsd.cpp
View File

@@ -1427,15 +1427,19 @@ void CTimeThread::run()
xprintf("%s: getting DVB time (isOpen %d)\n", name.c_str(), isOpen()); xprintf("%s: getting DVB time (isOpen %d)\n", name.c_str(), isOpen());
int rc; int rc;
#if HAVE_COOL_HARDWARE
/* libcoolstream does not like the repeated read if the dmx is not yet running
* (e.g. during neutrino start) and causes strange openthreads errors which in
* turn cause complete malfunction of the dmx, so we cannot use the "speed up
* shutdown" hack on with libcoolstream... :-( */
rc = dmx->Read(static_buf, MAX_SECTION_LENGTH, timeoutInMSeconds);
#else
time_t start = time_monotonic_ms(); time_t start = time_monotonic_ms();
/* speed up shutdown by looping around Read() */ /* speed up shutdown by looping around Read() */
do { do {
rc = dmx->Read(static_buf, MAX_SECTION_LENGTH, timeoutInMSeconds / 12); rc = dmx->Read(static_buf, MAX_SECTION_LENGTH, timeoutInMSeconds / 12);
#if HAVE_COOL_HARDWARE
if (rc < 0) /* libcoolstream returns -1 on timeout ??? ... */
rc = 0; /* ...and does not set a useful errno (EINVAL) */
#endif
} while (running && rc == 0 && (time_monotonic_ms() - start) < timeoutInMSeconds); } while (running && rc == 0 && (time_monotonic_ms() - start) < timeoutInMSeconds);
#endif
xprintf("%s: getting DVB time done : %d messaging_neutrino_sets_time %d\n", name.c_str(), rc, messaging_neutrino_sets_time); xprintf("%s: getting DVB time done : %d messaging_neutrino_sets_time %d\n", name.c_str(), rc, messaging_neutrino_sets_time);
if (rc > 0) { if (rc > 0) {
SIsectionTIME st(static_buf); SIsectionTIME st(static_buf);