Skip to content
Snippets Groups Projects
Commit b6c88034 authored by Ruud Overeem's avatar Ruud Overeem
Browse files

BugID: 1000 

Major(!) simplifications to get the control chain working for at least the
sunshine scenario.
parent 4ff65f4d
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
MAC/APL/CEPCU/src/OnlineControl/CEPApplMgr.cc
+ 74
− 43
View file @ b6c88034
...@@ -21,10 +21,12 @@ ...@@ -21,10 +21,12 @@
//# $Id$ //# $Id$
#include <lofar_config.h> #include <lofar_config.h>
#include <APL/APLCommon/Controller_Protocol.ph>
#include "CEPApplMgr.h" #include "CEPApplMgr.h"
namespace LOFAR { namespace LOFAR {
using namespace ACC::ALC; using namespace ACC::ALC;
using namespace APLCommon;
namespace CEPCU { namespace CEPCU {
...@@ -32,12 +34,13 @@ namespace LOFAR { ...@@ -32,12 +34,13 @@ namespace LOFAR {
// CEPApplMgr(interface, appl) // CEPApplMgr(interface, appl)
// //
CEPApplMgr::CEPApplMgr(CEPApplMgrInterface& interface, CEPApplMgr::CEPApplMgr(CEPApplMgrInterface& interface,
const string& appName) : const string& appName) :
itsProcName (appName),
itsCAMInterface(interface), itsCAMInterface(interface),
itsACclient (this, appName, 10, 100, 1, 0), itsACclient (this, appName, 10, 100, 1, 0),
itsContinuePoll(false), itsReqState (CTState::NOSTATE),
itsLastOkCmd (ACC::ALC::ACCmdNone), itsCurState (CTState::NOSTATE),
itsProcName (appName) itsContinuePoll(true)
{ {
use(); // to avoid that this object will be deleted in GCFTask::stop; use(); // to avoid that this object will be deleted in GCFTask::stop;
} }
...@@ -63,75 +66,103 @@ void CEPApplMgr::workProc() ...@@ -63,75 +66,103 @@ void CEPApplMgr::workProc()
// //
// handleAckMsg(cmd, result, info) // handleAckMsg(cmd, result, info)
// //
// Translate ACC ack into MAC state.
//
void CEPApplMgr::handleAckMsg(ACCmd cmd, void CEPApplMgr::handleAckMsg(ACCmd cmd,
uint16 result, uint16 ACCresult,
const string& info) const string& info)
{ {
LOG_INFO(formatString("command: %d, result: %d, info: %s", cmd, result, info.c_str())); LOG_INFO(formatString("command: %d, result: %d, info: %s", cmd, ACCresult, info.c_str()));
uint16 MACresult = (ACCresult & AcCmdMaskOk) ?
CT_RESULT_NO_ERROR : CT_RESULT_UNSPECIFIED;
switch (cmd) { switch (cmd) {
case ACCmdBoot: case ACCmdBoot:
if (result == AcCmdMaskOk) { if (ACCresult == AcCmdMaskOk) {
itsLastOkCmd = cmd; itsCurState = CTState::CONNECTED;
} }
itsCAMInterface.appBooted(itsProcName, result); itsCAMInterface.appSetStateResult(itsProcName, CTState::CONNECT, MACresult);
break;
case ACCmdQuit:
if (result == AcCmdMaskOk && result == 0) {
itsContinuePoll = false;
}
itsCAMInterface.appQuitDone(itsProcName, result);
break; break;
case ACCmdDefine: case ACCmdDefine:
if (result == AcCmdMaskOk) { if (ACCresult == AcCmdMaskOk) {
itsLastOkCmd = cmd; itsCurState = CTState::CLAIMED;
} }
itsCAMInterface.appDefined(itsProcName, result); itsCAMInterface.appSetStateResult(itsProcName, CTState::CLAIM, MACresult);
break; break;
case ACCmdInit: case ACCmdInit:
if (result == AcCmdMaskOk) { if (ACCresult == AcCmdMaskOk) {
itsLastOkCmd = cmd; itsCurState = CTState::PREPARED;
} }
itsCAMInterface.appInitialized(itsProcName, result); itsCAMInterface.appSetStateResult(itsProcName, CTState::PREPARE, MACresult);
break;
case ACCmdPause:
itsCAMInterface.appPaused(itsProcName, result);
break; break;
case ACCmdRun: case ACCmdRun:
if (result == AcCmdMaskOk) { if (ACCresult == AcCmdMaskOk) {
itsLastOkCmd = cmd; itsCurState = CTState::RESUMED;
} }
itsCAMInterface.appRunDone(itsProcName, result); itsCAMInterface.appSetStateResult(itsProcName, CTState::RESUME, MACresult);
break;
case ACCmdSnapshot:
itsCAMInterface.appSnapshotDone(itsProcName, result);
break;
case ACCmdRecover:
itsCAMInterface.appRecovered(itsProcName, result);
break; break;
case ACCmdReinit: case ACCmdPause:
itsCAMInterface.appReinitialized(itsProcName, result); if (ACCresult == AcCmdMaskOk) {
itsCurState = CTState::SUSPENDED;
}
itsCAMInterface.appSetStateResult(itsProcName, CTState::SUSPEND, MACresult);
break; break;
case ACCmdReplace: case ACCmdQuit:
itsCAMInterface.appReplaced(itsProcName, result); if (ACCresult == AcCmdMaskOk) {
itsContinuePoll = false;
itsCurState = CTState::QUITED;
}
itsCAMInterface.appSetStateResult(itsProcName, CTState::QUIT, MACresult);
break; break;
default: default:
LOG_WARN_STR("Received command = " << cmd << ", result = " << result LOG_WARN_STR("Received command = " << cmd << ", result = " << ACCresult
<< ", info = " << info << " not handled!"); << ", info = " << info << " not handled!");
break; break;
} }
} }
//
// sendCommand (newState, options)
//
// Translate MAC commands into ACC commands.
//
void CEPApplMgr::sendCommand (CTState::CTstateNr newState, const string& options)
{
switch (newState) {
case CTState::CONNECT:
itsACclient.boot(0, options);
break;
case CTState::CLAIM:
itsACclient.define(0);
break;
case CTState::PREPARE:
itsACclient.init(0);
break;
case CTState::RESUME:
itsACclient.run(0);
break;
case CTState::SUSPEND:
itsACclient.pause(0, 0, options);
break;
case CTState::RELEASE: // no ACC equivalent.
ASSERTSTR(false, "RELEASE has no ACC equivalent, programming error");
break;
case CTState::QUIT:
itsACclient.quit(0);
break;
default:
break;
}
}
// //
// handleAnswerMsg(answer) // handleAnswerMsg(answer)
// //
......
MAC/APL/CEPCU/src/OnlineControl/CEPApplMgr.h
+ 60
− 51
View file @ b6c88034
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
//# Includes //# Includes
#include <ALC/ACAsyncClient.h> #include <ALC/ACAsyncClient.h>
#include <GCF/TM/GCF_Handler.h> #include <GCF/TM/GCF_Handler.h>
#include <APL/APLCommon/CTState.h>
//# local includes //# local includes
//# Common Includes //# Common Includes
...@@ -33,26 +34,23 @@ ...@@ -33,26 +34,23 @@
// forward declaration // forward declaration
namespace LOFAR { namespace LOFAR {
using APLCommon::CTState;
namespace CEPCU { namespace CEPCU {
// The CEPApplMgrInterface is an abstract baseclass to define the interface
// the CEPApplMgr will call for passing the results of ACC back to the controller.
class CEPApplMgrInterface class CEPApplMgrInterface
{ {
public: public:
virtual ~CEPApplMgrInterface() {} virtual ~CEPApplMgrInterface() {}
virtual void appBooted (const string& procName, uint16 result) = 0; virtual void appSetStateResult (const string& procName,
virtual void appDefined (const string& procName, uint16 result) = 0; CTState::CTstateNr newState,
virtual void appInitialized (const string& procName, uint16 result) = 0; uint16 result) = 0;
virtual void appRunDone (const string& procName, uint16 result) = 0; virtual string appSupplyInfo (const string& procName,
virtual void appPaused (const string& procName, uint16 result) = 0; const string& keyList) = 0;
virtual void appQuitDone (const string& procName, uint16 result) = 0; virtual void appSupplyInfoAnswer(const string& procName,
virtual void appSnapshotDone (const string& procName, uint16 result) = 0; const string& answer) = 0;
virtual void appRecovered (const string& procName, uint16 result) = 0;
virtual void appReinitialized (const string& procName, uint16 result) = 0;
virtual void appReplaced (const string& procName, uint16 result) = 0;
virtual string appSupplyInfo (const string& procName, const string& keyList) = 0;
virtual void appSupplyInfoAnswer (const string& procName, const string& answer) = 0;
protected: protected:
CEPApplMgrInterface() {} CEPApplMgrInterface() {}
...@@ -65,13 +63,19 @@ private: ...@@ -65,13 +63,19 @@ private:
// The CEPApplMgr class acts as an ACClient for the OnlineController but it
// also an active component because is is also inherited from GCFHandler.
// The GCFHandler-workproc will poll the ACC connection for incomming msgs.
class CEPApplMgr : public ACC::ALC::ACClientFunctions, class CEPApplMgr : public ACC::ALC::ACClientFunctions,
GCF::TM::GCFHandler GCF::TM::GCFHandler
{ {
public: public:
CEPApplMgr(CEPApplMgrInterface& interface, const string& appName); CEPApplMgr(CEPApplMgrInterface& interface, const string& appName);
virtual ~CEPApplMgr(); virtual ~CEPApplMgr();
// method used by the OnlineController to initiate a new command
void sendCommand (CTState::CTstateNr newState, const string& options);
// methods may be called from specialized CEPApplMgrInterface // methods may be called from specialized CEPApplMgrInterface
bool boot (const time_t scheduleTime, bool boot (const time_t scheduleTime,
const string& configID); const string& configID);
...@@ -94,8 +98,10 @@ public: ...@@ -94,8 +98,10 @@ public:
const string& nodeList, const string& nodeList,
const string& configID) const; const string& configID) const;
string askInfo (const string& keylist) const; string askInfo (const string& keylist) const;
bool cancelCmdQueue () const; bool cancelCmdQueue () const;
ACC::ALC::ACCmd getLastOkCmd() const;
const string& getName() const;
protected: protected:
// protected copy constructor // protected copy constructor
...@@ -117,76 +123,84 @@ private: ...@@ -117,76 +123,84 @@ private:
void handleAnswerMsg (const string& answer); void handleAnswerMsg (const string& answer);
string supplyInfoFunc (const string& keyList); string supplyInfoFunc (const string& keyList);
CEPApplMgrInterface& itsCAMInterface; // --- datamembers ---
ACC::ALC::ACAsyncClient itsACclient; string itsProcName; // my name
bool itsContinuePoll; CEPApplMgrInterface& itsCAMInterface; // link to OnlineController
ACC::ALC::ACCmd itsLastOkCmd; ACC::ALC::ACAsyncClient itsACclient; // link to ACC controller
string itsProcName; uint16 itsReqState; // requested state
uint16 itsCurState; // reached state
bool itsContinuePoll; // for workProc
// ACC::ALC::ACCmd itsLastOkCmd;
}; };
inline bool CEPApplMgr::boot (const time_t scheduleTime, inline const string& CEPApplMgr::getName() const
const string& configID) {
return (itsProcName);
}
inline bool CEPApplMgr::boot(const time_t scheduleTime,
const string& configID)
{ {
itsContinuePoll = true; itsContinuePoll = true;
return itsACclient.boot(scheduleTime, configID); return (itsACclient.boot(scheduleTime, configID));
} }
inline bool CEPApplMgr::define (const time_t scheduleTime) const inline bool CEPApplMgr::define(const time_t scheduleTime) const
{ {
return itsACclient.define(scheduleTime); return (itsACclient.define(scheduleTime));
} }
inline bool CEPApplMgr::init (const time_t scheduleTime) const inline bool CEPApplMgr::init(const time_t scheduleTime) const
{ {
return itsACclient.init(scheduleTime); return (itsACclient.init(scheduleTime));
} }
inline bool CEPApplMgr::run (const time_t scheduleTime) const inline bool CEPApplMgr::run(const time_t scheduleTime) const
{ {
return itsACclient.run(scheduleTime); return (itsACclient.run(scheduleTime));
} }
inline bool CEPApplMgr::pause (const time_t scheduleTime, inline bool CEPApplMgr::pause (const time_t scheduleTime,
const time_t maxWaitTime, const time_t maxWaitTime,
const string& condition) const const string& condition) const
{ {
return itsACclient.pause(scheduleTime, maxWaitTime, condition); return (itsACclient.pause(scheduleTime, maxWaitTime, condition));
} }
inline bool CEPApplMgr::quit (const time_t scheduleTime) const inline bool CEPApplMgr::quit (const time_t scheduleTime) const
{ {
return itsACclient.quit(scheduleTime); return (itsACclient.quit(scheduleTime));
} }
inline bool CEPApplMgr::shutdown (const time_t scheduleTime) const inline bool CEPApplMgr::shutdown (const time_t scheduleTime) const
{ {
return itsACclient.shutdown(scheduleTime); return (itsACclient.shutdown(scheduleTime));
} }
inline bool CEPApplMgr::snapshot (const time_t scheduleTime, inline bool CEPApplMgr::snapshot (const time_t scheduleTime,
const string& destination) const const string& destination) const
{ {
return itsACclient.snapshot(scheduleTime, destination); return (itsACclient.snapshot(scheduleTime, destination));
} }
inline bool CEPApplMgr::recover (const time_t scheduleTime, inline bool CEPApplMgr::recover (const time_t scheduleTime,
const string& source) const const string& source) const
{ {
return itsACclient.recover(scheduleTime, source); return (itsACclient.recover(scheduleTime, source));
} }
inline bool CEPApplMgr::reinit (const time_t scheduleTime, inline bool CEPApplMgr::reinit (const time_t scheduleTime,
const string& configID) const const string& configID) const
{ {
return itsACclient.reinit(scheduleTime, configID); return (itsACclient.reinit(scheduleTime, configID));
} }
inline bool CEPApplMgr::replace (const time_t scheduleTime, inline bool CEPApplMgr::replace (const time_t scheduleTime,
const string& processList, const string& processList,
const string& nodeList, const string& nodeList,
const string& configID) const const string& configID) const
{ {
return itsACclient.replace(scheduleTime, processList, nodeList, configID); return (itsACclient.replace(scheduleTime, processList, nodeList, configID));
} }
inline bool CEPApplMgr::cancelCmdQueue () const inline bool CEPApplMgr::cancelCmdQueue () const
...@@ -194,11 +208,6 @@ inline bool CEPApplMgr::cancelCmdQueue () const ...@@ -194,11 +208,6 @@ inline bool CEPApplMgr::cancelCmdQueue () const
return itsACclient.cancelCmdQueue(); return itsACclient.cancelCmdQueue();
} }
inline ACC::ALC::ACCmd CEPApplMgr::getLastOkCmd() const
{
return itsLastOkCmd;
}
inline void CEPApplMgr::stop() inline void CEPApplMgr::stop()
{ } { }
......
MAC/APL/CEPCU/src/OnlineControl/OnlineControl.cc
+ 310
− 306
View file @ b6c88034
This diff is collapsed.
MAC/APL/CEPCU/src/OnlineControl/OnlineControl.h
+ 39
− 21
View file @ b6c88034
...@@ -89,22 +89,18 @@ public: ...@@ -89,22 +89,18 @@ public:
GCFPortInterface& port); GCFPortInterface& port);
// Interrupthandler for switching to finisingstate when exiting the program // Interrupthandler for switching to finisingstate when exiting the program
static void sigintHandler (int signum); static void signalHandler (int signum);
void finish(); void finish();
protected: // implemenation of abstract CEPApplMgrInterface methods protected: // implemenation of abstract CEPApplMgrInterface methods
void appBooted (const string& procName, uint16 result);
void appDefined (const string& procName, uint16 result);
void appInitialized (const string& procName, uint16 result);
void appRunDone (const string& procName, uint16 result);
void appPaused (const string& procName, uint16 result);
void appQuitDone (const string& procName, uint16 result);
void appSnapshotDone (const string& procName, uint16 result);
void appRecovered (const string& procName, uint16 result);
void appReinitialized (const string& procName, uint16 result);
void appReplaced (const string& procName, uint16 result);
string appSupplyInfo (const string& procName, const string& keyList); string appSupplyInfo (const string& procName, const string& keyList);
void appSupplyInfoAnswer (const string& procName, const string& answer); void appSupplyInfoAnswer (const string& procName, const string& answer);
// A result of one of the applications was received, update the administration
// off the controller and send the result to the parentcontroller if appropriate.
void appSetStateResult (const string& procName,
CTState::CTstateNr newState,
uint16 result);
private: private:
// avoid defaultconstruction and copying // avoid defaultconstruction and copying
...@@ -112,17 +108,32 @@ private: ...@@ -112,17 +108,32 @@ private:
OnlineControl(const OnlineControl&); OnlineControl(const OnlineControl&);
OnlineControl& operator=(const OnlineControl&); OnlineControl& operator=(const OnlineControl&);
uint16_t doClaim(const string& cntlrName); void _doBoot();
uint16_t doPrepare(const string& cntlrName); void _doQuit();
void doRelease(); void _finishController (uint16_t result);
void finishController(uint16_t result); void _connectedHandler (GCFPortInterface& port);
void _connectedHandler(GCFPortInterface& port); void _disconnectedHandler(GCFPortInterface& port);
void _disconnectedHandler(GCFPortInterface& port); void _setState (CTState::CTstateNr newState);
void setState(CTState::CTstateNr newState);
typedef boost::shared_ptr<GCF::PAL::GCFMyPropertySet> GCFMyPropertySetPtr; // Send a command to all (or the first) applications.
void startNewState (CTState::CTstateNr newState,
const string& options);
// typedefs for the internal adminsitration of all the Applications we control
typedef boost::shared_ptr<CEPApplMgr> CEPApplMgrPtr; typedef boost::shared_ptr<CEPApplMgr> CEPApplMgrPtr;
typedef map<string, CEPApplMgrPtr> CAMmap;
typedef map<string, CEPApplMgrPtr>::iterator CAMiter;
// Internal bookkeeping-finctions for the dependancy-order of the applications.
void setApplOrder (vector<string>& anApplOrder);
CAMiter firstApplication(CTState::CTstateNr aState);
CAMiter nextApplication();
bool hasNextApplication();
void noApplication();
typedef boost::shared_ptr<GCF::PAL::GCFMyPropertySet> GCFMyPropertySetPtr;
// ----- datamembers -----
APLCommon::PropertySetAnswer itsPropertySetAnswer; APLCommon::PropertySetAnswer itsPropertySetAnswer;
GCFMyPropertySetPtr itsPropertySet; GCFMyPropertySetPtr itsPropertySet;
bool itsPropertySetInitialized; bool itsPropertySetInitialized;
...@@ -133,12 +144,19 @@ private: ...@@ -133,12 +144,19 @@ private:
GCFTimerPort* itsTimerPort; GCFTimerPort* itsTimerPort;
map<string, CEPApplMgrPtr> itsCepApplications; CAMmap itsCEPapplications;
vector<ACC::APS::ParameterSet> itsCepAppParams;
ACC::APS::ParameterSet itsResultParams; ACC::APS::ParameterSet itsResultParams;
CTState::CTstateNr itsState; CTState::CTstateNr itsState;
bool itsUseApplOrder; // Applications depend?
vector<string> itsApplOrder; // startOrder of the applications.
string itsCurrentAppl; // current application we are handling.
CTState::CTstateNr itsApplState; // state currently handled by apps.
uint16 itsOverallResult;
int16 itsNrOfAcks2Recv;
// ParameterSet variables // ParameterSet variables
string itsTreePrefix; string itsTreePrefix;
uint32 itsInstanceNr; uint32 itsInstanceNr;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment