follow eThread changes: mainly thread_running -> sync, hasStarted()

[enigma2.git] / lib / base / filepush.cpp

diff --git a/lib/base/filepush.cpp b/lib/base/filepush.cpp
index bbce531dd56f1a03e2d7fa669193f7a7938e81bb..d12b8efafa6b14387fd5182d00f2cb10b8599f35 100644 (file)
--- a/lib/base/filepush.cpp
+++ b/lib/base/filepush.cpp
@@ -31,7 +31,14 @@ void eFilePushThread::thread()
        
        int already_empty = 0;
        eDebug("FILEPUSH THREAD START");
-               // this is a race. FIXME.
+       
+               /* we set the signal to not restart syscalls, so we can detect our signal. */
+       struct sigaction act;
+       act.sa_handler = signal_handler; // no, SIG_IGN doesn't do it. we want to receive the -EINTR
+       act.sa_flags = 0;
+       sigaction(SIGUSR1, &act, 0);
+       
+       hasStarted();
        
        dest_pos = lseek(m_fd_dest, 0, SEEK_CUR);
        source_pos = m_raw_source.lseek(0, SEEK_CUR);
@@ -158,25 +165,12 @@ int eFilePushThread::start(const char *filename, int fd_dest)
        return 0;
 }
 
-void eFilePushThread::installSigUSR1Handler()
-{
-               /* we set the signal to not restart syscalls, so we can detect our signal. */
-       struct sigaction act;
-       act.sa_handler = signal_handler; // no, SIG_IGN doesn't do it. we want to receive the -EINTR
-       act.sa_flags = 0;
-       sigaction(SIGUSR1, &act, 0);
-}
-
-// called from thread before alive is set to 1
-void eFilePushThread::before_set_thread_alive()
-{
-       installSigUSR1Handler();
-}
-
 void eFilePushThread::stop()
 {
-       if (!thread_running()) /* FIXME: races */
+               /* if we aren't running, don't bother stopping. */
+       if (!sync())
                return;
+
        m_stop = 1;
        sendSignal(SIGUSR1);
        kill();