X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/fa664bead71329a67c53bc1814a3d68d397045d1..7af17e298fb338d477f2d93ab230e395c656ea9f:/lib/base/filepush.cpp

diff --git a/lib/base/filepush.cpp b/lib/base/filepush.cpp
index 7f85eac2..3412c84a 100644
--- a/lib/base/filepush.cpp
+++ b/lib/base/filepush.cpp
@@ -6,7 +6,7 @@
 
 #define PVR_COMMIT 1
 
-FILE *f = fopen("/log.ts", "wb");
+//FILE *f = fopen("/log.ts", "wb");
 
 eFilePushThread::eFilePushThread(int io_prio_class, int io_prio_level, int blocksize)
 	:prio_class(io_prio_class), prio(io_prio_level), m_messagepump(eApp, 0)
@@ -105,11 +105,11 @@ void eFilePushThread::thread()
 				   absolutely forbidden is to return EINTR and consume a non-aligned number of bytes. 
 				*/
 			int w = write(m_fd_dest, m_buffer + m_buf_start, m_buf_end - m_buf_start);
-			fwrite(m_buffer + m_buf_start, 1, m_buf_end - m_buf_start, f);
+//			fwrite(m_buffer + m_buf_start, 1, m_buf_end - m_buf_start, f);
 //			eDebug("wrote %d bytes", w);
 			if (w <= 0)
 			{
-				if (errno == EINTR)
+				if (errno == EINTR || errno == EAGAIN || errno == EBUSY)
 					continue;
 				eDebug("eFilePushThread WRITE ERROR");
 				sendEvent(evtWriteError);
@@ -165,7 +165,7 @@ void eFilePushThread::thread()
 		if (m_buf_end < 0)
 		{
 			m_buf_end = 0;
-			if (errno == EINTR)
+			if (errno == EINTR || errno == EBUSY || errno == EAGAIN)
 				continue;
 			if (errno == EOVERFLOW)
 			{
@@ -174,15 +174,30 @@ void eFilePushThread::thread()
 			}
 			eDebug("eFilePushThread *read error* (%m) - not yet handled");
 		}
+
+			/* a read might be mis-aligned in case of a short read. */
+		int d = m_buf_end % m_blocksize;
+		if (d)
+		{
+			m_raw_source.lseek(-d, SEEK_CUR);
+			m_buf_end -= d;
+		}
+
 		if (m_buf_end == 0)
 		{
 				/* on EOF, try COMMITting once. */
 			if (m_send_pvr_commit && !already_empty)
 			{
 				eDebug("sending PVR commit");
+				
+				struct pollfd pfd;
+				pfd.fd = m_fd_dest;
+				pfd.events = POLLIN;
+				poll(&pfd, 1, 10000);
+				sleep(5); /* HACK to allow ES buffer to drain */
 				already_empty = 1;
-				if (::ioctl(m_fd_dest, PVR_COMMIT) < 0 && errno == EINTR)
-					continue;
+//				if (::ioctl(m_fd_dest, PVR_COMMIT) < 0 && errno == EINTR)
+//					continue;
 				eDebug("commit done");
 						/* well check again */
 				continue;
@@ -248,15 +263,9 @@ void eFilePushThread::stop()
 
 	m_stop = 1;
 
-	// fixmee.. here we need a better solution to ensure
-	// that the thread context take notice of the signal
-	// even when no syscall is in progress
-	while(!sendSignal(SIGUSR1))
-	{
-		eDebug("send SIGUSR1 to thread context");
-		usleep(5000); // wait msek
-	}
-	kill();
+	eDebug("stopping thread."); /* just do it ONCE. it won't help to do this more than once. */
+	sendSignal(SIGUSR1);
+	kill(0);
 }
 
 void eFilePushThread::pause()