git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update serbian and slovakian translation
[enigma2.git]
/
lib
/
base
/
filepush.cpp
diff --git
a/lib/base/filepush.cpp
b/lib/base/filepush.cpp
index b81aec5c8929133a325173f9f01c0161104ac0bd..3412c84a3a0744f8994296172cdf0973ec9cebd8 100644
(file)
--- a/
lib/base/filepush.cpp
+++ b/
lib/base/filepush.cpp
@@
-190,8
+190,10
@@
void eFilePushThread::thread()
{
eDebug("sending PVR commit");
{
eDebug("sending PVR commit");
- struct pollfd pfd[1] = {m_fd_dest, POLLHUP};
- poll(pfd, 1, 10000);
+ struct pollfd pfd;
+ pfd.fd = m_fd_dest;
+ pfd.events = POLLIN;
+ poll(&pfd, 1, 10000);
sleep(5); /* HACK to allow ES buffer to drain */
already_empty = 1;
// if (::ioctl(m_fd_dest, PVR_COMMIT) < 0 && errno == EINTR)
sleep(5); /* HACK to allow ES buffer to drain */
already_empty = 1;
// if (::ioctl(m_fd_dest, PVR_COMMIT) < 0 && errno == EINTR)
@@
-261,10
+263,7
@@
void eFilePushThread::stop()
m_stop = 1;
m_stop = 1;
- // fixmee.. here we need a better solution to ensure
- // that the thread context take notice of the signal
- // even when no syscall is in progress
- eDebug("if enigma hangs here, the filepush thread is non-responsive. FIX THAT DAMN THREAD.");
+ eDebug("stopping thread."); /* just do it ONCE. it won't help to do this more than once. */
sendSignal(SIGUSR1);
kill(0);
}
sendSignal(SIGUSR1);
kill(0);
}