diff --git a/MAC/APL/APLCommon/src/ParentControl.cc b/MAC/APL/APLCommon/src/ParentControl.cc
index 448aab84b75cc3bad33505c279571fce96602c58..e26a4de940b55dfba42ad8b0b7af8fe6b5df152d 100644
--- a/MAC/APL/APLCommon/src/ParentControl.cc
+++ b/MAC/APL/APLCommon/src/ParentControl.cc
@@ -129,7 +129,7 @@ GCFITCPort* ParentControl::registerTask(GCFTask* mainTask)
itsMainTaskPort = new GCFITCPort(*mainTask, *this, mainTask->getName(),
GCFPortInterface::SAP, CONTROLLER_PROTOCOL);
ASSERTSTR(itsMainTaskPort, "Can not allocate ITC port for parent-control");
- itsMainTaskPort->open(); // will result in F_CONN signal
+ itsMainTaskPort->open(); // will result in F_CONN signal in main task!!!!
itsSDPort = new GCFTCPPort(*this, MAC_SVCMASK_STARTDAEMON,
GCFPortInterface::SAP, STARTDAEMON_PROTOCOL);
diff --git a/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.cc b/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.cc
index ff835e844483d75359c11cfe665bd2afbe4b5574..b398ba3e32edb9d302b61ce98a8071ba5f5f8022 100644
--- a/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.cc
+++ b/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.cc
@@ -97,10 +97,6 @@ OnlineControl::OnlineControl(const string& cntlrName) :
// attach to parent control task
itsParentControl = ParentControl::instance();
- itsParentPort = new GCFITCPort (*this, *itsParentControl, "ParentITCport",
- GCFPortInterface::SAP, CONTROLLER_PROTOCOL);
- ASSERTSTR(itsParentPort, "Cannot allocate ITCport for Parentcontrol");
- itsParentPort->open(); // will result in F_CONNECTED
// need port for timers.
itsTimerPort = new GCFTimerPort(*this, "TimerPort");
diff --git a/MAC/APL/CEPCU/src/PythonControl/PythonControl.cc b/MAC/APL/CEPCU/src/PythonControl/PythonControl.cc
index 32463b4beb5fbb2ab816100ecf0ca70a16e63275..0440fabee69ad259cae03b63f32091190db55f54 100644
--- a/MAC/APL/CEPCU/src/PythonControl/PythonControl.cc
+++ b/MAC/APL/CEPCU/src/PythonControl/PythonControl.cc
@@ -83,10 +83,6 @@ PythonControl::PythonControl(const string& cntlrName) :
// attach to parent control task
itsParentControl = ParentControl::instance();
- itsParentPort = new GCFITCPort (*this, *itsParentControl, "ParentITCport",
- GCFPortInterface::SAP, CONTROLLER_PROTOCOL);
- ASSERTSTR(itsParentPort, "Cannot allocate ITCport for Parentcontrol");
- itsParentPort->open(); // will result in F_CONNECTED
itsListener = new GCFTCPPort (*this, "listener", GCFPortInterface::MSPP, CONTROLLER_PROTOCOL);
ASSERTSTR(itsListener, "Cannot allocate TCP for server port");
diff --git a/MAC/APL/CEPCU/src/_OfflineControl/OfflineControl.cc b/MAC/APL/CEPCU/src/_OfflineControl/OfflineControl.cc
index 2412be7ef3d241267bab3f77bd5f81ab0de00c6f..3f09b4c7612d4a9aacb689ef4347ef7bdfd02b7a 100644
--- a/MAC/APL/CEPCU/src/_OfflineControl/OfflineControl.cc
+++ b/MAC/APL/CEPCU/src/_OfflineControl/OfflineControl.cc
@@ -96,10 +96,6 @@ OfflineControl::OfflineControl(const string& cntlrName) :
// attach to parent control task
itsParentControl = ParentControl::instance();
- itsParentPort = new GCFITCPort (*this, *itsParentControl, "ParentITCport",
- GCFPortInterface::SAP, CONTROLLER_PROTOCOL);
- ASSERTSTR(itsParentPort, "Cannot allocate ITCport for Parentcontrol");
- itsParentPort->open(); // will result in F_CONNECTED
// need port for timers.
itsTimerPort = new GCFTimerPort(*this, "TimerPort");
diff --git a/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc b/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc
index 8f0493db8ad2c97bd0acfafb6a3e9c5064827a60..c3eb3d947e160aaffeb910ae2fdc3883914c771a 100644
--- a/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc
+++ b/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc
@@ -334,6 +334,8 @@ GCFEvent::TResult MACScheduler::active_state(GCFEvent& event, GCFPortInterface&
// Start heartbeat timer.
itsSecondTimer = itsTimerPort->setTimer(1L);
+
+ LOG_INFO("MACScheduler now operational");
break;
}
@@ -420,7 +422,7 @@ GCFEvent::TResult MACScheduler::active_state(GCFEvent& event, GCFPortInterface&
case CONTROL_CONNECTED: {
// The observationController has registered itself at childControl.
CONTROLConnectedEvent conEvent(event);
- LOG_DEBUG_STR(conEvent.cntlrName << " is connected, updating SAS)");
+ LOG_INFO_STR(conEvent.cntlrName << " is connected, updating SAS)");
// Ok, controller is really up, update SAS so that obs will not appear in
// in the SAS list again.
@@ -439,7 +441,7 @@ GCFEvent::TResult MACScheduler::active_state(GCFEvent& event, GCFPortInterface&
case CONTROL_QUITED: {
// The observationController is going down.
CONTROLQuitedEvent quitedEvent(event);
- LOG_DEBUG_STR("Received QUITED(" << quitedEvent.cntlrName << "," << quitedEvent.result << ")");
+ LOG_INFO_STR("Received QUITED(" << quitedEvent.cntlrName << "," << quitedEvent.result << ")");
// update SAS database.
CMiter theObs(itsControllerMap.find(quitedEvent.cntlrName));
@@ -458,7 +460,7 @@ GCFEvent::TResult MACScheduler::active_state(GCFEvent& event, GCFPortInterface&
}
// update our administration
- LOG_DEBUG_STR("Removing observation " << quitedEvent.cntlrName <<
+ LOG_INFO_STR("Removing observation " << quitedEvent.cntlrName <<
" from activeList");
// _removeActiveObservation(quitedEvent.cntlrName);
break;
@@ -656,7 +658,7 @@ void MACScheduler::_updatePlannedList()
// the observation will not be returned in the 'plannedDBlist' anymore.
string cntlrName(controllerName(CNTLRTYPE_OBSERVATIONCTRL, 0, obsID));
if (itsControllerMap.find(cntlrName) == itsControllerMap.end()) {
- LOG_DEBUG_STR("Requesting start of " << cntlrName);
+ LOG_INFO_STR("Requesting start of " << cntlrName);
itsChildControl->startChild(CNTLRTYPE_OBSERVATIONCTRL,
obsID,
0, // instanceNr
@@ -685,7 +687,7 @@ void MACScheduler::_updatePlannedList()
while (oldObsIter != backupObsList.end()) {
prepIter = itsPreparedObs.find(oldObsIter->first);
if (prepIter != itsPreparedObs.end()) {
- LOG_INFO_STR("Removing " << oldObsIter->first << " from the prepared list.");
+ LOG_DEBUG_STR("Removing " << oldObsIter->first << " from the prepared list.");
itsPreparedObs.erase(prepIter);
}
oldObsIter++;
diff --git a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
index d952e65fdbb35c97105c9dc9c0dd4a36d35314e3..8f507fd91654fcb96187fe2502bb9f1528b31cb9 100644
--- a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
+++ b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
@@ -119,10 +119,6 @@ ObservationControl::ObservationControl(const string& cntlrName) :
// attach to parent control task
itsParentControl = ParentControl::instance();
- itsParentPort = new GCFITCPort (*this, *itsParentControl, "ParentITCport",
- GCFPortInterface::SAP, CONTROLLER_PROTOCOL);
- ASSERTSTR(itsChildPort, "Cannot allocate ITCport for Parentcontrol");
- itsParentPort->open(); // will result in F_CONNECTED
// need port for timers.
itsTimerPort = new GCFTimerPort(*this, "TimerPort");
diff --git a/MAC/APL/StationCU/src/BeamControl/BeamControl.cc b/MAC/APL/StationCU/src/BeamControl/BeamControl.cc
index 7dd02f1a875c3c5172d310187d5f8cd6ef710ed4..c5a2cfab9899501b45a654649634c18f1b779e21 100644
--- a/MAC/APL/StationCU/src/BeamControl/BeamControl.cc
+++ b/MAC/APL/StationCU/src/BeamControl/BeamControl.cc
@@ -85,10 +85,6 @@ BeamControl::BeamControl(const string& cntlrName) :
// attach to parent control task
itsParentControl = ParentControl::instance();
- itsParentPort = new GCFITCPort (*this, *itsParentControl, "ParentITCport",
- GCFPortInterface::SAP, CONTROLLER_PROTOCOL);
- ASSERTSTR(itsParentPort, "Cannot allocate ITCport for Parentcontrol");
- itsParentPort->open(); // will result in F_CONNECTED
// need port for timers.
itsTimerPort = new GCFTimerPort(*this, "TimerPort");
diff --git a/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.cc b/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.cc
index 1ba4dfcefeecebd8acbfef0cd789406bb0432af6..a17e4959957e38d20fce048588c06ccc54185495 100644
--- a/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.cc
+++ b/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.cc
@@ -81,10 +81,6 @@ CalibrationControl::CalibrationControl(const string& cntlrName) :
// attach to parent control task
itsParentControl = ParentControl::instance();
- itsParentPort = new GCFITCPort (*this, *itsParentControl, "ParentITCport",
- GCFPortInterface::SAP, CONTROLLER_PROTOCOL);
- ASSERTSTR(itsParentPort, "Cannot allocate ITCport for Parentcontrol");
- itsParentPort->open(); // will result in F_CONNECTED
// need port for timers.
itsTimerPort = new GCFTimerPort(*this, "TimerPort");
diff --git a/MAC/APL/StationCU/src/ClockControl/ClockControl.cc b/MAC/APL/StationCU/src/ClockControl/ClockControl.cc
index e4d053ee67eb1bccbac351e697598e084f22b9de..577ecaf42259b8ebba71fd5af844e98ca0f3dbb7 100644
--- a/MAC/APL/StationCU/src/ClockControl/ClockControl.cc
+++ b/MAC/APL/StationCU/src/ClockControl/ClockControl.cc
@@ -81,10 +81,6 @@ ClockControl::ClockControl(const string& cntlrName) :
// attach to parent control task
itsParentControl = ParentControl::instance();
- itsParentPort = new GCFITCPort (*this, *itsParentControl, "ParentITCport",
- GCFPortInterface::SAP, CONTROLLER_PROTOCOL);
- ASSERTSTR(itsParentPort, "Cannot allocate ITCport for Parentcontrol");
- itsParentPort->open(); // will result in F_CONNECTED
// open port for get/set clock/splitters
itsCommandPort = new GCFTCPPort (*this, MAC_SVCMASK_CLOCKCTRL,
@@ -258,8 +254,6 @@ GCFEvent::TResult ClockControl::initial_state(GCFEvent& event,
break;
case F_CONNECTED:
- ASSERTSTR(&port == itsParentPort, "Received unexpected F_CONNECTED at port " << port.getName());
- LOG_INFO_STR("Connected to Parent Control Task");
break;
case F_ACCEPT_REQ:
@@ -826,7 +820,6 @@ GCFEvent::TResult ClockControl::active_state(GCFEvent& event, GCFPortInterface&
LOG_INFO_STR("Received request to switch the splitters " << (request.splittersOn ? "ON" : "OFF"));
itsSplitterRequest = request.splittersOn;
TRAN (ClockControl::setSplitters_state);
- LOG_INFO("@@@@@@@@@@@@@@@");
CLKCTRLSetSplittersAckEvent response;
response.status = CLKCTRL_NO_ERR;
port.send(response);
diff --git a/MAC/APL/StationCU/src/StationControl/StationControl.cc b/MAC/APL/StationCU/src/StationControl/StationControl.cc
index 8a7532f0747e612481ea79da85964f8c0c1992ab..48fb89ad2a052a73342f9d1927989ecc1a5cc0b5 100644
--- a/MAC/APL/StationCU/src/StationControl/StationControl.cc
+++ b/MAC/APL/StationCU/src/StationControl/StationControl.cc
@@ -103,10 +103,6 @@ StationControl::StationControl(const string& cntlrName) :
// attach to parent control task
itsParentControl = ParentControl::instance();
- itsParentPort = new GCFITCPort (*this, *itsParentControl, "ParentITCport",
- GCFPortInterface::SAP, CONTROLLER_PROTOCOL);
- ASSERTSTR(itsParentPort, "Cannot allocate ITCport for Parentcontrol");
- itsParentPort->open(); // will result in F_CONNECTED
// need port for timers.
itsTimerPort = new GCFTimerPort(*this, "TimerPort");