utf8 changes

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

diff --git a/lib/base/filepush.cpp b/lib/base/filepush.cpp
index d873d2b3fe5191b4c61f5f9e909467b4fc25e54f..17b767f837561f27bf9db000263c5f3ad97a5e4b 100644 (file)
--- a/lib/base/filepush.cpp
+++ b/lib/base/filepush.cpp
@@ -1,6 +1,7 @@
 #include <lib/base/filepush.h>
 #include <lib/base/eerror.h>
 #include <errno.h>
+#include <fcntl.h>
 
 eFilePushThread::eFilePushThread()
 {
@@ -14,6 +15,7 @@ static void signal_handler(int x)
 
 void eFilePushThread::thread()
 {
+       off_t dest_pos = 0;
        eDebug("FILEPUSH THREAD START");
                // this is a race. FIXME.
        
@@ -23,6 +25,7 @@ void eFilePushThread::thread()
        act.sa_flags = 0;
        sigaction(SIGUSR1, &act, 0);
        
+       dest_pos = lseek(m_fd_dest, 0, SEEK_CUR);
                /* m_stop must be evaluated after each syscall. */
        while (!m_stop)
        {
@@ -31,6 +34,7 @@ void eFilePushThread::thread()
                {
                                // TODO: take care of boundaries.
                        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)
@@ -38,6 +42,11 @@ void eFilePushThread::thread()
                                eDebug("eFilePushThread *write error* - not yet handled");
                                // ... 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;
 //                     printf("FILEPUSH: wrote %d bytes\n", w);
                        m_buf_start += w;
                        continue;
@@ -56,6 +65,11 @@ void eFilePushThread::thread()
                if (m_buf_end == 0)
                {
                        eDebug("FILEPUSH: end-of-file! (currently unhandled)");
+                       if (!lseek(m_fd_source, 0, SEEK_SET))
+                       {
+                               eDebug("(looping)");
+                               continue;
+                       }
                        break;
                }
 //             printf("FILEPUSH: read %d bytes\n", m_buf_end);
@@ -68,8 +82,7 @@ void eFilePushThread::start(int fd_source, int fd_dest)
 {
        m_fd_source = fd_source;
        m_fd_dest = fd_dest;
-       m_stop = 0;
-       run();
+       resume();
 }
 
 void eFilePushThread::stop()
@@ -78,3 +91,19 @@ void eFilePushThread::stop()
        sendSignal(SIGUSR1);
        kill();
 }
+
+void eFilePushThread::pause()
+{
+       stop();
+}
+
+void eFilePushThread::seek(off_t where)
+{
+       ::lseek(m_fd_source, where, SEEK_SET);
+}
+
+void eFilePushThread::resume()
+{
+       m_stop = 0;
+       run();
+}