X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/cb205396ae920ef813764de92bf5b686bb9d80f1..494697a00628cf277bd00b85967efbbe61f4fcee:/lib/base/filepush.cpp

diff --git a/lib/base/filepush.cpp b/lib/base/filepush.cpp
index b85edbc1..73dc5190 100644
--- a/lib/base/filepush.cpp
+++ b/lib/base/filepush.cpp
@@ -1,11 +1,13 @@
+#include <config.h>
 #include <lib/base/filepush.h>
 #include <lib/base/eerror.h>
 #include <errno.h>
+#include <fcntl.h>
 
 eFilePushThread::eFilePushThread()
 {
 	m_stop = 0;
-	m_buf_start = m_buf_end = 0;
+	flush();
 }
 
 static void signal_handler(int x)
@@ -14,6 +16,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 +26,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 +35,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,7 +43,12 @@ void eFilePushThread::thread()
 				eDebug("eFilePushThread *write error* - not yet handled");
 				// ... we would stop the thread
 			}
-			printf("FILEPUSH: wrote %d bytes\n", w);
+
+				/* 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;
 		}
@@ -53,7 +63,17 @@ void eFilePushThread::thread()
 				continue;
 			eDebug("eFilePushThread *read error* - not yet handled");
 		}
-		printf("FILEPUSH: read %d bytes\n", m_buf_end);
+		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);
 	}
 	
 	eDebug("FILEPUSH THREAD STOP");
@@ -63,8 +83,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()
@@ -73,3 +92,25 @@ void eFilePushThread::stop()
 	sendSignal(SIGUSR1);
 	kill();
 }
+
+void eFilePushThread::pause()
+{
+	stop();
+}
+
+void eFilePushThread::seek(int whence, off_t where)
+{
+	::lseek(m_fd_source, where, whence);
+}
+
+void eFilePushThread::resume()
+{
+	m_stop = 0;
+	run();
+}
+
+void eFilePushThread::flush()
+{
+	m_buf_start = m_buf_end = 0;
+}
+