mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-07 05:38:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

sectionsd: #ifdef out complete SDT thread, it is unused anyway

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1245 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
seife
2011-03-05 12:19:42 +00:00
parent 2bc422fdb6
commit de2f61c7f5
1 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/sectionsd/sectionsd.cpp
View File

@@ -233,8 +233,8 @@ static DMX dmxEIT(0x12, 3000 /*320*/);
static DMX dmxFSEIT(3842, 320); static DMX dmxFSEIT(3842, 320);
#endif #endif
static DMX dmxCN(0x12, 512, false, 1); static DMX dmxCN(0x12, 512, false, 1);
static DMX dmxSDT(0x11, 512, true, 1);
#ifdef UPDATE_NETWORKS #ifdef UPDATE_NETWORKS
static DMX dmxSDT(0x11, 512, true, 1);
static DMX dmxNIT(0x10, 128); static DMX dmxNIT(0x10, 128);
#endif #endif
#ifdef ENABLE_PPT #ifdef ENABLE_PPT
@@ -1562,7 +1562,7 @@ static bool AddServiceToAutoBouquets(const char *provname, const t_original_netw
return returnvalue; return returnvalue;
} }
#endif
// Fuegt ein Service in alle Mengen ein // Fuegt ein Service in alle Mengen ein
static bool addService(const SIservice &s, const int is_actual) static bool addService(const SIservice &s, const int is_actual)
{ {
@@ -1624,7 +1624,7 @@ static bool addService(const SIservice &s, const int is_actual)
return is_new; return is_new;
} }
#ifdef UPDATE_NETWORKS
// SIsPtr; // SIsPtr;
typedef boost::shared_ptr<class SIbouquet> typedef boost::shared_ptr<class SIbouquet>
SIbouquetPtr; SIbouquetPtr;
@@ -2172,8 +2172,8 @@ static void commandPauseScanning(int connfd, char *data, const unsigned dataLeng
#endif #endif
#ifdef UPDATE_NETWORKS #ifdef UPDATE_NETWORKS
dmxNIT.request_pause(); dmxNIT.request_pause();
#endif
dmxSDT.request_pause(); dmxSDT.request_pause();
#endif
#ifdef ENABLE_PPT #ifdef ENABLE_PPT
dmxPPT.request_pause(); dmxPPT.request_pause();
#endif #endif
@@ -2184,8 +2184,8 @@ static void commandPauseScanning(int connfd, char *data, const unsigned dataLeng
dmxCN.request_unpause(); dmxCN.request_unpause();
#ifdef UPDATE_NETWORKS #ifdef UPDATE_NETWORKS
dmxNIT.request_unpause(); dmxNIT.request_unpause();
#endif
dmxSDT.request_unpause(); dmxSDT.request_unpause();
#endif
dmxEIT.request_unpause(); dmxEIT.request_unpause();
#ifdef ENABLE_FREESATEPG #ifdef ENABLE_FREESATEPG
dmxFSEIT.request_unpause(); dmxFSEIT.request_unpause();
@@ -2961,8 +2961,8 @@ static t_network_id messaging_nit_other_nid [MAX_CONCURRENT_OTHER_NIT]; // 0x
static t_network_id messaging_nit_nid[MAX_NIDs]; // 0x40,0x41 static t_network_id messaging_nit_nid[MAX_NIDs]; // 0x40,0x41
/* nessaging_sdt_tid does not need locking, because it is only used in one thread (sdt thread). */ /* nessaging_sdt_tid does not need locking, because it is only used in one thread (sdt thread). */
static t_transponder_id messaging_sdt_tid[MAX_SDTs]; // 0x42,0x46 static t_transponder_id messaging_sdt_tid[MAX_SDTs]; // 0x42,0x46
#endif
static int auto_scanning = 0; static int auto_scanning = 0;
#endif
std::string epg_dir(""); std::string epg_dir("");
static void commandserviceChanged(int connfd, char *data, const unsigned dataLength) static void commandserviceChanged(int connfd, char *data, const unsigned dataLength)
@@ -2985,8 +2985,8 @@ static void commandserviceChanged(int connfd, char *data, const unsigned dataLen
dmxEIT.request_pause(); dmxEIT.request_pause();
#ifdef UPDATE_NETWORKS #ifdef UPDATE_NETWORKS
dmxNIT.request_pause(); dmxNIT.request_pause();
#endif
dmxSDT.request_pause(); dmxSDT.request_pause();
#endif
#ifdef ENABLE_PPT #ifdef ENABLE_PPT
dmxPPT.request_pause(); dmxPPT.request_pause();
#endif #endif
@@ -3001,8 +3001,8 @@ static void commandserviceChanged(int connfd, char *data, const unsigned dataLen
dmxEIT.request_unpause(); dmxEIT.request_unpause();
#ifdef UPDATE_NETWORKS #ifdef UPDATE_NETWORKS
dmxNIT.request_unpause(); dmxNIT.request_unpause();
#endif
dmxSDT.request_unpause(); dmxSDT.request_unpause();
#endif
#ifdef ENABLE_PPT #ifdef ENABLE_PPT
dmxPPT.request_unpause(); dmxPPT.request_unpause();
#endif #endif
@@ -4238,6 +4238,7 @@ static void commandSetPrivatePid(int connfd, char *data, const unsigned dataLeng
} }
#endif #endif
#ifdef UPDATE_NETWORKS
static void commandSetSectionsdScanMode(int connfd, char *data, const unsigned dataLength) static void commandSetSectionsdScanMode(int connfd, char *data, const unsigned dataLength)
{ {
if (dataLength != 4) if (dataLength != 4)
@@ -4255,6 +4256,7 @@ static void commandSetSectionsdScanMode(int connfd, char *data, const unsigned d
return ; return ;
} }
#endif
static void commandSetConfig(int connfd, char *data, const unsigned /*dataLength*/) static void commandSetConfig(int connfd, char *data, const unsigned /*dataLength*/)
{ {
@@ -4262,12 +4264,14 @@ static void commandSetConfig(int connfd, char *data, const unsigned /*dataLength
struct sectionsd::commandSetConfig *pmsg; struct sectionsd::commandSetConfig *pmsg;
pmsg = (struct sectionsd::commandSetConfig *)data; pmsg = (struct sectionsd::commandSetConfig *)data;
#ifdef UPDATE_NETWORKS
if (pmsg->scanMode != auto_scanning) { if (pmsg->scanMode != auto_scanning) {
dprintf("new scanMode = %d\n", pmsg->scanMode); dprintf("new scanMode = %d\n", pmsg->scanMode);
writeLockMessaging(); writeLockMessaging();
auto_scanning = pmsg->scanMode; auto_scanning = pmsg->scanMode;
unlockMessaging(); unlockMessaging();
} }
#endif
if (secondsToCache != (long)(pmsg->epg_cache)*24*60L*60L) { if (secondsToCache != (long)(pmsg->epg_cache)*24*60L*60L) {
dprintf("new epg_cache = %d\n", pmsg->epg_cache); dprintf("new epg_cache = %d\n", pmsg->epg_cache);
@@ -4347,8 +4351,8 @@ static void deleteSIexceptEPG()
mySIbouquetsOrderUniqueKey.clear(); mySIbouquetsOrderUniqueKey.clear();
unlockBouquets(); unlockBouquets();
dmxNIT.dropCachedSectionIDs(); dmxNIT.dropCachedSectionIDs();
#endif
dmxSDT.dropCachedSectionIDs(); dmxSDT.dropCachedSectionIDs();
#endif
dmxEIT.dropCachedSectionIDs(); dmxEIT.dropCachedSectionIDs();
} }
@@ -4930,7 +4934,9 @@ static void commandRestart(int connfd, char * /*data*/, const unsigned /*dataLen
for (int i = 3; i < 256; i++) for (int i = 3; i < 256; i++)
close(i); close(i);
*/ */
#ifdef UPDATE_NETWORKS
SETENVI(auto_scanning); SETENVI(auto_scanning);
#endif
SETENVL(secondsToCache); SETENVL(secondsToCache);
SETENVL(oldEventsAre); SETENVL(oldEventsAre);
SETENVL(secondsExtendedTextCache); SETENVL(secondsExtendedTextCache);
@@ -4997,7 +5003,11 @@ static s_cmd_table connectionCommands[sectionsd::numberOfCommands] = {
#else #else
{ commandDummy2, "commandSetPrivatePid" }, { commandDummy2, "commandSetPrivatePid" },
#endif #endif
#ifdef UPDATE_NETWORKS
{ commandSetSectionsdScanMode, "commandSetSectionsdScanMode" }, { commandSetSectionsdScanMode, "commandSetSectionsdScanMode" },
#else
{ commandDummy2, "commandSetSectionsdScanMode" },
#endif
{ commandFreeMemory, "commandFreeMemory" }, { commandFreeMemory, "commandFreeMemory" },
{ commandReadSIfromXML, "commandReadSIfromXML" }, { commandReadSIfromXML, "commandReadSIfromXML" },
{ commandWriteSI2XML, "commandWriteSI2XML" }, { commandWriteSI2XML, "commandWriteSI2XML" },
@@ -6395,7 +6405,7 @@ static int get_bat_slot( t_bouquet_id bouquet_id, int last_section)
} }
return -1; return -1;
} }
#endif //UPDATE_NETWORKS
//--------------------------------------------------------------------- //---------------------------------------------------------------------
// sdt-thread // sdt-thread
// reads sdt for service list // reads sdt for service list
@@ -6409,12 +6419,10 @@ static void *sdtThread(void *)
time_t lastData = 0; time_t lastData = 0;
time_t zeit = 0; time_t zeit = 0;
int rs = 0; int rs = 0;
#ifdef UPDATE_NETWORKS
int i = 0; int i = 0;
int j = 0; int j = 0;
int scanType = 3; //default scan all int scanType = 3; //default scan all
bool bouquet_filtered = false; bool bouquet_filtered = false;
#endif
int is_actual = 0; int is_actual = 0;
dmxSDT.addfilter(0x42, 0xf3 ); //SDT actual = 0x42 + SDT other = 0x46 + BAT = 0x4A dmxSDT.addfilter(0x42, 0xf3 ); //SDT actual = 0x42 + SDT other = 0x46 + BAT = 0x4A
@@ -6431,7 +6439,6 @@ static void *sdtThread(void *)
pthread_exit(NULL); pthread_exit(NULL);
//throw std::bad_alloc(); //throw std::bad_alloc();
} }
#ifdef UPDATE_NETWORKS
for ( i = 0; i < MAX_SDTs; i++) for ( i = 0; i < MAX_SDTs; i++)
messaging_sdt_tid[i] = 0; messaging_sdt_tid[i] = 0;
writeLockMessaging(); writeLockMessaging();
@@ -6443,7 +6450,6 @@ static void *sdtThread(void *)
} }
unlockMessaging(); unlockMessaging();
scanType = getscanType(); scanType = getscanType();
#endif
dmxSDT.start(); // -> unlock dmxSDT.start(); // -> unlock
if (!scanning) if (!scanning)
dmxSDT.request_pause(); dmxSDT.request_pause();
@@ -6481,7 +6487,6 @@ static void *sdtThread(void *)
/* this is the "last" thread. Means: if this one goes to sleep, sectionsd /* this is the "last" thread. Means: if this one goes to sleep, sectionsd
sleeps mostly. Worth printing. */ sleeps mostly. Worth printing. */
printdate_ms(stdout);printf("dmxSDT: going to sleep...\n"); printdate_ms(stdout);printf("dmxSDT: going to sleep...\n");
#ifdef UPDATE_NETWORKS
if ((auto_scanning > 0) && (!startup)) { if ((auto_scanning > 0) && (!startup)) {
if ((auto_scanning == 1) || (auto_scanning == 3)) { if ((auto_scanning == 1) || (auto_scanning == 3)) {
if (updateTP(scanType)) { if (updateTP(scanType)) {
@@ -6510,16 +6515,13 @@ static void *sdtThread(void *)
for ( i = 0; i < MAX_SDTs; i++) for ( i = 0; i < MAX_SDTs; i++)
messaging_sdt_tid[i] = 0; messaging_sdt_tid[i] = 0;
#endif
writeLockMessaging(); writeLockMessaging();
#ifdef UPDATE_NETWORKS
for ( i = 0; i < MAX_BAT; i++) { for ( i = 0; i < MAX_BAT; i++) {
messaging_bat_bouquet_id[i] = 0; messaging_bat_bouquet_id[i] = 0;
messaging_bat_last_section[i] = 0; messaging_bat_last_section[i] = 0;
for ( j= 0; j < MAX_SECTIONS; j++) for ( j= 0; j < MAX_SECTIONS; j++)
messaging_bat_sections_so_far[i][j] = 0; messaging_bat_sections_so_far[i][j] = 0;
} }
#endif
messaging_zap_detected = false; messaging_zap_detected = false;
unlockMessaging(); unlockMessaging();
@@ -6599,16 +6601,13 @@ static void *sdtThread(void *)
dprintf("[sdtThread] added %d services [table 0x%x TID: %08x]\n", dprintf("[sdtThread] added %d services [table 0x%x TID: %08x]\n",
sdt.services().size(), header->table_id, tid); sdt.services().size(), header->table_id, tid);
#ifdef UPDATE_NETWORKS
i = 0; i = 0;
while ((i < MAX_SDTs) && (messaging_sdt_tid[i] != 0) && (messaging_sdt_tid[i] != tid)) while ((i < MAX_SDTs) && (messaging_sdt_tid[i] != 0) && (messaging_sdt_tid[i] != tid))
i++; i++;
if (i < MAX_SDTs) if (i < MAX_SDTs)
messaging_sdt_tid[i] = tid; messaging_sdt_tid[i] = tid;
#endif
} }
} }
#ifdef UPDATE_NETWORKS
else if (header->table_id == 0x4a) { else if (header->table_id == 0x4a) {
t_bouquet_id bid = header->table_id_extension_hi << 8 | header->table_id_extension_lo; t_bouquet_id bid = header->table_id_extension_hi << 8 | header->table_id_extension_lo;
@@ -6657,7 +6656,6 @@ static void *sdtThread(void *)
} }
} }
} }
#endif
} // if } // if
} // for } // for
@@ -6667,6 +6665,7 @@ static void *sdtThread(void *)
pthread_exit(NULL); pthread_exit(NULL);
} }
#endif
//--------------------------------------------------------------------- //---------------------------------------------------------------------
// Time-thread // Time-thread
@@ -8535,9 +8534,9 @@ extern cDemux * dmxUTC;
void sectionsd_main_thread(void */*data*/) void sectionsd_main_thread(void */*data*/)
{ {
pthread_t threadTOT, threadEIT, threadCN, threadSDT, threadHouseKeeping; pthread_t threadTOT, threadEIT, threadCN, threadHouseKeeping;
#ifdef UPDATE_NETWORKS #ifdef UPDATE_NETWORKS
pthread_t threadNIT; pthread_t threadSDT, threadNIT;
#endif #endif
#ifdef ENABLE_FREESATEPG #ifdef ENABLE_FREESATEPG
pthread_t threadFSEIT; pthread_t threadFSEIT;
@@ -8644,7 +8643,6 @@ void sectionsd_main_thread(void */*data*/)
fprintf(stderr, "[sectionsd] failed to create nit-thread (rc=%d)\n", rc); fprintf(stderr, "[sectionsd] failed to create nit-thread (rc=%d)\n", rc);
return; return;
} }
#endif
// SDT-Thread starten // SDT-Thread starten
rc = pthread_create(&threadSDT, 0, sdtThread, 0); rc = pthread_create(&threadSDT, 0, sdtThread, 0);
@@ -8652,6 +8650,7 @@ void sectionsd_main_thread(void */*data*/)
fprintf(stderr, "[sectionsd] failed to create sdt-thread (rc=%d)\n", rc); fprintf(stderr, "[sectionsd] failed to create sdt-thread (rc=%d)\n", rc);
return; return;
} }
#endif
// housekeeping-Thread starten // housekeeping-Thread starten
rc = pthread_create(&threadHouseKeeping, 0, houseKeepingThread, 0); rc = pthread_create(&threadHouseKeeping, 0, houseKeepingThread, 0);
@@ -8720,14 +8719,14 @@ printf("broadcasting...\n");
pthread_cond_broadcast(&dmxPPT.change_cond); pthread_cond_broadcast(&dmxPPT.change_cond);
pthread_mutex_unlock(&dmxPPT.start_stop_mutex); pthread_mutex_unlock(&dmxPPT.start_stop_mutex);
#endif #endif
#ifdef UPDATE_NETWORKS
pthread_mutex_lock(&dmxSDT.start_stop_mutex); pthread_mutex_lock(&dmxSDT.start_stop_mutex);
pthread_cond_broadcast(&dmxSDT.change_cond); pthread_cond_broadcast(&dmxSDT.change_cond);
pthread_mutex_unlock(&dmxSDT.start_stop_mutex); pthread_mutex_unlock(&dmxSDT.start_stop_mutex);
#endif
printf("pausing...\n"); printf("pausing...\n");
dmxEIT.request_pause(); dmxEIT.request_pause();
dmxCN.request_pause(); dmxCN.request_pause();
dmxSDT.request_pause();
#ifdef ENABLE_PPT #ifdef ENABLE_PPT
dmxPPT.request_pause(); dmxPPT.request_pause();
#endif #endif
@@ -8735,6 +8734,7 @@ printf("pausing...\n");
dmxFSEIT.request_pause(); dmxFSEIT.request_pause();
#endif #endif
#ifdef UPDATE_NETWORKS #ifdef UPDATE_NETWORKS
dmxSDT.request_pause();
dmxNIT.request_pause(); dmxNIT.request_pause();
#endif #endif
pthread_cancel(threadHouseKeeping); pthread_cancel(threadHouseKeeping);
@@ -8754,8 +8754,10 @@ printf("join 3\n");
printf("join 3\n"); printf("join 3\n");
pthread_join(threadPPT, NULL); pthread_join(threadPPT, NULL);
#endif #endif
#ifdef UPDATE_NETWORKS
printf("join 4\n"); printf("join 4\n");
pthread_join(threadSDT, NULL); pthread_join(threadSDT, NULL);
#endif
eit_stop_update_filter(&eit_update_fd); eit_stop_update_filter(&eit_update_fd);
if(eitDmx) if(eitDmx)
@@ -8763,8 +8765,6 @@ printf("join 4\n");
printf("close 1\n"); printf("close 1\n");
dmxEIT.close(); dmxEIT.close();
printf("close 2\n");
dmxSDT.close();
printf("close 3\n"); printf("close 3\n");
dmxCN.close(); dmxCN.close();
#ifdef ENABLE_FREESATEPG #ifdef ENABLE_FREESATEPG
@@ -8774,6 +8774,7 @@ printf("close 3\n");
dmxPPT.close(); dmxPPT.close();
#endif #endif
#ifdef UPDATE_NETWORKS #ifdef UPDATE_NETWORKS
dmxSDT.close();
dmxNIT.close(); dmxNIT.close();
#endif #endif