diff --git a/MAC/APL/CEPCU/configure.in b/MAC/APL/CEPCU/configure.in
index f2d5ac2ca2ceae032589a41174c51ed1beba2571..4d284a43b38fb7a1fd237ed0c0962dbbee059b78 100644
--- a/MAC/APL/CEPCU/configure.in
+++ b/MAC/APL/CEPCU/configure.in
@@ -74,6 +74,7 @@ dnl
AC_OUTPUT(
src/Makefile
src/ApplController/Makefile
+src/CEPlogProcessor/Makefile
src/OnlineControl/Makefile
dnl src/OfflineControl/Makefile
Makefile
diff --git a/MAC/APL/CEPCU/src/CEPLogProcessor/CEPlogProcessor.cc b/MAC/APL/CEPCU/src/CEPlogProcessor/CEPlogProcessor.cc
similarity index 82%
rename from MAC/APL/CEPCU/src/CEPLogProcessor/CEPlogProcessor.cc
rename to MAC/APL/CEPCU/src/CEPlogProcessor/CEPlogProcessor.cc
index 434db2e49cb60f60cf4c9a42047273a6d0e33330..1794d1cfcba09559762b0e6ccc1c93c46f441c3f 100644
--- a/MAC/APL/CEPCU/src/CEPLogProcessor/CEPlogProcessor.cc
+++ b/MAC/APL/CEPCU/src/CEPlogProcessor/CEPlogProcessor.cc
@@ -29,15 +29,13 @@
#include <Common/SystemUtil.h>
#include <ALC/ACRequest.h>
#include "CEPlogProcessor.h"
-#include "lofarDirs.h"
namespace LOFAR {
- namespace ACC {
+ namespace APL {
CEPlogProcessor::CEPlogProcessor(const string& progName) :
itsListener (0),
- itsParamSet (new ParameterSet),
- itsACPool (0)
+ itsParamSet (new ParameterSet)
{
// Read in the parameterfile with network parameters.
ConfigLocator aCL;
@@ -57,7 +55,6 @@ CEPlogProcessor::~CEPlogProcessor()
{
if (itsListener) { delete itsListener; }
if (itsParamSet) { delete itsParamSet; }
- if (itsACPool) { delete itsACPool; }
}
void CEPlogProcessor::doWork() throw (Exception)
@@ -96,7 +93,7 @@ void CEPlogProcessor::doWork() throw (Exception)
handleConnectionRequest();
}
else {
- handleDataMessage(sid);
+ handleDataStream(sid);
}
} // for
} // while
@@ -111,15 +108,15 @@ void CEPlogProcessor::handleConnectionRequest()
Socket* dataSocket = itsListener->accept(-1);
ASSERTSTR(dataSocket,
"Serious problems on listener socket, exiting! : " << itsListener->errstr());
- itsConnSet.add(dataSocket):
+ itsConnSet.add(dataSocket->getSid());
// give stream its own buffer.
streamBuffer_t stream;
stream.socket = dataSocket;
- stream.buffer = alloc(itsBufferSize);
- stream.readPtr = 0;
- stream.writePtr = 0;
- itsLogStreams[sid] = stream;
+ stream.buffer = (char*)malloc(itsBufferSize);
+ stream.inPtr = 0;
+ stream.outPtr = 0;
+ itsLogStreams[dataSocket->getSid()] = stream;
}
//
@@ -128,15 +125,18 @@ void CEPlogProcessor::handleConnectionRequest()
void CEPlogProcessor::handleDataStream(int sid)
{
// read in the new bytes
- stream& = itsLogStreams[sid];
- int newBytes = socket.read(stream.buffer + stream.inPtr, itsBufferSize - stream.inPtr);
+ streamBuffer_t stream = itsLogStreams[sid];
+ int newBytes = stream.socket->read(stream.buffer + stream.inPtr, itsBufferSize - stream.inPtr);
if (newBytes < 0) {
LOG_ERROR_STR("read on socket " << sid << " returned " << newBytes << ". Closing connection");
free (stream.buffer);
+ stream.socket->close();
+ free(stream.socket);
itsLogStreams.erase(sid);
+ itsConnSet.remove(sid);
return;
}
- LOG_DEBUG_STR("Received " << newBytes " bytes at sid " << sid);
+ LOG_DEBUG_STR("Received " << newBytes << " bytes at sid " << sid);
stream.inPtr += newBytes;
// process as much data as possible from the buffer.
@@ -145,23 +145,23 @@ void CEPlogProcessor::handleDataStream(int sid)
continue;
}
- stream.buffer[i] = \0';
- LOG_INFO(formatString("SID %d:%s\n", sid, streamBuffer.outPtr));
- outPtr = i+1;
- if (outPtr >= inPtr) { // All received bytes handled?
- inPtr = 0;
- outPtr = 0;
+ stream.buffer[i] = '\0';
+ LOG_INFO(formatString("SID %d:>%s<", sid, &(stream.buffer[stream.outPtr])));
+ stream.outPtr = i+1;
+ if (stream.outPtr >= stream.inPtr) { // All received bytes handled?
+ stream.inPtr = 0;
+ stream.outPtr = 0;
return;
}
}
- if (outPtr > (int)(0.5*itsBufferSize)) {
+ if (stream.outPtr > (int)(0.5*itsBufferSize)) {
// When buffer becomes full shift leftovers to the left.
memmove (stream.buffer, stream.buffer + stream.outPtr, (stream.inPtr - stream.outPtr + 1));
stream.inPtr -= stream.outPtr;
- stream.outPut = 0;
+ stream.outPtr = 0;
}
}
- } // namespace ACC
+ } // namespace APL
} // namespace LOFAR
diff --git a/MAC/APL/CEPCU/src/CEPLogProcessor/CEPlogProcessor.conf b/MAC/APL/CEPCU/src/CEPlogProcessor/CEPlogProcessor.conf
similarity index 100%
rename from MAC/APL/CEPCU/src/CEPLogProcessor/CEPlogProcessor.conf
rename to MAC/APL/CEPCU/src/CEPlogProcessor/CEPlogProcessor.conf
diff --git a/MAC/APL/CEPCU/src/CEPLogProcessor/CEPlogProcessor.h b/MAC/APL/CEPCU/src/CEPlogProcessor/CEPlogProcessor.h
similarity index 98%
rename from MAC/APL/CEPCU/src/CEPLogProcessor/CEPlogProcessor.h
rename to MAC/APL/CEPCU/src/CEPlogProcessor/CEPlogProcessor.h
index e1a991f899d776b860e5cb380e3f43c866ab2079..88744b95ccec0f28141ba8f0a8c884174334201e 100644
--- a/MAC/APL/CEPCU/src/CEPLogProcessor/CEPlogProcessor.h
+++ b/MAC/APL/CEPCU/src/CEPlogProcessor/CEPlogProcessor.h
@@ -38,7 +38,7 @@
namespace LOFAR {
namespace APL {
-// \addtogroup ACCbin
+// \addtogroup CEPCU
// @{
@@ -90,7 +90,7 @@ private:
};
// @} addgroup
- } // namespace ACC
+ } // namespace APL
} // namespace LOFAR
#endif
diff --git a/MAC/APL/CEPCU/src/CEPLogProcessor/CEPlogProcessorMain.cc b/MAC/APL/CEPCU/src/CEPlogProcessor/CEPlogProcessorMain.cc
similarity index 97%
rename from MAC/APL/CEPCU/src/CEPLogProcessor/CEPlogProcessorMain.cc
rename to MAC/APL/CEPCU/src/CEPlogProcessor/CEPlogProcessorMain.cc
index 7664f8e2e238950f46bbe8899d73c99aef515b06..29d492c575d5babd80fdc71e3bc238167eb64eec 100644
--- a/MAC/APL/CEPCU/src/CEPLogProcessor/CEPlogProcessorMain.cc
+++ b/MAC/APL/CEPCU/src/CEPlogProcessor/CEPlogProcessorMain.cc
@@ -31,7 +31,7 @@
#include "CEPlogProcessor.h"
using namespace LOFAR;
-using namespace LOFAR::ACC;
+using namespace LOFAR::APL;
//
// MAIN (parameterfile)
@@ -58,7 +58,7 @@ int main (int /*argc*/, char* argv[]) {
LOG_INFO_STR("Starting up: " << argv[0]);
try {
-//#if REAL_DAEMON
+#if REAL_DAEMON
pid_t pid = fork();
switch (pid) {
case -1: // error
@@ -71,7 +71,7 @@ int main (int /*argc*/, char* argv[]) {
LOG_INFO_STR("Daemon succesfully started, pid = " << pid);
return (0);
}
-//#endif
+#endif
// TODO: active the next two calls.
// setsid(); // disconnect from terminalsession
// chdir("/"); // might be on a mounted file system
diff --git a/MAC/APL/CEPCU/src/CEPLogProcessor/Makefile.am b/MAC/APL/CEPCU/src/CEPlogProcessor/Makefile.am
similarity index 100%
rename from MAC/APL/CEPCU/src/CEPLogProcessor/Makefile.am
rename to MAC/APL/CEPCU/src/CEPlogProcessor/Makefile.am