eDebug("FILEPUSH THREAD START");
// this is a race. FIXME.
- /* we set the signal to not restart syscalls, so we can detect our signal. */
- struct sigaction act;
- act.sa_handler = signal_handler; // no, SIG_IGN doesn't do it. we want to receive the -EINTR
- act.sa_flags = 0;
- sigaction(SIGUSR1, &act, 0);
-
dest_pos = lseek(m_fd_dest, 0, SEEK_CUR);
- source_pos = lseek(m_fd_source, 0, SEEK_CUR);
+ source_pos = m_raw_source.lseek(0, SEEK_CUR);
/* m_stop must be evaluated after each syscall. */
while (!m_stop)
// eDebug("wrote %d bytes", w);
if (w <= 0)
{
- if (errno == -EINTR)
+ if (errno == EINTR)
continue;
break;
// ... we would stop the thread
}
- /* this should flush all written pages to disk. */
- posix_fadvise(m_fd_dest, dest_pos, w, POSIX_FADV_DONTNEED);
-
+// posix_fadvise(m_fd_dest, dest_pos, w, POSIX_FADV_DONTNEED);
+
dest_pos += w;
written_since_last_sync += w;
- if (written_since_last_sync >= 512*1024)
+ if (written_since_last_sync >= 2048*1024)
{
fdatasync(m_fd_dest);
written_since_last_sync = 0;
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);
+ source_pos = m_raw_source.lseek(current_span_offset, SEEK_SET);
bytes_read = 0;
}
m_buf_end = 0;
if (maxread)
- m_buf_end = read(m_fd_source, m_buffer, maxread);
+ m_buf_end = m_raw_source.read(m_buffer, maxread);
if (m_buf_end < 0)
{
{
eDebug("sending PVR commit");
already_empty = 1;
- if (::ioctl(m_fd_dest, PVR_COMMIT) == EINTR)
+ if (::ioctl(m_fd_dest, PVR_COMMIT) < 0 && errno == EINTR)
continue;
eDebug("commit done");
/* well check again */
sendEvent(evtEOF);
#if 0
eDebug("FILEPUSH: end-of-file! (currently unhandled)");
- if (!lseek(m_fd_source, 0, SEEK_SET))
+ if (!m_raw_source.lseek(0, SEEK_SET))
{
eDebug("(looping)");
continue;
void eFilePushThread::start(int fd_source, int fd_dest)
{
- m_fd_source = fd_source;
+ m_raw_source.setfd(fd_source);
+ m_fd_dest = fd_dest;
+ resume();
+}
+
+int eFilePushThread::start(const char *filename, int fd_dest)
+{
+ if (m_raw_source.open(filename) < 0)
+ return -1;
m_fd_dest = fd_dest;
resume();
+ return 0;
+}
+
+void eFilePushThread::installSigUSR1Handler()
+{
+ /* we set the signal to not restart syscalls, so we can detect our signal. */
+ struct sigaction act;
+ act.sa_handler = signal_handler; // no, SIG_IGN doesn't do it. we want to receive the -EINTR
+ act.sa_flags = 0;
+ sigaction(SIGUSR1, &act, 0);
+}
+
+// called from thread before alive is set to 1
+void eFilePushThread::before_set_thread_alive()
+{
+ installSigUSR1Handler();
}
void eFilePushThread::stop()
void eFilePushThread::seek(int whence, off_t where)
{
- ::lseek(m_fd_source, where, whence);
+ m_raw_source.lseek(where, whence);
}
void eFilePushThread::resume()
m_event(evt);
}
-void eFilePushThread::filterRecordData(const char *data, int len)
+void eFilePushThread::filterRecordData(const unsigned char *data, int len)
{
/* do nothing */
}