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

neutrino: speed up shutdown

Browse Source 
streamts and sectionsd can take some time to shutdown, so trigger
them first

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@138 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 19d0d38daa
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2010-01-03 (Sun, 03 Jan 2010)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2010-01-03 14:48:36 +00:00
parent 483f0c285f
commit 1fdec6df64
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/neutrino.cpp
View File

@@ -4429,6 +4429,8 @@ bool CNeutrinoApp::changeNotify(const neutrino_locale_t OptionName, void */*data
**************************************************************************************/ **************************************************************************************/
void stop_daemons(bool stopall) void stop_daemons(bool stopall)
{ {
streamts_stop = 1;
sectionsd_stop = 1;
dvbsub_close(); dvbsub_close();
tuxtxt_stop(); tuxtxt_stop();
tuxtxt_close(); tuxtxt_close();
@@ -4437,9 +4439,7 @@ void stop_daemons(bool stopall)
pthread_cancel(nhttpd_thread); pthread_cancel(nhttpd_thread);
pthread_join(nhttpd_thread, NULL); pthread_join(nhttpd_thread, NULL);
printf("httpd shutdown done\n"); printf("httpd shutdown done\n");
streamts_stop = 1;
pthread_join(stream_thread, NULL); pthread_join(stream_thread, NULL);
sectionsd_stop = 1;
if(stopall) { if(stopall) {
printf("timerd shutdown\n"); printf("timerd shutdown\n");
g_Timerd->shutdown(); g_Timerd->shutdown();