From a737c64e66e505c1cffe0783a9eecfaade700c06 Mon Sep 17 00:00:00 2001
From: Ruud Overeem <overeem@astron.nl>
Date: Fri, 21 Mar 2008 08:50:26 +0000
Subject: [PATCH] Bug 1167: Cleaned up MAC layers. There are less dependancies
between the packages now.
---
MAC/APL/PIC/MIS/configure.in | 2 +-
MAC/APL/PIC/MIS/src/MISDaemon.h | 9 +++---
MAC/APL/PIC/MIS/src/MISDefines.h | 2 +-
MAC/APL/PIC/MIS/src/MISMain.cc | 1 +
MAC/APL/PIC/MIS/src/MISPolicyHandler.cc | 1 +
MAC/APL/PIC/MIS/src/MISPolicyHandler.h | 1 +
MAC/APL/PIC/MIS/src/MISSession.h | 42 ++++++++++++-------------
MAC/APL/PIC/MIS/src/MISSubscription.cc | 4 +--
MAC/APL/PIC/MIS/src/MIS_Protocol.prot | 2 +-
MAC/APL/PIC/MIS/src/Makefile.am | 2 +-
10 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/MAC/APL/PIC/MIS/configure.in b/MAC/APL/PIC/MIS/configure.in
index acd53a7926c..84f4416dbb6 100644
--- a/MAC/APL/PIC/MIS/configure.in
+++ b/MAC/APL/PIC/MIS/configure.in
@@ -40,7 +40,7 @@ lofar_COMPILETOOLS
lofar_PVSS(1)
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/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,,)
lofar_INTERNAL(MAC/GCF/TM, gcftm, , 1, GCF/TM/GCF_Task.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,,)
diff --git a/MAC/APL/PIC/MIS/src/MISDaemon.h b/MAC/APL/PIC/MIS/src/MISDaemon.h
index d50914c2020..11b2f5ba9d1 100644
--- a/MAC/APL/PIC/MIS/src/MISDaemon.h
+++ b/MAC/APL/PIC/MIS/src/MISDaemon.h
@@ -23,9 +23,8 @@
#ifndef MISDAEMON_H
#define MISDAEMON_H
-#include <GCF/TM/GCF_Task.h>
-#include <GCF/TM/GCF_Port.h>
-#include <GCF/TM/GCF_TCPPort.h>
+#include <MACIO/GCF_Event.h>
+#include <GCF/TM/GCF_Control.h>
#include <MISPolicyHandler.h>
namespace LOFAR
@@ -50,8 +49,8 @@ class MISDaemon : public GCF::TM::GCFTask
void clientClosed(MISSession& client);
private: // state methods
- GCF::TM::GCFEvent::TResult initial (GCF::TM::GCFEvent& e, GCF::TM::GCFPortInterface& p);
- GCF::TM::GCFEvent::TResult accepting (GCF::TM::GCFEvent& e, GCF::TM::GCFPortInterface& p);
+ MACIO::GCFEvent::TResult initial (MACIO::GCFEvent& e, GCF::TM::GCFPortInterface& p);
+ MACIO::GCFEvent::TResult accepting (MACIO::GCFEvent& e, GCF::TM::GCFPortInterface& p);
private: // helper methods
diff --git a/MAC/APL/PIC/MIS/src/MISDefines.h b/MAC/APL/PIC/MIS/src/MISDefines.h
index 4258edcce78..d3fd97f0801 100644
--- a/MAC/APL/PIC/MIS/src/MISDefines.h
+++ b/MAC/APL/PIC/MIS/src/MISDefines.h
@@ -23,7 +23,7 @@
#ifndef MISDEFINES_H
#define MISDEFINES_H
-#include <GCF/GCF_Defines.h>
+//#include <GCF/GCF_Defines.h>
namespace LOFAR
{
diff --git a/MAC/APL/PIC/MIS/src/MISMain.cc b/MAC/APL/PIC/MIS/src/MISMain.cc
index 8d69a879796..d4396439d07 100644
--- a/MAC/APL/PIC/MIS/src/MISMain.cc
+++ b/MAC/APL/PIC/MIS/src/MISMain.cc
@@ -21,6 +21,7 @@
//# $Id$
#include <lofar_config.h>
+#include <Common/LofarLogger.h>
#include <MISDaemon.h>
#include <GCF/TM/GCF_Control.h>
diff --git a/MAC/APL/PIC/MIS/src/MISPolicyHandler.cc b/MAC/APL/PIC/MIS/src/MISPolicyHandler.cc
index b9ac056daad..ceffd1d6858 100644
--- a/MAC/APL/PIC/MIS/src/MISPolicyHandler.cc
+++ b/MAC/APL/PIC/MIS/src/MISPolicyHandler.cc
@@ -22,6 +22,7 @@
#include <lofar_config.h>
#include <Common/lofar_fstream.h>
+#include <Common/LofarLogger.h>
#include <Common/LofarLocators.h>
//#include <GCF/LogSys/GCF_KeyValueLogger.h>
diff --git a/MAC/APL/PIC/MIS/src/MISPolicyHandler.h b/MAC/APL/PIC/MIS/src/MISPolicyHandler.h
index 703b09ce91c..dd90ecd4266 100644
--- a/MAC/APL/PIC/MIS/src/MISPolicyHandler.h
+++ b/MAC/APL/PIC/MIS/src/MISPolicyHandler.h
@@ -23,6 +23,7 @@
#ifndef MISPOLICYHANDLER_H
#define MISPOLICYHANDLER_H
+#include <Common/lofar_list.h>
#include <MIS_Protocol.ph>
namespace LOFAR {
diff --git a/MAC/APL/PIC/MIS/src/MISSession.h b/MAC/APL/PIC/MIS/src/MISSession.h
index 44e4c52c91b..033516552cd 100644
--- a/MAC/APL/PIC/MIS/src/MISSession.h
+++ b/MAC/APL/PIC/MIS/src/MISSession.h
@@ -24,11 +24,8 @@
#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 <GCF/TM/GCF_Control.h>
+#include <MACIO/MACServiceInfo.h>
//#include <PropertyProxy.h>
//#include <MISSubscription.h>
@@ -42,6 +39,7 @@ namespace blitz
}
namespace LOFAR
{
+ using MACIO::GCFEvent;
namespace AMI
{
@@ -63,26 +61,26 @@ class MISSession : public GCF::TM::GCFTask
static void setCurrentTime(int64& sec, uint32& nsec);
private: // state methods
- GCF::TM::GCFEvent::TResult initial_state (GCF::TM::GCFEvent& e, GCF::TM::GCFPortInterface& p);
- GCF::TM::GCFEvent::TResult waiting_state (GCF::TM::GCFEvent& e, GCF::TM::GCFPortInterface& p);
- GCF::TM::GCFEvent::TResult setDiagnosis_state (GCF::TM::GCFEvent& e, GCF::TM::GCFPortInterface& p);
- GCF::TM::GCFEvent::TResult reconfigure_state (GCF::TM::GCFEvent& e, GCF::TM::GCFPortInterface& p);
- GCF::TM::GCFEvent::TResult getPICStructure_state (GCF::TM::GCFEvent& e, GCF::TM::GCFPortInterface& p);
- GCF::TM::GCFEvent::TResult subscribe_state (GCF::TM::GCFEvent& e, GCF::TM::GCFPortInterface& p);
- GCF::TM::GCFEvent::TResult getSubbandStatistics_state (GCF::TM::GCFEvent& e, GCF::TM::GCFPortInterface& p);
- GCF::TM::GCFEvent::TResult getAntennaCorrelation_state (GCF::TM::GCFEvent& e, GCF::TM::GCFPortInterface& p);
- GCF::TM::GCFEvent::TResult closing_state (GCF::TM::GCFEvent& e, GCF::TM::GCFPortInterface& p);
+ GCFEvent::TResult initial_state (GCFEvent& e, GCF::TM::GCFPortInterface& p);
+ GCFEvent::TResult waiting_state (GCFEvent& e, GCF::TM::GCFPortInterface& p);
+ GCFEvent::TResult setDiagnosis_state (GCFEvent& e, GCF::TM::GCFPortInterface& p);
+ GCFEvent::TResult reconfigure_state (GCFEvent& e, GCF::TM::GCFPortInterface& p);
+ GCFEvent::TResult getPICStructure_state (GCFEvent& e, GCF::TM::GCFPortInterface& p);
+ GCFEvent::TResult subscribe_state (GCFEvent& e, GCF::TM::GCFPortInterface& p);
+ GCFEvent::TResult getSubbandStatistics_state (GCFEvent& e, GCF::TM::GCFPortInterface& p);
+ GCFEvent::TResult getAntennaCorrelation_state (GCFEvent& e, GCF::TM::GCFPortInterface& p);
+ GCFEvent::TResult closing_state (GCFEvent& e, GCF::TM::GCFPortInterface& p);
- GCF::TM::GCFEvent::TResult defaultHandling (GCF::TM::GCFEvent& e, GCF::TM::GCFPortInterface& p);
+ GCFEvent::TResult defaultHandling (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 getSubbandStatistics (GCF::TM::GCFEvent& e);
+ void genericPingpong (GCFEvent& e);
+ void getGenericIdentity (GCFEvent& e);
+ void setDiagnosis (GCFEvent& e);
+ void subscribe (GCFEvent& e);
+ void getSubbandStatistics (GCFEvent& e);
//MAXMOD
- void getAntennaCorrelation(GCF::TM::GCFEvent& e);
+ void getAntennaCorrelation(GCFEvent& e);
private: // data members
// typedef map<string /*resource name*/, MISSubscription*> TSubscriptions;
@@ -98,7 +96,7 @@ class MISSession : public GCF::TM::GCFTask
uint64 _curReplyNr;
bool _busy;
// list<MISSubscription*> _subscriptionsGarbage;
- GCF::TM::GCFEvent* _pRememberedEvent;
+ GCFEvent* _pRememberedEvent;
uint16 _nrOfRCUs;
bitset<MEPHeader::MAX_N_RCUS> _allRCUSMask;
bitset<MAX_N_RSPBOARDS> _allRSPSMask;
diff --git a/MAC/APL/PIC/MIS/src/MISSubscription.cc b/MAC/APL/PIC/MIS/src/MISSubscription.cc
index 1132446d995..f2de7433b60 100644
--- a/MAC/APL/PIC/MIS/src/MISSubscription.cc
+++ b/MAC/APL/PIC/MIS/src/MISSubscription.cc
@@ -25,8 +25,8 @@
#include "MISSubscription.h"
#include "MISSession.h"
#include <MIS_Protocol.ph>
-#include <GCF/PAL/GCF_PVSSInfo.h>
-#include <GCF/GCF_PValue.h>
+#include <GCF/PVSS/PVSSInfo.h>
+#include <GCF/PVSS/GCF_PValue.h>
namespace LOFAR
{
diff --git a/MAC/APL/PIC/MIS/src/MIS_Protocol.prot b/MAC/APL/PIC/MIS/src/MIS_Protocol.prot
index 0d858adc323..e30d6e8e1b9 100644
--- a/MAC/APL/PIC/MIS/src/MIS_Protocol.prot
+++ b/MAC/APL/PIC/MIS/src/MIS_Protocol.prot
@@ -5,7 +5,7 @@ autogen definitions protocol;
description = "Protocol for MAC Information Exchange";
prefix = "MIS"; // for the signal names
-id = "(LOFAR::GCF::TM::F_APL_PROTOCOL+5)";
+id = "(LOFAR::MACIO::F_APL_PROTOCOL+5)";
include = '<Common/LofarTypes.h>';
//MAXMOD
diff --git a/MAC/APL/PIC/MIS/src/Makefile.am b/MAC/APL/PIC/MIS/src/Makefile.am
index 82702f7ced2..6e327a123b5 100644
--- a/MAC/APL/PIC/MIS/src/Makefile.am
+++ b/MAC/APL/PIC/MIS/src/Makefile.am
@@ -2,7 +2,7 @@ AUTOGEN = autogen
SUFFIXES = .ph
%.ph: %.prot
- $(AUTOGEN) --writable -L $(datadir)/GCF/TM $<
+ $(AUTOGEN) --writable -L $(datadir)/MACIO $<
DOCHDRS = $(BUILT_SOURCES) \
MISDaemon.h \
--
GitLab