PSB improvements
This commit is contained in:
parent
860cdba94d
commit
ed7b4e2a3a
@ -1,5 +1,6 @@
|
|||||||
#include <framework/objectmanager/ObjectManager.h>
|
#include <framework/objectmanager/ObjectManager.h>
|
||||||
#include <framework/serviceinterface/ServiceInterfaceStream.h>
|
#include <framework/serviceinterface/ServiceInterfaceStream.h>
|
||||||
|
#include <iomanip>
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
|
|
||||||
ObjectManager::ObjectManager( void (*setProducer)() ):
|
ObjectManager::ObjectManager( void (*setProducer)() ):
|
||||||
|
@ -9,10 +9,11 @@
|
|||||||
object_id_t PusServiceBase::packetSource = 0;
|
object_id_t PusServiceBase::packetSource = 0;
|
||||||
object_id_t PusServiceBase::packetDestination = 0;
|
object_id_t PusServiceBase::packetDestination = 0;
|
||||||
|
|
||||||
PusServiceBase::PusServiceBase(object_id_t setObjectId, uint16_t setApid, uint8_t setServiceId) :
|
PusServiceBase::PusServiceBase(object_id_t setObjectId, uint16_t setApid,
|
||||||
SystemObject(setObjectId), apid(setApid), serviceId(setServiceId), errorParameter1(
|
uint8_t setServiceId) :
|
||||||
0), errorParameter2(0), requestQueue(NULL) {
|
SystemObject(setObjectId), apid(setApid), serviceId(setServiceId) {
|
||||||
requestQueue = QueueFactory::instance()->createMessageQueue(PUS_SERVICE_MAX_RECEPTION);
|
requestQueue = QueueFactory::instance()->
|
||||||
|
createMessageQueue(PUS_SERVICE_MAX_RECEPTION);
|
||||||
}
|
}
|
||||||
|
|
||||||
PusServiceBase::~PusServiceBase() {
|
PusServiceBase::~PusServiceBase() {
|
||||||
@ -20,51 +21,60 @@ PusServiceBase::~PusServiceBase() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ReturnValue_t PusServiceBase::performOperation(uint8_t opCode) {
|
ReturnValue_t PusServiceBase::performOperation(uint8_t opCode) {
|
||||||
|
handleRequestQueue();
|
||||||
|
ReturnValue_t result = this->performService();
|
||||||
|
if (result != RETURN_OK) {
|
||||||
|
sif::error << "PusService " << (uint16_t) this->serviceId
|
||||||
|
<< ": performService returned with " << (int16_t) result
|
||||||
|
<< std::endl;
|
||||||
|
return RETURN_FAILED;
|
||||||
|
}
|
||||||
|
return RETURN_OK;
|
||||||
|
}
|
||||||
|
|
||||||
|
void PusServiceBase::handleRequestQueue() {
|
||||||
TmTcMessage message;
|
TmTcMessage message;
|
||||||
|
ReturnValue_t result = RETURN_FAILED;
|
||||||
for (uint8_t count = 0; count < PUS_SERVICE_MAX_RECEPTION; count++) {
|
for (uint8_t count = 0; count < PUS_SERVICE_MAX_RECEPTION; count++) {
|
||||||
ReturnValue_t status = this->requestQueue->receiveMessage(&message);
|
ReturnValue_t status = this->requestQueue->receiveMessage(&message);
|
||||||
// debug << "PusServiceBase::performOperation: Receiving from MQ ID: " << std::hex << this->requestQueue.getId()
|
// debug << "PusServiceBase::performOperation: Receiving from MQ ID: "
|
||||||
// << std::dec << " returned: " << status << std::endl;
|
// << std::hex << this->requestQueue.getId()
|
||||||
|
// << std::dec << " returned: " << status << std::endl;
|
||||||
if (status == RETURN_OK) {
|
if (status == RETURN_OK) {
|
||||||
this->currentPacket.setStoreAddress(message.getStorageId());
|
this->currentPacket.setStoreAddress(message.getStorageId());
|
||||||
// info << "Service " << (uint16_t) this->serviceId << ": new packet!" << std::endl;
|
//info << "Service " << (uint16_t) this->serviceId <<
|
||||||
|
// ": new packet!" << std::endl;
|
||||||
|
|
||||||
ReturnValue_t return_code = this->handleRequest(currentPacket.getSubService());
|
result = this->handleRequest(currentPacket.getSubService());
|
||||||
|
|
||||||
// debug << "Service " << (uint16_t)this->serviceId << ": handleRequest returned: " << (int)return_code << std::endl;
|
// debug << "Service " << (uint16_t)this->serviceId <<
|
||||||
if (return_code == RETURN_OK) {
|
// ": handleRequest returned: " << (int)return_code << std::endl;
|
||||||
|
if (result == RETURN_OK) {
|
||||||
this->verifyReporter.sendSuccessReport(
|
this->verifyReporter.sendSuccessReport(
|
||||||
TC_VERIFY::COMPLETION_SUCCESS, &this->currentPacket);
|
TC_VERIFY::COMPLETION_SUCCESS, &this->currentPacket);
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
this->verifyReporter.sendFailureReport(
|
this->verifyReporter.sendFailureReport(
|
||||||
TC_VERIFY::COMPLETION_FAILURE, &this->currentPacket,
|
TC_VERIFY::COMPLETION_FAILURE, &this->currentPacket,
|
||||||
return_code, 0, errorParameter1, errorParameter2);
|
result, 0, errorParameter1, errorParameter2);
|
||||||
}
|
}
|
||||||
this->currentPacket.deletePacket();
|
this->currentPacket.deletePacket();
|
||||||
errorParameter1 = 0;
|
errorParameter1 = 0;
|
||||||
errorParameter2 = 0;
|
errorParameter2 = 0;
|
||||||
} else if (status == MessageQueueIF::EMPTY) {
|
}
|
||||||
|
else if (status == MessageQueueIF::EMPTY) {
|
||||||
status = RETURN_OK;
|
status = RETURN_OK;
|
||||||
// debug << "PusService " << (uint16_t)this->serviceId << ": no new packet." << std::endl;
|
// debug << "PusService " << (uint16_t)this->serviceId <<
|
||||||
|
// ": no new packet." << std::endl;
|
||||||
break;
|
break;
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
sif::error << "PusServiceBase::performOperation: Service "
|
sif::error << "PusServiceBase::performOperation: Service "
|
||||||
<< (uint16_t) this->serviceId
|
<< (uint16_t) this->serviceId
|
||||||
<< ": Error receiving packet. Code: " << std::hex << status
|
<< ": Error receiving packet. Code: " << std::hex << status
|
||||||
<< std::dec << std::endl;
|
<< std::dec << std::endl;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ReturnValue_t return_code = this->performService();
|
|
||||||
if (return_code == RETURN_OK) {
|
|
||||||
return RETURN_OK;
|
|
||||||
} else {
|
|
||||||
|
|
||||||
sif::error << "PusService " << (uint16_t) this->serviceId
|
|
||||||
<< ": performService returned with " << (int16_t) return_code
|
|
||||||
<< std::endl;
|
|
||||||
return RETURN_FAILED;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
uint16_t PusServiceBase::getIdentifier() {
|
uint16_t PusServiceBase::getIdentifier() {
|
||||||
@ -80,19 +90,21 @@ ReturnValue_t PusServiceBase::initialize() {
|
|||||||
if (result != RETURN_OK) {
|
if (result != RETURN_OK) {
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
AcceptsTelemetryIF* dest_service = objectManager->get<AcceptsTelemetryIF>(
|
AcceptsTelemetryIF* destService = objectManager->get<AcceptsTelemetryIF>(
|
||||||
packetDestination);
|
packetDestination);
|
||||||
PUSDistributorIF* distributor = objectManager->get<PUSDistributorIF>(
|
PUSDistributorIF* distributor = objectManager->get<PUSDistributorIF>(
|
||||||
packetSource);
|
packetSource);
|
||||||
if ((dest_service != NULL) && (distributor != NULL)) {
|
if ((destService != nullptr) && (distributor != nullptr)) {
|
||||||
this->requestQueue->setDefaultDestination(
|
this->requestQueue->setDefaultDestination(
|
||||||
dest_service->getReportReceptionQueue());
|
destService->getReportReceptionQueue());
|
||||||
distributor->registerService(this);
|
distributor->registerService(this);
|
||||||
return RETURN_OK;
|
return RETURN_OK;
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
sif::error << "PusServiceBase::PusServiceBase: Service "
|
sif::error << "PusServiceBase::PusServiceBase: Service "
|
||||||
<< (uint32_t) this->serviceId << ": Configuration error."
|
<< (uint32_t) this->serviceId << ": Configuration error."
|
||||||
<< " Make sure packetSource and packetDestination are defined correctly" << std::endl;
|
<< " Make sure packetSource and packetDestination are defined "
|
||||||
|
"correctly" << std::endl;
|
||||||
return RETURN_FAILED;
|
return RETURN_FAILED;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -97,16 +97,16 @@ protected:
|
|||||||
/**
|
/**
|
||||||
* One of two error parameters for additional error information.
|
* One of two error parameters for additional error information.
|
||||||
*/
|
*/
|
||||||
uint32_t errorParameter1;
|
uint32_t errorParameter1 = 0;
|
||||||
/**
|
/**
|
||||||
* One of two error parameters for additional error information.
|
* One of two error parameters for additional error information.
|
||||||
*/
|
*/
|
||||||
uint32_t errorParameter2;
|
uint32_t errorParameter2 = 0;
|
||||||
/**
|
/**
|
||||||
* This is a complete instance of the Telecommand reception queue of the class.
|
* This is a complete instance of the Telecommand reception queue of the class.
|
||||||
* It is initialized on construction of the class.
|
* It is initialized on construction of the class.
|
||||||
*/
|
*/
|
||||||
MessageQueueIF* requestQueue;
|
MessageQueueIF* requestQueue = nullptr;
|
||||||
/**
|
/**
|
||||||
* An instance of the VerificationReporter class, that simplifies sending any kind of
|
* An instance of the VerificationReporter class, that simplifies sending any kind of
|
||||||
* Verification Message to the TC Verification Service.
|
* Verification Message to the TC Verification Service.
|
||||||
@ -127,6 +127,8 @@ private:
|
|||||||
* Remember that one packet must be completely handled in one #handleRequest call.
|
* Remember that one packet must be completely handled in one #handleRequest call.
|
||||||
*/
|
*/
|
||||||
static const uint8_t PUS_SERVICE_MAX_RECEPTION = 10;
|
static const uint8_t PUS_SERVICE_MAX_RECEPTION = 10;
|
||||||
|
|
||||||
|
void handleRequestQueue();
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* PUSSERVICEBASE_H_ */
|
#endif /* PUSSERVICEBASE_H_ */
|
||||||
|
Loading…
Reference in New Issue
Block a user