summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkos <kos@dev3>2013-11-14 13:31:04 (GMT)
committerkos <kos@dev3>2013-11-14 13:31:04 (GMT)
commit418d99918a8cb223d2494a07abf2a77247101272 (patch)
tree35cbda3e714eb3ae986dc61521eeda41e35d079a
parent73c4940c5d6afbbb546293bf2522291a564a5cb7 (diff)
change log message.
-rw-r--r--src/eDemuxPumpThread.cpp6
-rw-r--r--src/eNetworkPumpThread.cpp2
2 files changed, 6 insertions, 2 deletions
diff --git a/src/eDemuxPumpThread.cpp b/src/eDemuxPumpThread.cpp
index 9c8a4de..a85ab17 100644
--- a/src/eDemuxPumpThread.cpp
+++ b/src/eDemuxPumpThread.cpp
@@ -95,7 +95,7 @@ Server: stream_enigma2\r\n\
#endif
if(wc != rc) {
#ifdef DEBUG_LOG
- LOG("write fail.. rc[%d], wc[%d]", rc, wc);
+ LOG("need retry write.. rc[%d], wc[%d]", rc, wc);
#endif
int read_len = rc;
fd_set device_writefds;
@@ -107,6 +107,9 @@ Server: stream_enigma2\r\n\
if (select(mDeviceFd + 1, 0, &device_writefds, 0, 0) < 0)
break;
wc = write(mDeviceFd, buffer + i, read_len - i);
+#ifdef DEBUG_LOG
+ LOG("-> retry write.. rc[%d], wc[%d]", read_len - i, wc);
+#endif
}
}
}
@@ -150,6 +153,7 @@ bool eDemuxPumpThread::Open(int aDemuxId)
void eDemuxPumpThread::Close()
{
mState = eDemuxState::stNotOpened;
+ ioctl(mDeviceFd, 200, 0);
if(mDemuxFd > 0) {
close(mDemuxFd);
}
diff --git a/src/eNetworkPumpThread.cpp b/src/eNetworkPumpThread.cpp
index e60e69e..73b9299 100644
--- a/src/eNetworkPumpThread.cpp
+++ b/src/eNetworkPumpThread.cpp
@@ -69,7 +69,7 @@ Server: stream_enigma2\r\n\
wc = write(1, buffer, rc);
#ifdef DEBUG_LOG
if(wc != rc) {
- LOG("write fail.. rc[%d], wc[%d]", rc, wc);
+ LOG("need retry write.. rc[%d], wc[%d]", rc, wc);
}
#endif
} else if (pollevt.revents & POLLHUP) {