X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6d2e4a11c8c6ac882edfaee16fe9036955150ad0..ad2bab318ec1271ae520606259c962382a519f0d:/lib/base/filepush.cpp

diff --git a/lib/base/filepush.cpp b/lib/base/filepush.cpp
index ee83f142..b99896fc 100644
--- a/lib/base/filepush.cpp
+++ b/lib/base/filepush.cpp
@@ -3,11 +3,17 @@
 #include <lib/base/eerror.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <sys/ioctl.h>
 
-eFilePushThread::eFilePushThread()
+#define PVR_COMMIT 1
+
+eFilePushThread::eFilePushThread(): m_messagepump(eApp, 0)
 {
 	m_stop = 0;
-	m_buf_start = m_buf_end = 0;
+	m_sg = 0;
+	flush();
+	enablePVRCommit(0);
+	CONNECT(m_messagepump.recv_msg, eFilePushThread::recvEvent);
 }
 
 static void signal_handler(int x)
@@ -17,6 +23,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.
 	
@@ -35,12 +47,12 @@ 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);
+//			eDebug("wrote %d bytes", w);
 			if (w <= 0)
 			{
 				if (errno == -EINTR)
 					continue;
-				eDebug("eFilePushThread *write error* - not yet handled");
+				eDebug("eFilePushThread *write error* (%m) - not yet handled");
 				// ... we would stop the thread
 			}
 
@@ -52,10 +64,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;
@@ -65,14 +96,29 @@ 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))
 			{
 				eDebug("(looping)");
 				continue;
 			}
+#endif
 			break;
-		}
+		} else
+			already_empty = 0;
 //		printf("FILEPUSH: read %d bytes\n", m_buf_end);
 	}
 	
@@ -88,6 +134,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();
@@ -108,3 +156,23 @@ void eFilePushThread::resume()
 	m_stop = 0;
 	run();
 }
+
+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)
+{
+	m_messagepump.send(evt);
+}
+
+void eFilePushThread::recvEvent(const int &evt)
+{
+	m_event(evt);
+}