fix SG, add user events

diff --git a/lib/base/filepush.cpp b/lib/base/filepush.cpp
index ce33d04..a955e10 100644 (file)
--- a/lib/base/filepush.cpp
+++ b/lib/base/filepush.cpp
@@ -21,10 +21,10 @@ 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;
        
        int already_empty = 0;
@@ -38,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)
        {
@@ -51,7 +53,7 @@ void eFilePushThread::thread()
                        {
                                if (errno == -EINTR)
                                        continue;
-                               eDebug("eFilePushThread *write error* (%m) - not yet handled");
+                               break;
                                // ... we would stop the thread
                        }
 
@@ -68,14 +70,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;
@@ -84,8 +89,6 @@ 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;
@@ -117,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);
        }
        
@@ -166,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);

diff --git a/lib/base/filepush.h b/lib/base/filepush.h
index a536df1..f47d8e9 100644 (file)
--- a/lib/base/filepush.h
+++ b/lib/base/filepush.h
@@ -9,8 +9,8 @@
 class iFilePushScatterGather
 {
 public:
+       virtual void getNextSourceSpan(off_t current_offset, size_t bytes_read, off_t &start, size_t &size)=0;
        virtual ~iFilePushScatterGather() {}
-       virtual void getNextSourceSpan(size_t bytes_read, off_t &start, size_t &size)=0;
 };
 
 class eFilePushThread: public eThread, public Object
@@ -29,11 +29,13 @@ public:
        void flush();
        void enablePVRCommit(int);
        
-       void setSG(iFilePushScatterGather *);
+       void setScatterGather(iFilePushScatterGather *);
        
-       enum { evtEOF, evtReadError, evtWriteError };
+       enum { evtEOF, evtReadError, evtWriteError, evtUser };
        Signal1<void,int> m_event;
-       
+
+               /* you can send private events if you want */
+       void sendEvent(int evt);
 private:
        iFilePushScatterGather *m_sg;
        int m_stop;
@@ -44,7 +46,6 @@ private:
        
        eFixedMessagePump<int> m_messagepump;
        
-       void sendEvent(int evt);
        void recvEvent(const int &evt);
 };