check format strings on eDebug-style functions

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

diff --git a/lib/base/filepush.cpp b/lib/base/filepush.cpp
index 7ab8c0d375856166b6e904b9bd10b349acb8e597..ce33d04f9b4692b483c1c3ee3cc8e2f6cca875ba 100644 (file)
--- a/lib/base/filepush.cpp
+++ b/lib/base/filepush.cpp
@@ -1,13 +1,17 @@
-#include <config.h>
 #include <lib/base/filepush.h>
 #include <lib/base/eerror.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <sys/ioctl.h>
+
+#define PVR_COMMIT 1
 
 eFilePushThread::eFilePushThread(): m_messagepump(eApp, 0)
 {
        m_stop = 0;
+       m_sg = 0;
        flush();
+       enablePVRCommit(0);
        CONNECT(m_messagepump.recv_msg, eFilePushThread::recvEvent);
 }
 
@@ -18,6 +22,12 @@ static void signal_handler(int x)
 void eFilePushThread::thread()
 {
        off_t dest_pos = 0;
+       size_t bytes_read = 0;
+       
+       off_t current_span_offset;
+       size_t current_span_remaining = 0;
+       
+       int already_empty = 0;
        eDebug("FILEPUSH THREAD START");
                // this is a race. FIXME.
        
@@ -53,10 +63,29 @@ void eFilePushThread::thread()
                        m_buf_start += w;
                        continue;
                }
-                       
+
                        /* now fill our buffer. */
+                       
+               if (m_sg && !current_span_remaining)
+               {
+                       m_sg->getNextSourceSpan(bytes_read, current_span_offset, current_span_remaining);
+                       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);
+
+               bytes_read += m_buf_end;
+
                if (m_buf_end < 0)
                {
                        m_buf_end = 0;
@@ -66,8 +95,18 @@ void eFilePushThread::thread()
                }
                if (m_buf_end == 0)
                {
+                               /* on EOF, try COMMITting once. */
+                       if (m_send_pvr_commit && !already_empty)
+                       {
+                               eDebug("sending PVR commit");
+                               already_empty = 1;
+                               if (::ioctl(m_fd_dest, PVR_COMMIT) == EINTR)
+                                       continue;
+                               eDebug("commit done");
+                                               /* well check again */
+                               continue;
+                       }
                        sendEvent(evtEOF);
-
 #if 0
                        eDebug("FILEPUSH: end-of-file! (currently unhandled)");
                        if (!lseek(m_fd_source, 0, SEEK_SET))
@@ -77,7 +116,8 @@ void eFilePushThread::thread()
                        }
 #endif
                        break;
-               }
+               } else
+                       already_empty = 0;
 //             printf("FILEPUSH: read %d bytes\n", m_buf_end);
        }
        
@@ -93,6 +133,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();
@@ -119,6 +161,10 @@ void eFilePushThread::flush()
        m_buf_start = m_buf_end = 0;
 }
 
+void eFilePushThread::enablePVRCommit(int s)
+{
+       m_send_pvr_commit = s;
+}
 
 void eFilePushThread::sendEvent(int evt)
 {