git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix #defines
[enigma2.git]
/
lib
/
base
/
filepush.cpp
diff --git
a/lib/base/filepush.cpp
b/lib/base/filepush.cpp
index ce33d04f9b4692b483c1c3ee3cc8e2f6cca875ba..8d116559aa1f53f5463f4206daf3c06a174a7133 100644
(file)
--- a/
lib/base/filepush.cpp
+++ b/
lib/base/filepush.cpp
@@
-21,12
+21,14
@@
static void signal_handler(int x)
void eFilePushThread::thread()
{
void eFilePushThread::thread()
{
- off_t dest_pos = 0;
+ off_t dest_pos = 0
, source_pos = 0
;
size_t bytes_read = 0;
size_t bytes_read = 0;
- off_t current_span_offset;
+ off_t current_span_offset
= 0
;
size_t current_span_remaining = 0;
size_t current_span_remaining = 0;
+ size_t written_since_last_sync = 0;
+
int already_empty = 0;
eDebug("FILEPUSH THREAD START");
// this is a race. FIXME.
int already_empty = 0;
eDebug("FILEPUSH THREAD START");
// this is a race. FIXME.
@@
-38,6
+40,8
@@
void eFilePushThread::thread()
sigaction(SIGUSR1, &act, 0);
dest_pos = lseek(m_fd_dest, 0, SEEK_CUR);
sigaction(SIGUSR1, &act, 0);
dest_pos = lseek(m_fd_dest, 0, SEEK_CUR);
+ source_pos = m_raw_source.lseek(0, SEEK_CUR);
+
/* m_stop must be evaluated after each syscall. */
while (!m_stop)
{
/* m_stop must be evaluated after each syscall. */
while (!m_stop)
{
@@
-45,20
+49,29
@@
void eFilePushThread::thread()
if (m_buf_start != m_buf_end)
{
// TODO: take care of boundaries.
if (m_buf_start != m_buf_end)
{
// TODO: take care of boundaries.
+ filterRecordData(m_buffer + m_buf_start, m_buf_end - m_buf_start);
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)
continue;
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)
continue;
-
eDebug("eFilePushThread *write error* (%m) - not yet handled")
;
+
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);
// ... we would stop the thread
}
/* this should flush all written pages to disk. */
posix_fadvise(m_fd_dest, dest_pos, w, POSIX_FADV_DONTNEED);
-
+
dest_pos += w;
dest_pos += w;
+ written_since_last_sync += w;
+
+ if (written_since_last_sync >= 512*1024)
+ {
+ fdatasync(m_fd_dest);
+ written_since_last_sync = 0;
+ }
+
// printf("FILEPUSH: wrote %d bytes\n", w);
m_buf_start += w;
continue;
// printf("FILEPUSH: wrote %d bytes\n", w);
m_buf_start += w;
continue;
@@
-68,30
+81,36
@@
void eFilePushThread::thread()
if (m_sg && !current_span_remaining)
{
if (m_sg && !current_span_remaining)
{
- m_sg->getNextSourceSpan(bytes_read, current_span_offset, current_span_remaining);
+ m_sg->getNextSourceSpan(source_pos, bytes_read, current_span_offset, current_span_remaining);
+
+ if (source_pos != current_span_offset)
+ source_pos = m_raw_source.lseek(current_span_offset, SEEK_SET);
bytes_read = 0;
}
size_t maxread = sizeof(m_buffer);
/* if we have a source span, don't read past the end */
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)
+ if (m_sg && maxread
>
current_span_remaining)
maxread = current_span_remaining;
m_buf_start = 0;
m_buf_end = 0;
if (maxread)
maxread = current_span_remaining;
m_buf_start = 0;
m_buf_end = 0;
if (maxread)
- m_buf_end = read(m_fd_source, m_buffer, maxread);
-
- bytes_read += m_buf_end;
+ m_buf_end = m_raw_source.read(m_buffer, maxread);
if (m_buf_end < 0)
{
m_buf_end = 0;
if (errno == EINTR)
continue;
if (m_buf_end < 0)
{
m_buf_end = 0;
if (errno == EINTR)
continue;
- eDebug("eFilePushThread *read error* - not yet handled");
+ if (errno == EOVERFLOW)
+ {
+ eWarning("OVERFLOW while recording");
+ continue;
+ }
+ eDebug("eFilePushThread *read error* (%m) - not yet handled");
}
if (m_buf_end == 0)
{
}
if (m_buf_end == 0)
{
@@
-109,7
+128,7
@@
void eFilePushThread::thread()
sendEvent(evtEOF);
#if 0
eDebug("FILEPUSH: end-of-file! (currently unhandled)");
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;
{
eDebug("(looping)");
continue;
@@
-117,7
+136,13
@@
void eFilePushThread::thread()
#endif
break;
} else
#endif
break;
} else
+ {
+ source_pos += m_buf_end;
+ bytes_read += m_buf_end;
+ if (m_sg)
+ current_span_remaining -= m_buf_end;
already_empty = 0;
already_empty = 0;
+ }
// printf("FILEPUSH: read %d bytes\n", m_buf_end);
}
// printf("FILEPUSH: read %d bytes\n", m_buf_end);
}
@@
-126,11
+151,20
@@
void eFilePushThread::thread()
void eFilePushThread::start(int fd_source, int fd_dest)
{
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();
}
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::stop()
{
if (!thread_running()) /* FIXME: races */
void eFilePushThread::stop()
{
if (!thread_running()) /* FIXME: races */
@@
-147,7
+181,7
@@
void eFilePushThread::pause()
void eFilePushThread::seek(int whence, off_t where)
{
void eFilePushThread::seek(int whence, off_t where)
{
-
::lseek(m_fd_source,
where, whence);
+
m_raw_source.lseek(
where, whence);
}
void eFilePushThread::resume()
}
void eFilePushThread::resume()
@@
-166,6
+200,11
@@
void eFilePushThread::enablePVRCommit(int s)
m_send_pvr_commit = s;
}
m_send_pvr_commit = s;
}
+void eFilePushThread::setScatterGather(iFilePushScatterGather *sg)
+{
+ m_sg = sg;
+}
+
void eFilePushThread::sendEvent(int evt)
{
m_messagepump.send(evt);
void eFilePushThread::sendEvent(int evt)
{
m_messagepump.send(evt);
@@
-175,3
+214,9
@@
void eFilePushThread::recvEvent(const int &evt)
{
m_event(evt);
}
{
m_event(evt);
}
+
+void eFilePushThread::filterRecordData(const unsigned char *data, int len)
+{
+ /* do nothing */
+}
+