mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

driver/streamts.cpp: optimize poll timeout, cancel thread on stop

Browse Source
This commit is contained in:
[CST] Focus
2014-03-27 18:46:49 +04:00
parent a3e8142fae
commit b96a7d43a6
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/driver/streamts.cpp
View File

@@ -247,7 +247,10 @@ bool CStreamManager::Stop()
if (!running) if (!running)
return false; return false;
running = false; running = false;
return (OpenThreads::Thread::join() == 0); cancel();
bool ret = (OpenThreads::Thread::join() == 0);
StopAll();
return ret;
} }
bool CStreamManager::SetPort(int newport) bool CStreamManager::SetPort(int newport)
@@ -524,6 +527,7 @@ void CStreamManager::run()
struct pollfd pfd[128]; struct pollfd pfd[128];
int poll_cnt; int poll_cnt;
int poll_timeout = -1;
printf("Starting STREAM thread keeper, tid %ld\n", syscall(__NR_gettid)); printf("Starting STREAM thread keeper, tid %ld\n", syscall(__NR_gettid));
@@ -544,7 +548,7 @@ void CStreamManager::run()
} }
mutex.unlock(); mutex.unlock();
//printf("polling, count= %d\n", poll_cnt); //printf("polling, count= %d\n", poll_cnt);
int pollres = poll (pfd, poll_cnt, 10000); int pollres = poll (pfd, poll_cnt, poll_timeout);
if (pollres <= 0) { if (pollres <= 0) {
if (pollres < 0) if (pollres < 0)
perror("CStreamManager::run(): poll"); perror("CStreamManager::run(): poll");
@@ -565,12 +569,15 @@ void CStreamManager::run()
close(connfd); close(connfd);
#endif #endif
g_RCInput->postMsg(NeutrinoMessages::EVT_STREAM_START, connfd); g_RCInput->postMsg(NeutrinoMessages::EVT_STREAM_START, connfd);
poll_timeout = 1000;
} else { } else {
if (pfd[i].revents & (POLLHUP | POLLRDHUP)) { if (pfd[i].revents & (POLLHUP | POLLRDHUP)) {
printf("CStreamManager::run(): POLLHUP, fd %d\n", pfd[i].fd); printf("CStreamManager::run(): POLLHUP, fd %d\n", pfd[i].fd);
RemoveClient(pfd[i].fd); RemoveClient(pfd[i].fd);
if (streams.empty()) if (streams.empty()) {
poll_timeout = -1;
g_RCInput->postMsg(NeutrinoMessages::EVT_STREAM_STOP, 0); g_RCInput->postMsg(NeutrinoMessages::EVT_STREAM_STOP, 0);
}
} }
} }
} }