From 83b53617ce7433782d4681c656916eb33d178ce5 Mon Sep 17 00:00:00 2001
From: John Romein <romein@astron.nl>
Date: Wed, 27 Feb 2008 10:53:44 +0000
Subject: [PATCH] bug 225: cleanup
---
Appl/CEP/CS1/CS1_IONProc/src/InputThread.cc | 28 +++++++++------------
1 file changed, 12 insertions(+), 16 deletions(-)
diff --git a/Appl/CEP/CS1/CS1_IONProc/src/InputThread.cc b/Appl/CEP/CS1/CS1_IONProc/src/InputThread.cc
index 23d185fea81..c144143d6ef 100644
--- a/Appl/CEP/CS1/CS1_IONProc/src/InputThread.cc
+++ b/Appl/CEP/CS1/CS1_IONProc/src/InputThread.cc
@@ -71,9 +71,12 @@ void *InputThread::logThread(void *)
system("cat /proc/meminfo");
#endif
- std::clog <<
- "received " << nrPacketsReceived << " packets, "
- "rejected " << nrPacketsRejected << " packets" << std::endl;
+ std::clog << "received " << nrPacketsReceived << " packets";
+
+ if (nrPacketsRejected > 0)
+ std::clog << ", rejected " << nrPacketsRejected << " packets";
+
+ std::clog << std::endl;
nrPacketsReceived = nrPacketsRejected = 0; // race conditions, but who cares
sleep(1);
}
@@ -125,17 +128,10 @@ void InputThread::mainLoop()
std::clog << "InputThread::mainLoop() entering loop" << std::endl;
while (!theirShouldStop) {
-retry: // until valid packet received
-
- try {
- receiveTimer.start();
- itsArgs.th->recvBlocking((void *) totRecvframe, frameSize, 0);
- receiveTimer.stop();
- ++ nrPacketsReceived;
- } catch (Exception &e) {
- LOG_TRACE_FLOW_STR("WriteToBufferThread couldn't read from TransportHolder(" << e.what() << ", exiting");
- exit(1);
- }
+ receiveTimer.start();
+ itsArgs.th->recvBlocking((void *) totRecvframe, frameSize, 0);
+ receiveTimer.stop();
+ ++ nrPacketsReceived;
// get the actual timestamp of first EPApacket in frame
if (dataShouldContainValidStamp) {
@@ -146,12 +142,11 @@ retry: // until valid packet received
seqid = byteSwap(seqid);
blockid = byteSwap(blockid);
#endif
-//std::clog << "InputThread::mainLoop: seqid = " << seqid << ", blockid = " << blockid << std::endl;
//if the seconds counter is 0xFFFFFFFF, the data cannot be trusted.
if (seqid == ~0U) {
++ nrPacketsRejected;
- goto retry;
+ continue;
}
actualstamp.setStamp(seqid, blockid);
@@ -166,6 +161,7 @@ retry: // until valid packet received
}
std::clog << "InputThread::mainLoop() exiting loop" << std::endl;
+
if (pthread_join(logThreadId, 0) != 0) {
std::cerr << "could not join log thread" << std::endl;
exit(1);
--
GitLab