git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't crash if time is *really* invalid
[enigma2.git]
/
lib
/
base
/
filepush.cpp
diff --git
a/lib/base/filepush.cpp
b/lib/base/filepush.cpp
index 8d116559aa1f53f5463f4206daf3c06a174a7133..d12b8efafa6b14387fd5182d00f2cb10b8599f35 100644
(file)
--- a/
lib/base/filepush.cpp
+++ b/
lib/base/filepush.cpp
@@
-31,7
+31,6
@@
void eFilePushThread::thread()
int already_empty = 0;
eDebug("FILEPUSH THREAD START");
int already_empty = 0;
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;
/* we set the signal to not restart syscalls, so we can detect our signal. */
struct sigaction act;
@@
-39,6
+38,8
@@
void eFilePushThread::thread()
act.sa_flags = 0;
sigaction(SIGUSR1, &act, 0);
act.sa_flags = 0;
sigaction(SIGUSR1, &act, 0);
+ hasStarted();
+
dest_pos = lseek(m_fd_dest, 0, SEEK_CUR);
source_pos = m_raw_source.lseek(0, SEEK_CUR);
dest_pos = lseek(m_fd_dest, 0, SEEK_CUR);
source_pos = m_raw_source.lseek(0, SEEK_CUR);
@@
-54,19
+55,18
@@
void eFilePushThread::thread()
// eDebug("wrote %d bytes", w);
if (w <= 0)
{
// eDebug("wrote %d bytes", w);
if (w <= 0)
{
- if (errno ==
-
EINTR)
+ if (errno == EINTR)
continue;
break;
// ... we would stop the thread
}
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;
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;
{
fdatasync(m_fd_dest);
written_since_last_sync = 0;
@@
-119,7
+119,7
@@
void eFilePushThread::thread()
{
eDebug("sending PVR commit");
already_empty = 1;
{
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 */
continue;
eDebug("commit done");
/* well check again */
@@
-167,8
+167,10
@@
int eFilePushThread::start(const char *filename, int fd_dest)
void eFilePushThread::stop()
{
void eFilePushThread::stop()
{
- if (!thread_running()) /* FIXME: races */
+ /* if we aren't running, don't bother stopping. */
+ if (!sync())
return;
return;
+
m_stop = 1;
sendSignal(SIGUSR1);
kill();
m_stop = 1;
sendSignal(SIGUSR1);
kill();