filepush: do not loop anymore on eof, but signal an event

diff --git a/lib/base/filepush.cpp b/lib/base/filepush.cpp
index cb22ea1b0999abb266f1600a2d8eea51eb90ff4e..7ab8c0d375856166b6e904b9bd10b349acb8e597 100644 (file)
--- a/lib/base/filepush.cpp
+++ b/lib/base/filepush.cpp
@@ -4,10 +4,11 @@
 #include <errno.h>
 #include <fcntl.h>
 
-eFilePushThread::eFilePushThread()
+eFilePushThread::eFilePushThread(): m_messagepump(eApp, 0)
 {
        m_stop = 0;
        flush();
+       CONNECT(m_messagepump.recv_msg, eFilePushThread::recvEvent);
 }
 
 static void signal_handler(int x)
@@ -65,12 +66,16 @@ void eFilePushThread::thread()
                }
                if (m_buf_end == 0)
                {
+                       sendEvent(evtEOF);
+
+#if 0
                        eDebug("FILEPUSH: end-of-file! (currently unhandled)");
                        if (!lseek(m_fd_source, 0, SEEK_SET))
                        {
                                eDebug("(looping)");
                                continue;
                        }
+#endif
                        break;
                }
 //             printf("FILEPUSH: read %d bytes\n", m_buf_end);
@@ -114,3 +119,13 @@ void eFilePushThread::flush()
        m_buf_start = m_buf_end = 0;
 }
 
+
+void eFilePushThread::sendEvent(int evt)
+{
+       m_messagepump.send(evt);
+}
+
+void eFilePushThread::recvEvent(const int &evt)
+{
+       m_event(evt);
+}

diff --git a/lib/base/filepush.h b/lib/base/filepush.h
index a419d7190e4f97305cca4f0e671e412248e1cd92..7eb79974e7ea3594486739e7195b24ca72abbcf2 100644 (file)
--- a/lib/base/filepush.h
+++ b/lib/base/filepush.h
@@ -2,9 +2,11 @@
 #define __lib_base_filepush_h
 
 #include <lib/base/thread.h>
+#include <libsig_comp.h>
+#include <lib/base/message.h>
 #include <sys/types.h>
 
-class eFilePushThread: public eThread
+class eFilePushThread: public eThread, public Object
 {
 public:
        eFilePushThread();
@@ -19,11 +21,19 @@ public:
                /* flushes the internal readbuffer */ 
        void flush();
        
+       enum { evtEOF, evtReadError, evtWriteError };
+       Signal1<void,int> m_event;
+       
 private:
        int m_stop;
        unsigned char m_buffer[65536];
        int m_buf_start, m_buf_end;
        int m_fd_source, m_fd_dest;
+       
+       eFixedMessagePump<int> m_messagepump;
+       
+       void sendEvent(int evt);
+       void recvEvent(const int &evt);
 };
 
 #endif