fix timer skip

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

diff --git a/lib/base/filepush.cpp b/lib/base/filepush.cpp
index 39319a2477b056003b2729155890d40519ac44e2..a955e10b20e952f239d00690f6dcb3dded9208fc 100644 (file)
--- a/lib/base/filepush.cpp
+++ b/lib/base/filepush.cpp
@@ -1,4 +1,3 @@
-#include <config.h>
 #include <lib/base/filepush.h>
 #include <lib/base/eerror.h>
 #include <errno.h>
@@ -10,6 +9,7 @@
 eFilePushThread::eFilePushThread(): m_messagepump(eApp, 0)
 {
        m_stop = 0;
+       m_sg = 0;
        flush();
        enablePVRCommit(0);
        CONNECT(m_messagepump.recv_msg, eFilePushThread::recvEvent);
@@ -21,7 +21,11 @@ static void signal_handler(int x)
 
 void eFilePushThread::thread()
 {
-       off_t dest_pos = 0;
+       off_t dest_pos = 0, source_pos = 0;
+       size_t bytes_read = 0;
+       
+       off_t current_span_offset = 0;
+       size_t current_span_remaining = 0;
        
        int already_empty = 0;
        eDebug("FILEPUSH THREAD START");
@@ -34,6 +38,8 @@ void eFilePushThread::thread()
        sigaction(SIGUSR1, &act, 0);
        
        dest_pos = lseek(m_fd_dest, 0, SEEK_CUR);
+       source_pos = lseek(m_fd_source, 0, SEEK_CUR);
+       
                /* m_stop must be evaluated after each syscall. */
        while (!m_stop)
        {
@@ -47,7 +53,7 @@ void eFilePushThread::thread()
                        {
                                if (errno == -EINTR)
                                        continue;
-                               eDebug("eFilePushThread *write error* (%m) - not yet handled");
+                               break;
                                // ... we would stop the thread
                        }
 
@@ -59,10 +65,30 @@ void eFilePushThread::thread()
                        m_buf_start += w;
                        continue;
                }
-                       
+
                        /* now fill our buffer. */
+                       
+               if (m_sg && !current_span_remaining)
+               {
+                       m_sg->getNextSourceSpan(source_pos, bytes_read, current_span_offset, current_span_remaining);
+
+                       if (source_pos != current_span_offset)
+                               source_pos = lseek(m_fd_source, current_span_offset, SEEK_SET);
+                       bytes_read = 0;
+               }
+               
+               size_t maxread = sizeof(m_buffer);
+               
+                       /* if we have a source span, don't read past the end */
+               if (m_sg && maxread > current_span_remaining)
+                       maxread = current_span_remaining;
+
                m_buf_start = 0;
-               m_buf_end = read(m_fd_source, m_buffer, sizeof(m_buffer));
+               m_buf_end = 0;
+               
+               if (maxread)
+                       m_buf_end = read(m_fd_source, m_buffer, maxread);
+
                if (m_buf_end < 0)
                {
                        m_buf_end = 0;
@@ -84,7 +110,6 @@ void eFilePushThread::thread()
                                continue;
                        }
                        sendEvent(evtEOF);
-
 #if 0
                        eDebug("FILEPUSH: end-of-file! (currently unhandled)");
                        if (!lseek(m_fd_source, 0, SEEK_SET))
@@ -95,7 +120,13 @@ void eFilePushThread::thread()
 #endif
                        break;
                } else
+               {
+                       source_pos += m_buf_end;
+                       bytes_read += m_buf_end;
+                       if (m_sg)
+                               current_span_remaining -= m_buf_end;
                        already_empty = 0;
+               }
 //             printf("FILEPUSH: read %d bytes\n", m_buf_end);
        }
        
@@ -111,6 +142,8 @@ void eFilePushThread::start(int fd_source, int fd_dest)
 
 void eFilePushThread::stop()
 {
+       if (!thread_running()) /* FIXME: races */
+               return;
        m_stop = 1;
        sendSignal(SIGUSR1);
        kill();
@@ -142,6 +175,11 @@ void eFilePushThread::enablePVRCommit(int s)
        m_send_pvr_commit = s;
 }
 
+void eFilePushThread::setScatterGather(iFilePushScatterGather *sg)
+{
+       m_sg = sg;
+}
+
 void eFilePushThread::sendEvent(int evt)
 {
        m_messagepump.send(evt);