Task #7361: It compiles but during linking de dependancies are lost.

Checked all CMakeList.txt file but it puzzles me what is wrong.

CMake/LofarPackageList.cmake

@@ -130,6 +130,7 @@ if(NOT DEFINED LOFAR_PACKAGE_LIST_INCLUDED)
   set(Scheduler_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/Scheduler)
   set(jOTDB3_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/OTB/jOTDB3)
   set(OTB-Java_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/OTB/OTB)
+  set(SAS_Feedback_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SAS/Feedback_Service)
   set(CCU_MAC_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SubSystems/CCU_MAC)
   set(LCU_MAC_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SubSystems/LCU_MAC)
   set(MCU_MAC_SOURCE_DIR ${CMAKE_SOURCE_DIR}/SubSystems/MCU_MAC)

CMake/variants/variants.RS005C

@@ -20,6 +20,9 @@ set(MATLAB_ROOT_DIR /usr/local/matlab-2008a)
 # Path to JAVA
 set(ENV{JAVA_HOME} /usr/local/jdk1.6.0_29)
 
+# Path to Qpid
+set(QPID_ROOT_DIR /opt/qpid)
+
 # Ignore warnings matching the following pattern(s)
 set(CTEST_CUSTOM_WARNING_EXCEPTION
   "/boost/date_time/time_facet.hpp:[0-9]+: warning: unused parameter"

SAS/CMakeLists.txt

@@ -4,3 +4,4 @@ lofar_add_package(OTDB)
 lofar_add_package(OTB)
 lofar_add_package(OTDB_SQL OTDB/sql)
 lofar_add_package(Scheduler)
+lofar_add_package(Feedback_Service)

SAS/Feedback_Service/CMakeLists.txt

 # $Id: CMakeLists.txt 23213 2012-12-07 13:00:09Z loose $
 
-lofar_package(Feedback_Service 1.0 DEPENDS Common OTDB)
+lofar_package(Feedback_Service 1.0 DEPENDS Common MACIO GCFTM OTDB MessageBus)
+#lofar_package(CEPCU 1.0 DEPENDS Common ApplCommon MACIO GCFTM GCFRTDB APLCommon RTDBCommon OTDB Stream MessageBus)
 
 include(LofarFindPackage)
 lofar_find_package(Boost REQUIRED COMPONENTS date_time)

SAS/Feedback_Service/src/CMakeLists.txt

@@ -2,8 +2,11 @@
 
 include(LofarPackageVersion)
 
-#lofar_add_bin_program(FeedbackService Feedback.cc FeedbackMain.cc)
+lofar_add_library(feedbackservice Package__Version.cc)
+
+lofar_add_bin_program(versionsas_feedback versionsas_feedback.cc)
+lofar_add_bin_program(FeedbackService Feedback.cc FeedbackMain.cc)
 #lofar_add_bin_program(FeedbackService Package__Version.cc Feedback.cc FeedbackMain.cc)
-#lofar_add_bin_program(versionfeedback versionfeedback.cc)
 
+install(PROGRAMS FeedbackService DESTINATION bin)
 install(FILES FeedbackService.conf DESTINATION etc)

SAS/Feedback_Service/src/Feedback.cc

@@ -22,13 +22,26 @@
 
 //# Always #include <lofar_config.h> first!
 #include <lofar_config.h>
+#include <signal.h>
 
 //# Includes
 #include <Common/LofarLogger.h>
-#include <Feedback/Feedback.h>
+#include <Common/LofarLocators.h>
+#include <Common/ParameterSet.h>
+#include <Common/ParameterRecord.h>
+#include <Common/Version.h>
+#include <GCF/TM/GCF_Control.h>
+#include <OTDB/TreeValue.h>
+#include "Feedback.h"
 
+#include <boost/date_time/posix_time/posix_time.hpp>
+using namespace boost::posix_time;
+
+using namespace qpid::messaging;
 namespace LOFAR {
-  namespace Feedback {
+  using namespace OTDB;
+  using namespace GCF::TM;
+  namespace SAS {
 
 static Feedback*	thisFeedback = 0;
 
@@ -37,11 +50,12 @@ static Feedback*	thisFeedback = 0;
 //
 Feedback::Feedback() :
 	GCFTask		((State)&Feedback::connect2OTDB_state, "FeedbackService"),
-	itsTimerPort(0),
-	itsOTDBConn (0)
+	itsTimer	(0),
+	itsOTDBconn (0),
+	itsMsgQueue (0)
 {
 	// Log who we are.
-	LOG_INFO(Version::getInfo<@@@Version>("FeedbackService"));
+	LOG_INFO(Version::getInfo<SAS_FeedbackVersion>("FeedbackService"));
 
 	// attach timer
 	itsTimer = new GCFTimerPort(*this, "TimerPort");
@@ -52,9 +66,9 @@ Feedback::Feedback() :
 	ASSERTSTR(!queuenames.empty(), "Queuenames not specified in label 'FeedbackQueuenames'");
 
 	// connect to bussystem
-	itsMultiBus = MultiBus(queuenames[0]);
-	for (int i = 1; i < queuenames.size(); ++i) {
-		itsMultibus.add(queuenames[i]);
+	itsMsgQueue = new FromBus();
+	for (size_t i = 0; i < queuenames.size(); ++i) {
+		itsMsgQueue->addQueue(queuenames[i]);
 	}
 
 	// redirect signal handlers
@@ -67,7 +81,11 @@ Feedback::Feedback() :
 // ~Feedback()
 //
 Feedback::~Feedback()
-{}
+{
+	delete itsTimer;
+	delete itsMsgQueue;
+	delete itsOTDBconn;
+}
 
 //
 // sigintHandler(signum)
@@ -119,7 +137,7 @@ GCFEvent::TResult Feedback::connect2OTDB_state(GCFEvent& event, GCFPortInterface
 			return (GCFEvent::HANDLED);
 		}
 		LOG_INFO_STR("Connected to database " << database << " on machine " << dbhost);
-		TRAN(Feedback::operational_state):
+		TRAN(Feedback::operational_state);
 	} break;
 
 	default:
@@ -141,27 +159,29 @@ GCFEvent::TResult Feedback::operational_state(GCFEvent& event, GCFPortInterface&
 	case F_ENTRY: 
 	case F_TIMER:  {
 		// wait (blocking) for next message
-		Message msg = itsMultiBus.getMessage();
-		LOG_DEBUG_STR(..);
+		Message	msg;
+		if (!itsMsgQueue->getMessage(msg)) {
+			LOG_FATAL_STR("Wow, lost connection with message bus");
+			GCFScheduler::instance()->stop();		// TODO better solution
+		}
 
 		if (!itsOTDBconn->connect()) {
 			LOG_ERROR("Lost connection with OTDB, starting reconnect cycle");
 			delete itsOTDBconn;
 			itsOTDBconn = 0;
-			itsMultiBus.nack();
+			itsMsgQueue->nack(msg);
 			TRAN (Feedback::connect2OTDB_state);
 			return (GCFEvent::HANDLED);
 		}
 
 		// Yeah, still connected.
-		string	content = msg.content();
-		if (passKVpairsToOTDB(content)) {
-			itsMultiBus.ack();
-			LOG_DEBUG_STR(...);
+		if (passKVpairsToOTDB(msg.getContent())) {
+			itsMsgQueue->ack(msg);
+			LOG_DEBUG_STR("@@@");
 		}
 		else {
-			itsMultibus.reject();
-			LOG_ERROR_STR(...);
+			itsMsgQueue->reject(msg);
+			LOG_ERROR_STR("@@@");
 		}
 		itsTimer->setTimer(0.0);
 	} break;
@@ -182,12 +202,12 @@ GCFEvent::TResult Feedback::operational_state(GCFEvent& event, GCFPortInterface&
 //
 bool Feedback::passKVpairsToOTDB(const string&	content)
 {
-	int			obsID(getObservationNr(getName()));	// TODO
+	int			obsID; // (getObservationNr(getName()));	// TODO
 	TreeValue   tv(itsOTDBconn, obsID);
 
 	// read parameterset
 	ParameterSet	metadata;
-	metadata.adoptString(content);
+	metadata.adoptBuffer(content);
 
 	// Loop over the parameterset and send the information to the SAS database
 	// During the transition phase from parameter-based to record-based storage in OTDB the
@@ -234,5 +254,5 @@ bool Feedback::passKVpairsToOTDB(const string&	content)
 
 
 
-  } // namespace Feedback
+  } // namespace SAS
 } // namespace LOFAR

SAS/Feedback_Service/src/Feedback.h

-//#  FeedbackService.h: Pass key-value pairs to the database.
+//#  Feedback.h: Pass key-value pairs to the database.
 //#
 //#  Copyright (C) 2015
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
@@ -23,36 +23,37 @@
 #ifndef FEEDBACK_SERVICE_H_
 #define FEEDBACK_SERVICE_H_
 
-// \file FeedbackService.h
+// \file Feedback.h
 // Pass key-value pairs to the database.
 
 //# Never #include <config.h> or #include <lofar_config.h> in a header file!
 //# Includes
 #include <MACIO/GCF_Event.h>
 #include <GCF/TM/GCF_Control.h>
+#include <OTDB/OTDBconnection.h>
 #include <MessageBus/MsgBus.h>
 
 // Avoid 'using namespace' in headerfiles
 
 namespace LOFAR {
-  namespace Feedback {
+  namespace SAS {
 
 using   MACIO::GCFEvent;
 using   GCF::TM::GCFTimerPort;
 using   GCF::TM::GCFPort;
 using   GCF::TM::GCFPortInterface;
 using   GCF::TM::GCFTask;
+using   OTDB::OTDBconnection;
 
 // \addtogroup package
 // @{
 
 
-class FeedbackService : public GCFTask;
+class Feedback : public GCFTask
 {
 public:
-	FeedbackService();
-	explicit FeedbackService (one_parameter);
-	virtual/*?*/ ~FeedbackService();
+	Feedback();
+	~Feedback();
 
 	// Interrupthandler for switching to finishingstate when exiting the program.
 	static void sigintHandler (int signum);
@@ -61,32 +62,21 @@ public:
 private:
 	GCFEvent::TResult	connect2OTDB_state(GCFEvent& e, GCFPortInterface& p);
 	GCFEvent::TResult	operational_state (GCFEvent& e, GCFPortInterface& p);
+	bool passKVpairsToOTDB(const string&	content);
 
 	// Copying is not allowed
-	FeedbackService(const FeedbackService&	that) {};
-	FeedbackService& operator=(const FeedbackService& that) {};
+	Feedback(const Feedback&	that);
+	Feedback& operator=(const Feedback& that);
 
 	//# --- Datamembers ---
 	GCFTimerPort*		itsTimer;			// generic timer
-	OTDBConnection*		itsOTDBconn;		// connection with OTDB
-	MultiBus			itsMultiBus;		// session with Qpid.
+	OTDBconnection*		itsOTDBconn;		// connection with OTDB
+	FromBus*			itsMsgQueue;		// session with Qpid.
 
 };
 
-//# --- Inline functions ---
-
-// ... example
-//#
-//# operator<<
-//#
-inline ostream& operator<< (ostream& os, const FeedbackService& aFeedbackService)
-{	
-	return (c.print(os));
-}
-
-
 // @}
-  } // namespace Feedback
+  } // namespace SAS
 } // namespace LOFAR
 
 #endif

SAS/Feedback_Service/src/FeedbackMain.cc

@@ -23,12 +23,13 @@
 #include <lofar_config.h>
 #include <Common/LofarLogger.h>
 #include <Common/Exception.h>
+#include <GCF/TM/GCF_Control.h>
 
 #include "Feedback.h"
 
 using namespace LOFAR::GCF::TM;
-using namespace LOFAR::CEPCU;
 using namespace LOFAR;
+using namespace LOFAR::SAS;
 
 // Use a terminate handler that can produce a backtrace.
 Exception::TerminateHandler t(Exception::terminate);
@@ -38,7 +39,7 @@ int main(int argc, char* argv[])
 	try {
 		GCFScheduler::instance()->init(argc, argv, argv[1]);
 
-		Feedback	fbTask(argv[1]);
+		Feedback	fbTask;
 		fbTask.start(); 					// make initial transition
 
 		GCFScheduler::instance()->run();	// until stop was called.