From 915d46f104bd60e97fa853f3bc3b97ae07c0ef07 Mon Sep 17 00:00:00 2001
From: Ruud Overeem <overeem@astron.nl>
Date: Tue, 26 Feb 2008 08:55:19 +0000
Subject: [PATCH] Bug 1162: Removed all the PVSS dependancies. We don't need it
for now.
---
MAC/APL/PIC/MIS/configure.in | 4 +-
MAC/APL/PIC/MIS/src/MISDaemon.cc | 46 +++++-----
MAC/APL/PIC/MIS/src/MISPolicyHandler.cc | 16 ++--
MAC/APL/PIC/MIS/src/MISPolicyHandler.h | 12 +--
MAC/APL/PIC/MIS/src/MISSession.cc | 107 +++++++++++-------------
MAC/APL/PIC/MIS/src/MISSession.h | 29 +++----
MAC/APL/PIC/MIS/src/MISSubscription.h | 2 +-
MAC/APL/PIC/MIS/src/Makefile.am | 10 ++-
MAC/APL/PIC/MIS/src/PropertyProxy.h | 2 +-
MAC/APL/PIC/MIS/src/XCStatistics.cc | 2 +-
10 files changed, 105 insertions(+), 125 deletions(-)
diff --git a/MAC/APL/PIC/MIS/configure.in b/MAC/APL/PIC/MIS/configure.in
index df54309cf77..acd53a7926c 100644
--- a/MAC/APL/PIC/MIS/configure.in
+++ b/MAC/APL/PIC/MIS/configure.in
@@ -42,8 +42,8 @@ lofar_INTERNAL(LCS/Common, common, , 1, Common/LofarTypes.h,,)
lofar_INTERNAL(LCS/ACC/APS, aps, , 1, APS/ParameterSet.h,,)
lofar_INTERNAL(MAC/GCF/GCFCommon, gcfcommon, , 1, GCF/GCF_Defines.h,,)
lofar_INTERNAL(MAC/GCF/TM, gcftm, , 1, GCF/TM/GCF_Task.h,,)
-lofar_INTERNAL(MAC/GCF/PAL, gcfpal, , 1, GCF/PAL/GCF_PVSSInfo.h,,)
-lofar_INTERNAL(MAC/GCF/LogSys, gcfkvlc, , 1, GCF/LogSys/GCF_KeyValueLogger.h,,)
+dnl lofar_INTERNAL(MAC/GCF/PAL, gcfpal, , 1, GCF/PAL/GCF_PVSSInfo.h,,)
+dnl lofar_INTERNAL(MAC/GCF/LogSys, gcfkvlc, , 1, GCF/LogSys/GCF_KeyValueLogger.h,,)
lofar_INTERNAL(MAC/APL/RTCCommon, rtccommon, , 1, APL/RTCCommon/Timestamp.h,,)
lofar_INTERNAL(MAC/APL/PIC/RSP_Protocol, rsp_protocol, , 1, APL/RSP_Protocol/RSP_Protocol.ph,,)
lofar_INTERNAL(MAC/APL/APLCommon, aplcommon, , 1, APL/APLCommon/APL_Defines.h,,)
diff --git a/MAC/APL/PIC/MIS/src/MISDaemon.cc b/MAC/APL/PIC/MIS/src/MISDaemon.cc
index d13ec0ae94c..638ee791b5f 100644
--- a/MAC/APL/PIC/MIS/src/MISDaemon.cc
+++ b/MAC/APL/PIC/MIS/src/MISDaemon.cc
@@ -25,8 +25,8 @@
#include <Common/LofarLocators.h>
#include <APS/ParameterSet.h>
-#include <GCF/LogSys/GCF_KeyValueLogger.h>
-#include <GCF/PAL/GCF_PVSSInfo.h>
+//#include <GCF/LogSys/GCF_KeyValueLogger.h>
+//#include <GCF/PAL/GCF_PVSSInfo.h>
#include <APL/RSP_Protocol/RSP_Protocol.ph>
#include "MISSession.h"
#include "MIS_Protocol.ph"
@@ -37,7 +37,6 @@ namespace LOFAR
{
using namespace GCF::Common;
using namespace GCF::TM;
-using namespace GCF::PAL;
using namespace ACC::APS;
namespace AMI
{
@@ -46,8 +45,8 @@ MISDaemon::MISDaemon() :
GCFTask((State)&MISDaemon::initial, MISD_TASK_NAME)
{
// register the protocol for debugging purposes
- registerProtocol(MIS_PROTOCOL, MIS_PROTOCOL_signalnames);
- registerProtocol(RSP_PROTOCOL, RSP_PROTOCOL_signalnames);
+ registerProtocol(MIS_PROTOCOL, MIS_PROTOCOL_STRINGS);
+ registerProtocol(RSP_PROTOCOL, RSP_PROTOCOL_STRINGS);
// initialize the port
_misdPortProvider.init(*this, MISD_PORT_NAME, GCFPortInterface::MSPP, MIS_PROTOCOL);
@@ -98,42 +97,37 @@ GCFEvent::TResult MISDaemon::accepting(GCFEvent& e, GCFPortInterface& p)
GCFEvent::TResult status = GCFEvent::HANDLED;
static unsigned long garbageTimerID = 0;
static unsigned long rereadPolicyTimerID = 0;
- static bool hasPVSS = false;
+// static bool hasPVSS = false;
- switch (e.signal)
- {
- case F_ENTRY:
- {
- garbageTimerID = _misdPortProvider.setTimer(5.0, 5.0);
+ switch (e.signal) {
+ case F_ENTRY: {
+ garbageTimerID = _misdPortProvider.setTimer(5.0, 5.0);
rereadPolicyTimerID = _misdPortProvider.setTimer(60.0, 60.0);
break;
}
+
case F_DISCONNECTED:
DBGFAILWHEN(&_misdPortProvider == &p && "MISD port provider may not be disconnected.");
break;
- case F_TIMER:
- {
+ case F_TIMER: {
GCFTimerEvent& timerEvent = static_cast<GCFTimerEvent&>(e);
- if (timerEvent.id == garbageTimerID)
- {
+ if (timerEvent.id == garbageTimerID) {
// cleanup the garbage of closed ports to master clients
MISSession* pClient;
- for (TSessions::iterator iter = _sessionsGarbage.begin();
- iter != _sessionsGarbage.end(); ++iter)
- {
+ for (TSessions::iterator iter = _sessionsGarbage.begin(); iter != _sessionsGarbage.end(); ++iter) {
pClient = *iter;
delete pClient;
}
_sessionsGarbage.clear();
}
- else if (timerEvent.id == rereadPolicyTimerID)
- {
+ else if (timerEvent.id == rereadPolicyTimerID) {
_policyHandler.rereadPolicyFile();
}
break;
}
+
case F_CLOSED:
DBGFAILWHEN(&_misdPortProvider == &p);
break;
@@ -142,20 +136,18 @@ GCFEvent::TResult MISDaemon::accepting(GCFEvent& e, GCFPortInterface& p)
DBGFAILWHEN(&_misdPortProvider == &p);
break;
- case F_ACCEPT_REQ:
- {
+ case F_ACCEPT_REQ: {
LOG_INFO("New MIS client accepted!");
MISSession* miss = new MISSession(*this);
miss->start();
- if (!hasPVSS)
- {
+// if (!hasPVSS) {
// now we have PVSS connection
- hasPVSS = true;
+// hasPVSS = true;
// the GCFPVSSInfo::getOwnManNum() method only returns a valid
// man number if a PVSS connections has been established
// is will be automatically done by the MISSession
- SKIP_UPDATES_FROM(GCFPVSSInfo::getOwnManNum());
- }
+// SKIP_UPDATES_FROM(GCFPVSSInfo::getOwnManNum());
+// }
break;
}
diff --git a/MAC/APL/PIC/MIS/src/MISPolicyHandler.cc b/MAC/APL/PIC/MIS/src/MISPolicyHandler.cc
index a2b63a957ba..b9ac056daad 100644
--- a/MAC/APL/PIC/MIS/src/MISPolicyHandler.cc
+++ b/MAC/APL/PIC/MIS/src/MISPolicyHandler.cc
@@ -24,9 +24,9 @@
#include <Common/lofar_fstream.h>
#include <Common/LofarLocators.h>
-#include <GCF/LogSys/GCF_KeyValueLogger.h>
-#include <GCF/GCF_PVInteger.h>
-#include <APL/APLCommon/APL_Defines.h>
+//#include <GCF/LogSys/GCF_KeyValueLogger.h>
+//#include <GCF/GCF_PVInteger.h>
+//#include <APL/APLCommon/APL_Defines.h>
#include "MISDaemon.h"
#include "MIS_Protocol.ph"
#include "MISDefines.h"
@@ -39,7 +39,7 @@ using std::ifstream;
namespace LOFAR
{
using namespace GCF::Common;
-using namespace APLCommon;
+//using namespace APLCommon;
namespace AMI
{
@@ -47,13 +47,11 @@ using namespace APLCommon;
string trim(string source)
{
string::size_type pos = source.find_first_not_of(" \t");
- if (pos != string::npos)
- {
+ if (pos != string::npos) {
source.erase(0, pos);
}
pos = source.find_first_of(" \t");
- if (pos != string::npos)
- {
+ if (pos != string::npos) {
source.erase(pos);
}
return source;
@@ -147,6 +145,7 @@ void MISPolicyHandler::rereadPolicyFile()
lineNr));
}
+#if 0
string MISPolicyHandler::checkDiagnose(const MISDiagnosisNotificationEvent& diag,
GCFPVInteger& curResStateValue)
{
@@ -235,6 +234,7 @@ string MISPolicyHandler::checkDiagnose(const MISDiagnosisNotificationEvent& diag
return response;
}
+#endif
} // namespace AMI
} // namespace LOFAR
diff --git a/MAC/APL/PIC/MIS/src/MISPolicyHandler.h b/MAC/APL/PIC/MIS/src/MISPolicyHandler.h
index 816ffc33ff9..703b09ce91c 100644
--- a/MAC/APL/PIC/MIS/src/MISPolicyHandler.h
+++ b/MAC/APL/PIC/MIS/src/MISPolicyHandler.h
@@ -25,17 +25,13 @@
#include <MIS_Protocol.ph>
-namespace LOFAR
-{
- namespace GCF
- {
- namespace Common
- {
+namespace LOFAR {
+ namespace GCF {
+ namespace Common {
class GCFPVInteger;
}
}
- namespace AMI
- {
+ namespace AMI {
class MISDaemon;
diff --git a/MAC/APL/PIC/MIS/src/MISSession.cc b/MAC/APL/PIC/MIS/src/MISSession.cc
index cf5ad3a9d0a..1049ca2731a 100644
--- a/MAC/APL/PIC/MIS/src/MISSession.cc
+++ b/MAC/APL/PIC/MIS/src/MISSession.cc
@@ -25,14 +25,14 @@
#include "MISSession.h"
#include "MISDaemon.h"
#include "MISDefines.h"
-#include "MISSubscription.h"
+//#include "MISSubscription.h"
#include "XCStatistics.h" //MAXMOD
-#include <GCF/PAL/GCF_PVSSInfo.h>
-#include <GCF/PAL/GCF_Answer.h>
-#include <APL/APLCommon/APL_Defines.h>
-#include <GCF/GCF_PVInteger.h>
+//#include <GCF/PAL/GCF_PVSSInfo.h>
+//#include <GCF/PAL/GCF_Answer.h>
+//#include <APL/APLCommon/APL_Defines.h>
+//#include <GCF/GCF_PVInteger.h>
#include <APL/RTCCommon/PSAccess.h>
-#include <GCF/LogSys/GCF_KeyValueLogger.h>
+//#include <GCF/LogSys/GCF_KeyValueLogger.h>
using namespace blitz;
@@ -41,9 +41,8 @@ namespace LOFAR
{
using namespace GCF::Common;
using namespace GCF::TM;
-using namespace GCF::PAL;
using namespace RTC;
-using namespace APLCommon;
+//using namespace APLCommon;
namespace AMI
{
@@ -94,7 +93,7 @@ using namespace APLCommon;
MISSession::MISSession(MISDaemon& daemon) :
GCFTask((State)&MISSession::initial_state, MISS_TASK_NAME),
_daemon(daemon),
- _propertyProxy(*this),
+// _propertyProxy(*this),
_curSeqNr(1),
_curReplyNr(0),
_pRememberedEvent(0),
@@ -107,11 +106,12 @@ MISSession::MISSession(MISDaemon& daemon) :
MISSession::~MISSession ()
{
+#if 0
for (TSubscriptions::iterator iter = _subscriptions.begin();
- iter != _subscriptions.end(); ++iter)
- {
+ iter != _subscriptions.end(); ++iter) {
delete iter->second;
}
+#endif
}
GCFEvent::TResult MISSession::initial_state(GCFEvent& e, GCFPortInterface& /*p*/)
@@ -161,28 +161,26 @@ GCFEvent::TResult MISSession::waiting_state(GCFEvent& e, GCFPortInterface& p)
_missPort.cancelTimer(garbageTimerID);
break;
- case F_TIMER:
- {
+ case F_TIMER: {
+#if 0
GCFTimerEvent& timerEvent = static_cast<GCFTimerEvent&>(e);
- if (timerEvent.id == garbageTimerID)
- {
+ if (timerEvent.id == garbageTimerID) {
// cleanup the garbage of obsolete subscriptions
MISSubscription* pSubs;
for (list<MISSubscription*>::iterator iter = _subscriptionsGarbage.begin();
- iter != _subscriptionsGarbage.end(); ++iter)
- {
+ iter != _subscriptionsGarbage.end(); ++iter) {
pSubs = *iter;
delete pSubs;
}
_subscriptionsGarbage.clear();
}
-
+#endif
break;
}
+
case F_DISCONNECTED:
- if (&_missPort == &p)
- {
+ if (&_missPort == &p) {
LOG_INFO("Connection lost to a MIS client.");
TRAN(MISSession::closing_state);
}
@@ -210,9 +208,9 @@ GCFEvent::TResult MISSession::waiting_state(GCFEvent& e, GCFPortInterface& p)
dispatch(e, p);
break;
- case MIS_PVSS_DP_SUBSCRIPTION_REQUEST:
- subscribe(e);
- break;
+// case MIS_PVSS_DP_SUBSCRIPTION_REQUEST:
+// subscribe(e);
+// break;
case MIS_SUBBAND_STATISTICS_REQUEST:
getSubbandStatistics(e);
@@ -269,6 +267,7 @@ void MISSession::getGenericIdentity(GCFEvent& e)
void MISSession::setDiagnosis(GCFEvent& e)
{
+#if 0
MISDiagnosisNotificationEvent* pIn(0);
static string resourceStatusPropName = "";
@@ -280,35 +279,31 @@ void MISSession::setDiagnosis(GCFEvent& e)
// first try to get the current status value of the component
// for this purpose it is important that the component name contains ".status"
- if (resourceStatusPropName.find(".status") == string::npos)
- {
+ if (resourceStatusPropName.find(".status") == string::npos) {
resourceStatusPropName += ".status";
}
- if (GCFPVSSInfo::propExists(resourceStatusPropName))
- {
- if (_propertyProxy.requestPropValue(resourceStatusPropName) != GCF_NO_ERROR)
- {
+ if (GCFPVSSInfo::propExists(resourceStatusPropName)) {
+ if (_propertyProxy.requestPropValue(resourceStatusPropName) != GCF_NO_ERROR) {
SEND_RESP_MSG((*pIn), DiagnosisResponse, "NAK (Error while requesting the current component status!)");
}
- else
- {
+ else {
_pRememberedEvent = pIn;
TRAN(MISSession::setDiagnosis_state);
}
}
- else
- {
+ else {
SEND_RESP_MSG((*pIn), DiagnosisResponse, "NAK (Component has no status or does not exist!)");
}
- if (_pRememberedEvent == 0)
- {
+ if (_pRememberedEvent == 0) {
delete pIn;
}
+#endif
}
GCFEvent::TResult MISSession::setDiagnosis_state(GCFEvent& e, GCFPortInterface& p)
{
GCFEvent::TResult status = GCFEvent::HANDLED;
+#if 0
static string resourceStatusPropName = "";
@@ -356,7 +351,7 @@ GCFEvent::TResult MISSession::setDiagnosis_state(GCFEvent& e, GCFPortInterface&
status = defaultHandling(e, p);
break;
}
-
+#endif
return status;
}
@@ -404,6 +399,7 @@ GCFEvent::TResult MISSession::getPICStructure_state(GCFEvent& e, GCFPortInterfac
void MISSession::subscribe(GCFEvent& e)
{
+#if 0
MISPvssDpSubscriptionRequestEvent in(e);
LOGMSGHDR(in);
string response = "ACK";
@@ -412,27 +408,21 @@ void MISSession::subscribe(GCFEvent& e)
"Subscription request (%s)",
in.request.c_str()));
- if (in.request == "UNSUBSCRIBE")
- {
+ if (in.request == "UNSUBSCRIBE") {
TSubscriptions::iterator iter = _subscriptions.find(in.dpname);
- if (iter != _subscriptions.end())
- {
+ if (iter != _subscriptions.end()) {
iter->second->unsubscribe(in.seqnr);
}
- else
- {
+ else {
response = "NAK (not subscribed; ignored)";
}
}
- else if (in.request == "SUBSCRIBE" || in.request == "SINGLE-SHOT")
- {
+ else if (in.request == "SUBSCRIBE" || in.request == "SINGLE-SHOT") {
TSubscriptions::iterator iter = _subscriptions.find(in.dpname);
- if (iter != _subscriptions.end())
- {
+ if (iter != _subscriptions.end()) {
response = "NAK (subscription already made; ignored)";
}
- else
- {
+ else {
MISSubscription* pNewSubscription = new MISSubscription(*this,
in.dpname,
in.seqnr,
@@ -443,10 +433,10 @@ void MISSession::subscribe(GCFEvent& e)
}
}
- if (response != "ACK")
- {
+ if (response != "ACK") {
SEND_RESP_MSG(in, PvssDpSubscriptionResponse, response);
}
+#endif
}
GCFEvent::TResult MISSession::subscribe_state(GCFEvent& e, GCFPortInterface& p)
@@ -860,13 +850,11 @@ GCFEvent::TResult MISSession::closing_state(GCFEvent& e, GCFPortInterface& /*p*/
switch (e.signal)
{
case F_ENTRY:
- if (!_missPort.isConnected())
- {
+ if (!_missPort.isConnected()) {
LOG_INFO("Client gone. Stop all subsessions.");
_missPort.close();
}
- else
- {
+ else {
_daemon.clientClosed(*this);
}
break;
@@ -890,8 +878,7 @@ GCFEvent::TResult MISSession::defaultHandling(GCFEvent& e, GCFPortInterface& p)
switch (e.signal)
{
case F_DISCONNECTED:
- if (&p == &_missPort)
- {
+ if (&p == &_missPort) {
LOG_INFO("Connection lost to a MIS client.");
TRAN(MISSession::closing_state);
}
@@ -917,9 +904,9 @@ GCFEvent::TResult MISSession::defaultHandling(GCFEvent& e, GCFPortInterface& p)
RETURN_NOACK_MSG(LofarStructureRequest, LofarStructureResponse, "BUSY");
break;
- case MIS_PVSS_DP_SUBSCRIPTION_REQUEST:
- RETURN_NOACK_MSG(PvssDpSubscriptionRequest, PvssDpSubscriptionResponse, "BUSY");
- break;
+// case MIS_PVSS_DP_SUBSCRIPTION_REQUEST:
+// RETURN_NOACK_MSG(PvssDpSubscriptionRequest, PvssDpSubscriptionResponse, "BUSY");
+// break;
case MIS_SUBBAND_STATISTICS_REQUEST:
RETURN_NOACK_MSG(SubbandStatisticsRequest, SubbandStatisticsResponse, "BUSY");
@@ -952,11 +939,13 @@ void MISSession::valueChanged(MISPvssDpSubscriptionValueChangedAsyncEvent& e)
void MISSession::mayDelete(const string& propName)
{
+#if 0
TSubscriptions::iterator iter = _subscriptions.find(propName);
ASSERTSTR(iter != _subscriptions.end(), "Subscription should still exist here!");
MISSubscription* pSubs = iter->second;
_subscriptions.erase(propName);
_subscriptionsGarbage.push_back(pSubs);
+#endif
}
void MISSession::setCurrentTime(int64& sec, uint32& nsec)
diff --git a/MAC/APL/PIC/MIS/src/MISSession.h b/MAC/APL/PIC/MIS/src/MISSession.h
index 86032a2590e..44e4c52c91b 100644
--- a/MAC/APL/PIC/MIS/src/MISSession.h
+++ b/MAC/APL/PIC/MIS/src/MISSession.h
@@ -23,14 +23,15 @@
#ifndef NODEMANAGERCLIENT_H
#define NODEMANAGERCLIENT_H
+#include <Common/lofar_bitset.h>
#include <GCF/TM/GCF_Task.h>
#include <GCF/TM/GCF_Port.h>
#include <GCF/TM/GCF_TCPPort.h>
//MAXMOD
#include <GCF/GCF_ServiceInfo.h>
-#include <PropertyProxy.h>
-#include <MISSubscription.h>
+//#include <PropertyProxy.h>
+//#include <MISSubscription.h>
#include <MIS_Protocol.ph>
#include <APL/RSP_Protocol/RSP_Protocol.ph>
@@ -45,7 +46,7 @@ namespace LOFAR
{
class MISDaemon;
-class MISSubsciption;
+//class MISSubsciption;
/**
*/
@@ -75,32 +76,32 @@ class MISSession : public GCF::TM::GCFTask
GCF::TM::GCFEvent::TResult defaultHandling (GCF::TM::GCFEvent& e, GCF::TM::GCFPortInterface& p);
private: // helper methods
- void genericPingpong (GCF::TM::GCFEvent& e);
- void getGenericIdentity (GCF::TM::GCFEvent& e);
- void setDiagnosis (GCF::TM::GCFEvent& e);
- void subscribe (GCF::TM::GCFEvent& e);
+ void genericPingpong (GCF::TM::GCFEvent& e);
+ void getGenericIdentity (GCF::TM::GCFEvent& e);
+ void setDiagnosis (GCF::TM::GCFEvent& e);
+ void subscribe (GCF::TM::GCFEvent& e);
void getSubbandStatistics (GCF::TM::GCFEvent& e);
//MAXMOD
- void getAntennaCorrelation (GCF::TM::GCFEvent& e);
+ void getAntennaCorrelation(GCF::TM::GCFEvent& e);
private: // data members
- typedef map<string /*resource name*/, MISSubscription*> TSubscriptions;
+// typedef map<string /*resource name*/, MISSubscription*> TSubscriptions;
GCF::TM::GCFTCPPort _missPort;
GCF::TM::GCFTCPPort _rspDriverPort;
GCF::TM::GCFTCPPort _acmPort;
MISDaemon& _daemon;
- TSubscriptions _subscriptions;
- PropertyProxy _propertyProxy;
+// TSubscriptions _subscriptions;
+// PropertyProxy _propertyProxy;
private: // admin members
uint64 _curSeqNr;
uint64 _curReplyNr;
bool _busy;
- list<MISSubscription*> _subscriptionsGarbage;
+// list<MISSubscription*> _subscriptionsGarbage;
GCF::TM::GCFEvent* _pRememberedEvent;
uint16 _nrOfRCUs;
- std::bitset<MEPHeader::MAX_N_RCUS> _allRCUSMask;
- std::bitset<MAX_N_RSPBOARDS> _allRSPSMask;
+ bitset<MEPHeader::MAX_N_RCUS> _allRCUSMask;
+ bitset<MAX_N_RSPBOARDS> _allRSPSMask;
};
} // namespace AMI
} // namespace LOFAR
diff --git a/MAC/APL/PIC/MIS/src/MISSubscription.h b/MAC/APL/PIC/MIS/src/MISSubscription.h
index 0c0d7ed09a5..764c578dc40 100644
--- a/MAC/APL/PIC/MIS/src/MISSubscription.h
+++ b/MAC/APL/PIC/MIS/src/MISSubscription.h
@@ -23,7 +23,7 @@
#ifndef MISSUBSCRIPTION_H
#define MISSUBSCRIPTION_H
-#include <GCF/PAL/GCF_PropertyProxy.h>
+//#include <GCF/PAL/GCF_PropertyProxy.h>
namespace LOFAR
{
diff --git a/MAC/APL/PIC/MIS/src/Makefile.am b/MAC/APL/PIC/MIS/src/Makefile.am
index d42bacb14ae..82702f7ced2 100644
--- a/MAC/APL/PIC/MIS/src/Makefile.am
+++ b/MAC/APL/PIC/MIS/src/Makefile.am
@@ -8,22 +8,24 @@ DOCHDRS = $(BUILT_SOURCES) \
MISDaemon.h \
MISDefines.h \
MISSession.h \
- MISSubscription.h \
- PropertyProxy.h \
MISPolicyHandler.h \
XCStatistics.h
+# MISSubscription.h
+# PropertyProxy.h
+
noinst_LTLIBRARIES = libmis.la
libmis_la_SOURCES = $(DOCHDRS) \
MISDaemon.cc \
MISSession.cc \
- MISSubscription.cc \
- PropertyProxy.cc \
MISPolicyHandler.cc \
MIS_Protocol.cc \
XCStatistics.cc
+# MISSubscription.cc
+# PropertyProxy.cc
+
bin_PROGRAMS = MACInformationServer
MACInformationServer_SOURCES = MISMain.cc
diff --git a/MAC/APL/PIC/MIS/src/PropertyProxy.h b/MAC/APL/PIC/MIS/src/PropertyProxy.h
index 250e8b403a8..88b8ebfe246 100644
--- a/MAC/APL/PIC/MIS/src/PropertyProxy.h
+++ b/MAC/APL/PIC/MIS/src/PropertyProxy.h
@@ -23,7 +23,7 @@
#ifndef PROPERTYPROXY_H
#define PROPERTYPROXY_H
-#include <GCF/PAL/GCF_PropertyProxy.h>
+//#include <GCF/PAL/GCF_PropertyProxy.h>
#include <GCF/TM/GCF_Fsm.h>
namespace LOFAR
diff --git a/MAC/APL/PIC/MIS/src/XCStatistics.cc b/MAC/APL/PIC/MIS/src/XCStatistics.cc
index 307db919df3..88048d18d63 100644
--- a/MAC/APL/PIC/MIS/src/XCStatistics.cc
+++ b/MAC/APL/PIC/MIS/src/XCStatistics.cc
@@ -24,7 +24,7 @@
#include <Common/LofarLogger.h>
#include "XCStatistics.h"
-#include <APL/RTCCommon/Marshalling.h>
+#include <APL/RTCCommon/MarshallBlitz.h>
using namespace std;
using namespace blitz;
--
GitLab