make filterRecordData argument unsigned char*

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

diff --git a/lib/base/filepush.cpp b/lib/base/filepush.cpp
index b99896fc978a8edc0a9310037cd14711a0501536..51b262395633f64954a8f50f2a0bf755a5830504 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>
@@ -22,12 +21,14 @@ 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;
+       off_t current_span_offset = 0;
        size_t current_span_remaining = 0;
        
+       size_t written_since_last_sync = 0;
+       
        int already_empty = 0;
        eDebug("FILEPUSH THREAD START");
                // this is a race. FIXME.
@@ -39,6 +40,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)
        {
@@ -46,20 +49,29 @@ void eFilePushThread::thread()
                if (m_buf_start != m_buf_end)
                {
                                // TODO: take care of boundaries.
+                       filterRecordData(m_buffer + m_buf_start, m_buf_end - m_buf_start);
                        int w = write(m_fd_dest, m_buffer + m_buf_start, m_buf_end - m_buf_start);
 //                     eDebug("wrote %d bytes", w);
                        if (w <= 0)
                        {
                                if (errno == -EINTR)
                                        continue;
-                               eDebug("eFilePushThread *write error* (%m) - not yet handled");
+                               break;
                                // ... we would stop the thread
                        }
 
                                /* this should flush all written pages to disk. */
                        posix_fadvise(m_fd_dest, dest_pos, w, POSIX_FADV_DONTNEED);
-
+                       
                        dest_pos += w;
+                       written_since_last_sync += w;
+                       
+                       if (written_since_last_sync >= 512*1024)
+                       {
+                               fdatasync(m_fd_dest);
+                               written_since_last_sync = 0;
+                       }
+
 //                     printf("FILEPUSH: wrote %d bytes\n", w);
                        m_buf_start += w;
                        continue;
@@ -69,14 +81,17 @@ void eFilePushThread::thread()
                        
                if (m_sg && !current_span_remaining)
                {
-                       m_sg->getNextSourceSpan(bytes_read, current_span_offset, 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)
+               if (m_sg && maxread > current_span_remaining)
                        maxread = current_span_remaining;
 
                m_buf_start = 0;
@@ -85,14 +100,17 @@ void eFilePushThread::thread()
                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;
                        if (errno == EINTR)
                                continue;
-                       eDebug("eFilePushThread *read error* - not yet handled");
+                       if (errno == EOVERFLOW)
+                       {
+                               eWarning("OVERFLOW while recording");
+                               continue;
+                       }
+                       eDebug("eFilePushThread *read error* (%m) - not yet handled");
                }
                if (m_buf_end == 0)
                {
@@ -118,7 +136,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);
        }
        
@@ -167,6 +191,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);
@@ -176,3 +205,9 @@ void eFilePushThread::recvEvent(const int &evt)
 {
        m_event(evt);
 }
+
+void eFilePushThread::filterRecordData(const unsigned char *data, int len)
+{
+       /* do nothing */
+}
+