diff --git a/datalinklayer/Clcw.cpp b/datalinklayer/Clcw.cpp index 448d4d7b..ee497e20 100644 --- a/datalinklayer/Clcw.cpp +++ b/datalinklayer/Clcw.cpp @@ -55,7 +55,7 @@ void Clcw::setBitLock(bool bitLock) { } void Clcw::print() { - debug << "Clcw::print: Clcw is: " << std::hex << getAsWhole() << std::dec << std::endl; + sif::debug << "Clcw::print: Clcw is: " << std::hex << getAsWhole() << std::dec << std::endl; } void Clcw::setWhole(uint32_t rawClcw) { diff --git a/datalinklayer/DataLinkLayer.cpp b/datalinklayer/DataLinkLayer.cpp index 70999403..4ca7f270 100644 --- a/datalinklayer/DataLinkLayer.cpp +++ b/datalinklayer/DataLinkLayer.cpp @@ -98,8 +98,8 @@ ReturnValue_t DataLinkLayer::processFrame(uint16_t length) { receivedDataLength = length; ReturnValue_t status = allFramesReception(); if (status != RETURN_OK) { - error << "DataLinkLayer::processFrame: frame reception failed. Error code: " << std::hex - << status << std::dec << std::endl; + sif::error << "DataLinkLayer::processFrame: frame reception failed. " + "Error code: " << std::hex << status << std::dec << std::endl; // currentFrame.print(); return status; } else { @@ -124,7 +124,7 @@ ReturnValue_t DataLinkLayer::initialize() { if ( virtualChannels.begin() != virtualChannels.end() ) { clcw->setVirtualChannel( virtualChannels.begin()->second->getChannelId() ); } else { - error << "DataLinkLayer::initialize: No VC assigned to this DLL instance! " << std::endl; + sif::error << "DataLinkLayer::initialize: No VC assigned to this DLL instance! " << std::endl; return RETURN_FAILED; } diff --git a/datalinklayer/MapPacketExtraction.cpp b/datalinklayer/MapPacketExtraction.cpp index 99a16186..11b0792a 100644 --- a/datalinklayer/MapPacketExtraction.cpp +++ b/datalinklayer/MapPacketExtraction.cpp @@ -36,7 +36,7 @@ ReturnValue_t MapPacketExtraction::extractPackets(TcTransferFrame* frame) { bufferPosition = &packetBuffer[packetLength]; status = RETURN_OK; } else { - error + sif::error << "MapPacketExtraction::extractPackets. Packet too large! Size: " << packetLength << std::endl; clearBuffers(); @@ -58,14 +58,14 @@ ReturnValue_t MapPacketExtraction::extractPackets(TcTransferFrame* frame) { } status = RETURN_OK; } else { - error + sif::error << "MapPacketExtraction::extractPackets. Packet too large! Size: " << packetLength << std::endl; clearBuffers(); status = CONTENT_TOO_LARGE; } } else { - error + sif::error << "MapPacketExtraction::extractPackets. Illegal segment! Last flag: " << (int) lastSegmentationFlag << std::endl; clearBuffers(); @@ -73,7 +73,7 @@ ReturnValue_t MapPacketExtraction::extractPackets(TcTransferFrame* frame) { } break; default: - error + sif::error << "MapPacketExtraction::extractPackets. Illegal segmentationFlag: " << (int) segmentationFlag << std::endl; clearBuffers(); @@ -142,9 +142,9 @@ ReturnValue_t MapPacketExtraction::initialize() { } void MapPacketExtraction::printPacketBuffer(void) { - debug << "DLL: packet_buffer contains: " << std::endl; + sif::debug << "DLL: packet_buffer contains: " << std::endl; for (uint32_t i = 0; i < this->packetLength; ++i) { - debug << "packet_buffer[" << std::dec << i << "]: 0x" << std::hex + sif::debug << "packet_buffer[" << std::dec << i << "]: 0x" << std::hex << (uint16_t) this->packetBuffer[i] << std::endl; } } diff --git a/datalinklayer/TcTransferFrame.cpp b/datalinklayer/TcTransferFrame.cpp index 9ff06448..30398e9b 100644 --- a/datalinklayer/TcTransferFrame.cpp +++ b/datalinklayer/TcTransferFrame.cpp @@ -87,11 +87,11 @@ uint8_t* TcTransferFrame::getFullDataField() { } void TcTransferFrame::print() { - debug << "Raw Frame: " << std::hex << std::endl; + sif::debug << "Raw Frame: " << std::hex << std::endl; for (uint16_t count = 0; count < this->getFullSize(); count++ ) { - debug << (uint16_t)this->getFullFrame()[count] << " "; + sif::debug << (uint16_t)this->getFullFrame()[count] << " "; } - debug << std::dec << std::endl; + sif::debug << std::dec << std::endl; // debug << "Frame Header:" << std::endl; // debug << "Version Number: " << std::hex << (uint16_t)this->current_frame.getVersionNumber() << std::endl; // debug << "Bypass Flag set?| Ctrl Cmd Flag set?: " << (uint16_t)this->current_frame.bypassFlagSet() << " | " << (uint16_t)this->current_frame.controlCommandFlagSet() << std::endl; diff --git a/datalinklayer/TcTransferFrameLocal.cpp b/datalinklayer/TcTransferFrameLocal.cpp index 7362a6ae..79e14167 100644 --- a/datalinklayer/TcTransferFrameLocal.cpp +++ b/datalinklayer/TcTransferFrameLocal.cpp @@ -37,7 +37,7 @@ TcTransferFrameLocal::TcTransferFrameLocal(bool bypass, bool controlCommand, uin this->getFullFrame()[getFullSize()-2] = (crc & 0xFF00) >> 8; this->getFullFrame()[getFullSize()-1] = (crc & 0x00FF); } else { - debug << "TcTransferFrameLocal: dataSize too large: " << dataSize << std::endl; + sif::debug << "TcTransferFrameLocal: dataSize too large: " << dataSize << std::endl; } } else { //No data in frame diff --git a/datalinklayer/VirtualChannelReception.cpp b/datalinklayer/VirtualChannelReception.cpp index cf2f9a5d..373f6c62 100644 --- a/datalinklayer/VirtualChannelReception.cpp +++ b/datalinklayer/VirtualChannelReception.cpp @@ -102,7 +102,7 @@ uint8_t VirtualChannelReception::getChannelId() const { ReturnValue_t VirtualChannelReception::initialize() { ReturnValue_t returnValue = RETURN_FAILED; if ((slidingWindowWidth > 254) || (slidingWindowWidth % 2 != 0)) { - error << "VirtualChannelReception::initialize: Illegal sliding window width: " + sif::error << "VirtualChannelReception::initialize: Illegal sliding window width: " << (int) slidingWindowWidth << std::endl; return RETURN_FAILED; } diff --git a/datapool/DataPool.cpp b/datapool/DataPool.cpp index 89543d77..70a2a3fb 100644 --- a/datapool/DataPool.cpp +++ b/datapool/DataPool.cpp @@ -55,7 +55,7 @@ PoolEntryIF* DataPool::getRawData( uint32_t data_pool_id ) { ReturnValue_t DataPool::freeDataPoolLock() { ReturnValue_t status = mutex->unlockMutex(); if ( status != RETURN_OK ) { - error << "DataPool::DataPool: unlock of mutex failed with error code: " << status << std::endl; + sif::error << "DataPool::DataPool: unlock of mutex failed with error code: " << status << std::endl; } return status; } @@ -63,17 +63,17 @@ ReturnValue_t DataPool::freeDataPoolLock() { ReturnValue_t DataPool::lockDataPool() { ReturnValue_t status = mutex->lockMutex(MutexIF::NO_TIMEOUT); if ( status != RETURN_OK ) { - error << "DataPool::DataPool: lock of mutex failed with error code: " << status << std::endl; + sif::error << "DataPool::DataPool: lock of mutex failed with error code: " << status << std::endl; } return status; } void DataPool::print() { - debug << "DataPool contains: " << std::endl; + sif::debug << "DataPool contains: " << std::endl; std::map::iterator dataPoolIt; dataPoolIt = this->data_pool.begin(); while( dataPoolIt != this->data_pool.end() ) { - debug << std::hex << dataPoolIt->first << std::dec << " |"; + sif::debug << std::hex << dataPoolIt->first << std::dec << " |"; dataPoolIt->second->print(); dataPoolIt++; } diff --git a/datapool/DataSet.cpp b/datapool/DataSet.cpp index b4725c73..b43026af 100644 --- a/datapool/DataSet.cpp +++ b/datapool/DataSet.cpp @@ -31,7 +31,7 @@ ReturnValue_t DataSet::read() { state = DATA_SET_WAS_READ; freeDataPoolLock(); } else { - error << "DataSet::read(): Call made in wrong position." << std::endl; + sif::error << "DataSet::read(): Call made in wrong position." << std::endl; result = SET_WAS_ALREADY_READ; } return result; @@ -68,9 +68,9 @@ ReturnValue_t DataSet::commit() { } else if (registeredVariables[count]->getDataPoolId() != PoolVariableIF::NO_PARAMETER) { if (result != COMMITING_WITHOUT_READING) { - error - << "DataSet::commit(): commit-without-read call made with non write-only variable." - << std::endl; + sif::error << + "DataSet::commit(): commit-without-read " + "call made with non write-only variable." << std::endl; result = COMMITING_WITHOUT_READING; } } @@ -92,7 +92,7 @@ void DataSet::registerVariable(PoolVariableIF* variable) { } } } - error + sif::error << "DataSet::registerVariable: failed. Either NULL, or set is full, or call made in wrong position." << std::endl; return; diff --git a/datapool/PIDReader.h b/datapool/PIDReader.h index 299cc2fe..63a62cf6 100644 --- a/datapool/PIDReader.h +++ b/datapool/PIDReader.h @@ -26,7 +26,7 @@ protected: } else { value = 0; valid = false; - error << "PIDReader: read of PID 0x" << std::hex << parameterId + sif::error << "PIDReader: read of PID 0x" << std::hex << parameterId << std::dec << " failed." << std::endl; return HasReturnvaluesIF::RETURN_FAILED; } diff --git a/datapool/PoolEntry.cpp b/datapool/PoolEntry.cpp index c303e56b..de024c81 100644 --- a/datapool/PoolEntry.cpp +++ b/datapool/PoolEntry.cpp @@ -46,9 +46,10 @@ uint8_t PoolEntry::getValid() { template void PoolEntry::print() { for (uint8_t size = 0; size < this->length; size++ ) { - debug << "| " << std::hex << (double)this->address[size] << (this->valid? " (valid) " : " (invalid) "); + sif::debug << "| " << std::hex << (double)this->address[size] + << (this->valid? " (valid) " : " (invalid) "); } - debug << std::dec << std::endl; + sif::debug << std::dec << std::endl; } template diff --git a/datapool/PoolRawAccess.cpp b/datapool/PoolRawAccess.cpp index 555896bb..ba68bcd2 100644 --- a/datapool/PoolRawAccess.cpp +++ b/datapool/PoolRawAccess.cpp @@ -42,7 +42,7 @@ ReturnValue_t PoolRawAccess::read() { } else { //Error entry does not exist. } - error << "PoolRawAccess: read of DP Variable 0x" << std::hex << dataPoolId + sif::error << "PoolRawAccess: read of DP Variable 0x" << std::hex << dataPoolId << std::dec << " failed." << std::endl; valid = INVALID; typeSize = 0; @@ -123,7 +123,7 @@ ReturnValue_t PoolRawAccess::setEntryFromBigEndian(const uint8_t* buffer, #endif return HasReturnvaluesIF::RETURN_OK; } else { - error << "PoolRawAccess::setEntryFromBigEndian: Illegal sizes: Internal" + sif::error << "PoolRawAccess::setEntryFromBigEndian: Illegal sizes: Internal" << (uint32_t) typeSize << ", Requested: " << setSize << std::endl; return INCORRECT_SIZE; diff --git a/datapool/PoolVariable.h b/datapool/PoolVariable.h index 25345c0a..d395d409 100644 --- a/datapool/PoolVariable.h +++ b/datapool/PoolVariable.h @@ -66,7 +66,7 @@ protected: } else { value = 0; valid = false; - error << "PoolVariable: read of DP Variable 0x" << std::hex + sif::error << "PoolVariable: read of DP Variable 0x" << std::hex << dataPoolId << std::dec << " failed." << std::endl; return HasReturnvaluesIF::RETURN_FAILED; } diff --git a/datapool/PoolVector.h b/datapool/PoolVector.h index d3617d17..929f2d31 100644 --- a/datapool/PoolVector.h +++ b/datapool/PoolVector.h @@ -70,7 +70,7 @@ protected: } else { memset(this->value, 0, vector_size * sizeof(T)); - error << "PoolVector: read of DP Variable 0x" << std::hex + sif::error << "PoolVector: read of DP Variable 0x" << std::hex << dataPoolId << std::dec << " failed." << std::endl; this->valid = INVALID; return HasReturnvaluesIF::RETURN_FAILED; diff --git a/devicehandlers/DeviceHandlerBase.cpp b/devicehandlers/DeviceHandlerBase.cpp index aa2305fe..90875838 100644 --- a/devicehandlers/DeviceHandlerBase.cpp +++ b/devicehandlers/DeviceHandlerBase.cpp @@ -1165,7 +1165,7 @@ void DeviceHandlerBase::buildInternalCommand(void) { if (mode == MODE_NORMAL) { result = buildNormalDeviceCommand(&deviceCommandId); if (result == BUSY) { - debug << std::hex << getObjectId() + sif::debug << std::hex << getObjectId() << ": DHB::buildInternalCommand busy" << std::endl; //so we can track misconfigurations result = NOTHING_TO_SEND; //no need to report this } @@ -1186,7 +1186,7 @@ void DeviceHandlerBase::buildInternalCommand(void) { if (iter == deviceCommandMap.end()) { result = COMMAND_NOT_SUPPORTED; } else if (iter->second.isExecuting) { - debug << std::hex << getObjectId() + sif::debug << std::hex << getObjectId() << ": DHB::buildInternalCommand: Command " << deviceCommandId << " isExecuting" << std::endl; //so we can track misconfigurations return; //this is an internal command, no need to report a failure here, missed reply will track if a reply is too late, otherwise, it's ok diff --git a/devicehandlers/FixedSlotSequence.cpp b/devicehandlers/FixedSlotSequence.cpp index a65dd929..2fa13fae 100644 --- a/devicehandlers/FixedSlotSequence.cpp +++ b/devicehandlers/FixedSlotSequence.cpp @@ -89,17 +89,20 @@ uint32_t FixedSlotSequence::getLengthMs() const { } ReturnValue_t FixedSlotSequence::checkSequence() const { - //Iterate through slotList and check successful creation. Checks if timing is ok (must be ascending) and if all handlers were found. + if(slotList.empty()) { + sif::error << "Fixed Slot Sequence: Slot list is empty!" << std::endl; + return HasReturnvaluesIF::RETURN_FAILED; + } auto slotIt = slotList.begin(); uint32_t count = 0; uint32_t time = 0; while (slotIt != slotList.end()) { if ((*slotIt)->handler == NULL) { - error << "FixedSlotSequene::initialize: ObjectId does not exist!" + sif::error << "FixedSlotSequene::initialize: ObjectId does not exist!" << std::endl; count++; } else if ((*slotIt)->pollingTimeMs < time) { - error << "FixedSlotSequence::initialize: Time: " + sif::error << "FixedSlotSequence::initialize: Time: " << (*slotIt)->pollingTimeMs << " is smaller than previous with " << time << std::endl; count++; diff --git a/devicehandlers/FixedSlotSequence.h b/devicehandlers/FixedSlotSequence.h index f8fd9a36..64c68aea 100644 --- a/devicehandlers/FixedSlotSequence.h +++ b/devicehandlers/FixedSlotSequence.h @@ -6,15 +6,21 @@ #include /** - * \brief This class is the representation of a Polling Sequence Table in software. + * @brief This class is the representation of a Polling Sequence Table in software. * - * \details The FixedSlotSequence object maintains the dynamic execution of device handler objects. - * The main idea is to create a list of device handlers, to announce all handlers to the - * polling sequence and to maintain a list of polling slot objects. This slot list represents the - * Polling Sequence Table in software. Each polling slot contains information to indicate when and - * which device handler shall be executed within a given polling period. - * The sequence is then executed by iterating through this slot list. - * Handlers are invoking by calling a certain function stored in the handler list. + * @details + * The FixedSlotSequence object maintains the dynamic execution of + * device handler objects. + * + * The main idea is to create a list of device handlers, to announce all + * handlers to thepolling sequence and to maintain a list of + * polling slot objects. This slot list represents the Polling Sequence Table + * in software. + * + * Each polling slot contains information to indicate when and + * which device handler shall be executed within a given polling period. + * The sequence is then executed by iterating through this slot list. + * Handlers are invoking by calling a certain function stored in the handler list. */ class FixedSlotSequence { public: @@ -97,6 +103,11 @@ public: */ std::list::iterator current; + /** + * Iterate through slotList and check successful creation. + * Checks if timing is ok (must be ascending) and if all handlers were found. + * @return + */ ReturnValue_t checkSequence() const; protected: diff --git a/events/EventManager.cpp b/events/EventManager.cpp index 01334bac..0f1511e4 100644 --- a/events/EventManager.cpp +++ b/events/EventManager.cpp @@ -117,26 +117,26 @@ void EventManager::printEvent(EventMessage* message) { switch (message->getSeverity()) { case SEVERITY::INFO: // string = translateObject(message->getReporter()); -// info << "EVENT: "; +// sif::info << "EVENT: "; // if (string != 0) { -// info << string; +// sif::info << string; // } else { -// info << "0x" << std::hex << message->getReporter() << std::dec; +// sif::info << "0x" << std::hex << message->getReporter() << std::dec; // } -// info << " reported " << translateEvents(message->getEvent()) << " (" +// sif::info << " reported " << translateEvents(message->getEvent()) << " (" // << std::dec << message->getEventId() << std::hex << ") P1: 0x" // << message->getParameter1() << " P2: 0x" // << message->getParameter2() << std::dec << std::endl; break; default: string = translateObject(message->getReporter()); - error << "EVENT: "; + sif::error << "EVENT: "; if (string != 0) { - error << string; + sif::error << string; } else { - error << "0x" << std::hex << message->getReporter() << std::dec; + sif::error << "0x" << std::hex << message->getReporter() << std::dec; } - error << " reported " << translateEvents(message->getEvent()) << " (" + sif::error << " reported " << translateEvents(message->getEvent()) << " (" << std::dec << message->getEventId() << std::hex << ") P1: 0x" << message->getParameter1() << " P2: 0x" << message->getParameter2() << std::dec << std::endl; diff --git a/health/HealthHelper.cpp b/health/HealthHelper.cpp index 8fc413ed..ed97f3d3 100644 --- a/health/HealthHelper.cpp +++ b/health/HealthHelper.cpp @@ -70,7 +70,7 @@ void HealthHelper::informParent(HasHealthIF::HealthState health, health, oldHealth); if (MessageQueueSenderIF::sendMessage(parentQueue, &message, owner->getCommandQueue()) != HasReturnvaluesIF::RETURN_OK) { - debug << "HealthHelper::informParent: sending health reply failed." + sif::debug << "HealthHelper::informParent: sending health reply failed." << std::endl; } } @@ -89,7 +89,7 @@ void HealthHelper::handleSetHealthCommand(CommandMessage* message) { } if (MessageQueueSenderIF::sendMessage(message->getSender(), &reply, owner->getCommandQueue()) != HasReturnvaluesIF::RETURN_OK) { - debug + sif::debug << "HealthHelper::handleHealthCommand: sending health reply failed." << std::endl; } diff --git a/ipc/MessageQueueMessage.cpp b/ipc/MessageQueueMessage.cpp index 2ff264d8..30e0325c 100644 --- a/ipc/MessageQueueMessage.cpp +++ b/ipc/MessageQueueMessage.cpp @@ -52,12 +52,12 @@ size_t MessageQueueMessage::getMinimumMessageSize() { } void MessageQueueMessage::print() { - debug << "MessageQueueMessage has size: " << this->messageSize << std::hex + sif::debug << "MessageQueueMessage has size: " << this->messageSize << std::hex << std::endl; for (uint8_t count = 0; count < this->messageSize; count++) { - debug << (uint32_t) this->internalBuffer[count] << ":"; + sif::debug << (uint32_t) this->internalBuffer[count] << ":"; } - debug << std::dec << std::endl; + sif::debug << std::dec << std::endl; } void MessageQueueMessage::clear() { diff --git a/ipc/MutexHelper.h b/ipc/MutexHelper.h index 64fabd64..f76ccec4 100644 --- a/ipc/MutexHelper.h +++ b/ipc/MutexHelper.h @@ -10,7 +10,7 @@ public: internalMutex(mutex) { ReturnValue_t status = mutex->lockMutex(timeoutMs); if(status != HasReturnvaluesIF::RETURN_OK){ - error << "MutexHelper: Lock of Mutex failed " << status << std::endl; + sif::error << "MutexHelper: Lock of Mutex failed " << status << std::endl; } } diff --git a/memory/MemoryHelper.cpp b/memory/MemoryHelper.cpp index b204ea42..2a830c5a 100644 --- a/memory/MemoryHelper.cpp +++ b/memory/MemoryHelper.cpp @@ -15,7 +15,7 @@ ReturnValue_t MemoryHelper::handleMemoryCommand(CommandMessage* message) { lastSender = message->getSender(); lastCommand = message->getCommand(); if (busy) { - debug << "MemHelper: Busy!" << std::endl; + sif::debug << "MemHelper: Busy!" << std::endl; } switch (lastCommand) { case MemoryMessage::CMD_MEMORY_DUMP: diff --git a/monitoring/MonitoringMessageContent.h b/monitoring/MonitoringMessageContent.h index e5a7d470..7e1aca62 100644 --- a/monitoring/MonitoringMessageContent.h +++ b/monitoring/MonitoringMessageContent.h @@ -63,7 +63,8 @@ private: if (timeStamper == NULL) { timeStamper = objectManager->get( timeStamperId ); if ( timeStamper == NULL ) { - error << "MonitoringReportContent::checkAndSetStamper: Stamper not found!" << std::endl; + sif::error << "MonitoringReportContent::checkAndSetStamper: " + "Stamper not found!" << std::endl; return false; } } diff --git a/objectmanager/ObjectManager.cpp b/objectmanager/ObjectManager.cpp index 75ca1a60..2f99e1a5 100644 --- a/objectmanager/ObjectManager.cpp +++ b/objectmanager/ObjectManager.cpp @@ -17,10 +17,12 @@ ObjectManager::~ObjectManager() { ReturnValue_t ObjectManager::insert( object_id_t id, SystemObjectIF* object) { bool insert_return = this->objectList.insert( std::pair< object_id_t, SystemObjectIF* >( id, object ) ).second; if (insert_return == true) { -// debug << "ObjectManager::insert: Object " << std::hex << (int)id << std::dec << " inserted." << std::endl; + // sif::debug << "ObjectManager::insert: Object " << std::hex + // << (int)id << std::dec << " inserted." << std::endl; return this->RETURN_OK; } else { - error << "ObjectManager::insert: Object id " << std::hex << (int)id << std::dec << " is already in use!" << std::endl; + sif::error << "ObjectManager::insert: Object id " << std::hex + << (int)id << std::dec << " is already in use!" << std::endl; exit(0); //This is very severe and difficult to handle in other places. return this->INSERTION_FAILED; } @@ -29,10 +31,12 @@ ReturnValue_t ObjectManager::insert( object_id_t id, SystemObjectIF* object) { ReturnValue_t ObjectManager::remove( object_id_t id ) { if ( this->getSystemObject(id) != NULL ) { this->objectList.erase( id ); - debug << "ObjectManager::removeObject: Object " << std::hex << (int)id << std::dec << " removed." << std::endl; + sif::debug << "ObjectManager::removeObject: Object " << std::hex + << (int)id << std::dec << " removed." << std::endl; return RETURN_OK; } else { - error << "ObjectManager::removeObject: Requested object "<< std::hex << (int)id << std::dec << " not found." << std::endl; + sif::error << "ObjectManager::removeObject: Requested object " + << std::hex << (int)id << std::dec << " not found." << std::endl; return NOT_FOUND; } } @@ -63,32 +67,38 @@ void ObjectManager::initialize() { return_value = it->second->initialize(); if ( return_value != RETURN_OK ) { object_id_t var = it->first; - error << "Object " << std::hex << (int) var << " failed to initialize with code 0x" << return_value << std::dec << std::endl; + sif::error << "Object " << std::hex << (int) var + << " failed to initialize with code 0x" << return_value + << std::dec << std::endl; error_count++; } } if (error_count > 0) { - error << "ObjectManager::ObjectManager: Counted " << error_count << " failed initializations." << std::endl; + sif::error << "ObjectManager::ObjectManager: Counted " << error_count + << " failed initializations." << std::endl; } //Init was successful. Now check successful interconnections. error_count = 0; for (std::map::iterator it = this->objectList.begin(); it != objectList.end(); it++ ) { return_value = it->second->checkObjectConnections(); if ( return_value != RETURN_OK ) { - error << "Object " << std::hex << (int) it->first << " connection check failed with code 0x" << return_value << std::dec << std::endl; + sif::error << "Object " << std::hex << (int) it->first + << " connection check failed with code 0x" << return_value + << std::dec << std::endl; error_count++; } } if (error_count > 0) { - error << "ObjectManager::ObjectManager: Counted " << error_count << " failed connection checks." << std::endl; + sif::error << "ObjectManager::ObjectManager: Counted " << error_count + << " failed connection checks." << std::endl; } } void ObjectManager::printList() { std::map::iterator it; - debug << "ObjectManager: Object List contains:" << std::endl; + sif::debug << "ObjectManager: Object List contains:" << std::endl; for (it = this->objectList.begin(); it != this->objectList.end(); it++) { - debug << std::hex << it->first << " | " << it->second << std::endl; + sif::debug << std::hex << it->first << " | " << it->second << std::endl; } } diff --git a/osal/FreeRTOS/FixedTimeslotTask.cpp b/osal/FreeRTOS/FixedTimeslotTask.cpp index 00fd73d3..fb3c3b03 100644 --- a/osal/FreeRTOS/FixedTimeslotTask.cpp +++ b/osal/FreeRTOS/FixedTimeslotTask.cpp @@ -19,8 +19,7 @@ FixedTimeslotTask::~FixedTimeslotTask() { void FixedTimeslotTask::taskEntryPoint(void* argument) { //The argument is re-interpreted as FixedTimeslotTask. The Task object is global, so it is found from any place. - FixedTimeslotTask *originalTask( - reinterpret_cast(argument)); + FixedTimeslotTask *originalTask(reinterpret_cast(argument)); // Task should not start until explicitly requested // in FreeRTOS, tasks start as soon as they are created if the scheduler is running // but not if the scheduler is not running. @@ -33,14 +32,14 @@ void FixedTimeslotTask::taskEntryPoint(void* argument) { } originalTask->taskFunctionality(); - debug << "Polling task " << originalTask->handle + sif::debug << "Polling task " << originalTask->handle << " returned from taskFunctionality." << std::endl; } void FixedTimeslotTask::missedDeadlineCounter() { FixedTimeslotTask::deadlineMissedCount++; if (FixedTimeslotTask::deadlineMissedCount % 10 == 0) { - error << "PST missed " << FixedTimeslotTask::deadlineMissedCount + sif::error << "PST missed " << FixedTimeslotTask::deadlineMissedCount << " deadlines." << std::endl; } } @@ -58,8 +57,19 @@ ReturnValue_t FixedTimeslotTask::startTask() { ReturnValue_t FixedTimeslotTask::addSlot(object_id_t componentId, uint32_t slotTimeMs, int8_t executionStep) { - pst.addSlot(componentId, slotTimeMs, executionStep, this); - return HasReturnvaluesIF::RETURN_OK; + if (objectManager->get(componentId) != nullptr) { + if(slotTimeMs == 0) { + // FreeRTOS throws a sanity error for zero values, so we set + // the time to one millisecond. + slotTimeMs = 1; + } + pst.addSlot(componentId, slotTimeMs, executionStep, this); + return HasReturnvaluesIF::RETURN_OK; + } + + sif::error << "Component " << std::hex << componentId << + " not found, not adding it to pst" << std::endl; + return HasReturnvaluesIF::RETURN_FAILED; } uint32_t FixedTimeslotTask::getPeriodMs() const { diff --git a/osal/FreeRTOS/MessageQueue.cpp b/osal/FreeRTOS/MessageQueue.cpp index 887df392..e5da0442 100644 --- a/osal/FreeRTOS/MessageQueue.cpp +++ b/osal/FreeRTOS/MessageQueue.cpp @@ -8,7 +8,7 @@ MessageQueue::MessageQueue(size_t message_depth, size_t max_message_size) : defaultDestination(0),lastPartner(0) { handle = xQueueCreate(message_depth, max_message_size); if (handle == NULL) { - error << "MessageQueue creation failed" << std::endl; + sif::error << "MessageQueue creation failed" << std::endl; } } diff --git a/osal/FreeRTOS/PeriodicTask.cpp b/osal/FreeRTOS/PeriodicTask.cpp index 5e16a4df..deab2dc1 100644 --- a/osal/FreeRTOS/PeriodicTask.cpp +++ b/osal/FreeRTOS/PeriodicTask.cpp @@ -10,7 +10,8 @@ PeriodicTask::PeriodicTask(const char *name, TaskPriority setPriority, BaseType_t status = xTaskCreate(taskEntryPoint, name, setStack, this, setPriority, &handle); if(status != pdPASS){ - debug << "PeriodicTask Insufficient heap memory remaining. Status: " << status << std::endl; + sif::debug << "PeriodicTask Insufficient heap memory remaining. Status: " + << status << std::endl; } } @@ -34,7 +35,7 @@ void PeriodicTask::taskEntryPoint(void* argument) { } originalTask->taskFunctionality(); - debug << "Polling task " << originalTask->handle + sif::debug << "Polling task " << originalTask->handle << " returned from taskFunctionality." << std::endl; } diff --git a/osal/linux/FixedTimeslotTask.cpp b/osal/linux/FixedTimeslotTask.cpp index 99cbf818..098753a7 100644 --- a/osal/linux/FixedTimeslotTask.cpp +++ b/osal/linux/FixedTimeslotTask.cpp @@ -9,7 +9,9 @@ uint32_t FixedTimeslotTask::deadlineMissedCount = 0; const size_t PeriodicTaskIF::MINIMUM_STACK_SIZE = PTHREAD_STACK_MIN; -FixedTimeslotTask::FixedTimeslotTask(const char* name_, int priority_, size_t stackSize_, uint32_t periodMs_):PosixThread(name_,priority_,stackSize_),pst(periodMs_),started(false) { +FixedTimeslotTask::FixedTimeslotTask(const char* name_, int priority_, + size_t stackSize_, uint32_t periodMs_): + PosixThread(name_,priority_,stackSize_),pst(periodMs_),started(false) { } FixedTimeslotTask::~FixedTimeslotTask() { @@ -40,8 +42,14 @@ uint32_t FixedTimeslotTask::getPeriodMs() const { ReturnValue_t FixedTimeslotTask::addSlot(object_id_t componentId, uint32_t slotTimeMs, int8_t executionStep) { - pst.addSlot(componentId, slotTimeMs, executionStep, this); - return HasReturnvaluesIF::RETURN_OK; + if (objectManager->get(componentId) != nullptr) { + pst.addSlot(componentId, slotTimeMs, executionStep, this); + return HasReturnvaluesIF::RETURN_OK; + } + + sif::error << "Component " << std::hex << componentId << + " not found, not adding it to pst" << std::endl; + return HasReturnvaluesIF::RETURN_FAILED; } ReturnValue_t FixedTimeslotTask::checkSequence() const { @@ -80,7 +88,7 @@ void FixedTimeslotTask::taskFunctionality() { void FixedTimeslotTask::missedDeadlineCounter() { FixedTimeslotTask::deadlineMissedCount++; if (FixedTimeslotTask::deadlineMissedCount % 10 == 0) { - error << "PST missed " << FixedTimeslotTask::deadlineMissedCount - << " deadlines." << std::endl; + sif::error << "PST missed " << FixedTimeslotTask::deadlineMissedCount + << " deadlines." << std::endl; } } diff --git a/osal/linux/MessageQueue.cpp b/osal/linux/MessageQueue.cpp index a2e87875..edabe946 100644 --- a/osal/linux/MessageQueue.cpp +++ b/osal/linux/MessageQueue.cpp @@ -17,11 +17,11 @@ MessageQueue::MessageQueue(size_t message_depth, size_t max_message_size) : attributes.mq_maxmsg = message_depth; attributes.mq_msgsize = max_message_size; attributes.mq_flags = 0; //Flags are ignored on Linux during mq_open - //Set the name of the queue sprintf(name, "/Q%u\n", queueCounter++); - //Create a nonblocking queue if the name is available (the queue is Read and writable for the owner as well as the group) + //Create a nonblocking queue if the name is available (the queue is Read and + // writable for the owner as well as the group) mqd_t tempId = mq_open(name, O_NONBLOCK | O_RDWR | O_CREAT | O_EXCL, S_IWUSR | S_IREAD | S_IWGRP | S_IRGRP | S_IROTH | S_IWOTH, &attributes); if (tempId == -1) { @@ -32,8 +32,8 @@ MessageQueue::MessageQueue(size_t message_depth, size_t max_message_size) : //We unlink the other queue int status = mq_unlink(name); if (status != 0) { - error << "mq_unlink Failed with status: " << strerror(errno) - << std::endl; + sif::error << "mq_unlink Failed with status: " << strerror(errno) + << std::endl; } else { //Successful unlinking, try to open again mqd_t tempId = mq_open(name, @@ -47,7 +47,7 @@ MessageQueue::MessageQueue(size_t message_depth, size_t max_message_size) : } } //Failed either the first time or the second time - error << "MessageQueue::MessageQueue: Creating Queue " << std::hex + sif::error << "MessageQueue::MessageQueue: Creating Queue " << std::hex << name << std::dec << " failed with status: " << strerror(errno) << std::endl; } else { @@ -59,11 +59,13 @@ MessageQueue::MessageQueue(size_t message_depth, size_t max_message_size) : MessageQueue::~MessageQueue() { int status = mq_close(this->id); if(status != 0){ - error << "MessageQueue::Destructor: mq_close Failed with status: " << strerror(errno) <(message->getBuffer()),message->MAX_MESSAGE_SIZE,&messagePriority); + int status = mq_receive(id,reinterpret_cast(message->getBuffer()), + message->MAX_MESSAGE_SIZE,&messagePriority); if (status > 0) { this->lastPartner = message->getSender(); //Check size of incoming message. @@ -114,7 +117,8 @@ ReturnValue_t MessageQueue::receiveMessage(MessageQueueMessage* message) { return MessageQueueIF::EMPTY; case EBADF: //mqdes doesn't represent a valid queue open for reading. - error << "MessageQueue::receive: configuration error " << strerror(errno) << std::endl; + sif::error << "MessageQueue::receive: configuration error " + << strerror(errno) << std::endl; /*NO BREAK*/ case EINVAL: /* @@ -123,7 +127,8 @@ ReturnValue_t MessageQueue::receiveMessage(MessageQueueMessage* message) { * * The number of bytes requested, msg_len is less than zero. * * msg_len is anything other than the mq_msgsize of the specified queue, and the QNX extended option MQ_READBUF_DYNAMIC hasn't been set in the queue's mq_flags. */ - error << "MessageQueue::receive: configuration error " << strerror(errno) << std::endl; + sif::error << "MessageQueue::receive: configuration error " + << strerror(errno) << std::endl; /*NO BREAK*/ case EMSGSIZE: /* @@ -131,7 +136,8 @@ ReturnValue_t MessageQueue::receiveMessage(MessageQueueMessage* message) { * * the QNX extended option MQ_READBUF_DYNAMIC hasn't been set, and the given msg_len is shorter than the mq_msgsize for the given queue. * * the extended option MQ_READBUF_DYNAMIC has been set, but the given msg_len is too short for the message that would have been received. */ - error << "MessageQueue::receive: configuration error " << strerror(errno) << std::endl; + sif::error << "MessageQueue::receive: configuration error " + << strerror(errno) << std::endl; /*NO BREAK*/ case EINTR: //The operation was interrupted by a signal. @@ -154,7 +160,8 @@ ReturnValue_t MessageQueue::flush(uint32_t* count) { switch(errno){ case EBADF: //mqdes doesn't represent a valid message queue. - error << "MessageQueue::flush configuration error, called flush with an invalid queue ID" << std::endl; + sif::error << "MessageQueue::flush configuration error, " + "called flush with an invalid queue ID" << std::endl; /*NO BREAK*/ case EINVAL: //mq_attr is NULL @@ -169,7 +176,8 @@ ReturnValue_t MessageQueue::flush(uint32_t* count) { switch(errno){ case EBADF: //mqdes doesn't represent a valid message queue. - error << "MessageQueue::flush configuration error, called flush with an invalid queue ID" << std::endl; + sif::error << "MessageQueue::flush configuration error, " + "called flush with an invalid queue ID" << std::endl; /*NO BREAK*/ case EINVAL: /* @@ -237,7 +245,9 @@ ReturnValue_t MessageQueue::sendMessageFromMessageQueue(MessageQueueId_t sendTo, return MessageQueueIF::FULL; case EBADF: //mq_des doesn't represent a valid message queue descriptor, or mq_des wasn't opened for writing. - error << "MessageQueue::sendMessage: Configuration error " << strerror(errno) << " in mq_send mqSendTo: " << sendTo << " sent from " << sentFrom << std::endl; + sif::error << "MessageQueue::sendMessage: Configuration error " + << strerror(errno) << " in mq_send mqSendTo: " << sendTo + << " sent from " << sentFrom << std::endl; /*NO BREAK*/ case EINTR: //The call was interrupted by a signal. @@ -248,9 +258,11 @@ ReturnValue_t MessageQueue::sendMessageFromMessageQueue(MessageQueueId_t sendTo, * * msg_len is negative. * * msg_prio is greater than MQ_PRIO_MAX. * * msg_prio is less than 0. - * * MQ_PRIO_RESTRICT is set in the mq_attr of mq_des, and msg_prio is greater than the priority of the calling process. + * * MQ_PRIO_RESTRICT is set in the mq_attr of mq_des, + * and msg_prio is greater than the priority of the calling process. * */ - error << "MessageQueue::sendMessage: Configuration error " << strerror(errno) << " in mq_send" << std::endl; + sif::error << "MessageQueue::sendMessage: Configuration error " + << strerror(errno) << " in mq_send" << std::endl; /*NO BREAK*/ case EMSGSIZE: //The msg_len is greater than the msgsize associated with the specified queue. diff --git a/osal/linux/Mutex.cpp b/osal/linux/Mutex.cpp index 055270b3..36bb3ce4 100644 --- a/osal/linux/Mutex.cpp +++ b/osal/linux/Mutex.cpp @@ -13,22 +13,22 @@ Mutex::Mutex() { pthread_mutexattr_t mutexAttr; int status = pthread_mutexattr_init(&mutexAttr); if (status != 0) { - error << "Mutex: Attribute init failed with: " << strerror(status) << std::endl; + sif::error << "Mutex: Attribute init failed with: " << strerror(status) << std::endl; } status = pthread_mutexattr_setprotocol(&mutexAttr, PTHREAD_PRIO_INHERIT); if (status != 0) { - error << "Mutex: Attribute set PRIO_INHERIT failed with: " << strerror(status) + sif::error << "Mutex: Attribute set PRIO_INHERIT failed with: " << strerror(status) << std::endl; } status = pthread_mutex_init(&mutex, &mutexAttr); if (status != 0) { - error << "Mutex: creation with name, id " << mutex.__data.__count + sif::error << "Mutex: creation with name, id " << mutex.__data.__count << ", " << " failed with " << strerror(status) << std::endl; } //After a mutex attributes object has been used to initialize one or more mutexes, any function affecting the attributes object (including destruction) shall not affect any previously initialized mutexes. status = pthread_mutexattr_destroy(&mutexAttr); if (status != 0) { - error << "Mutex: Attribute destroy failed with " << strerror(status) << std::endl; + sif::error << "Mutex: Attribute destroy failed with " << strerror(status) << std::endl; } } diff --git a/osal/linux/PeriodicPosixTask.cpp b/osal/linux/PeriodicPosixTask.cpp index ee3c5c4a..b754c3f4 100644 --- a/osal/linux/PeriodicPosixTask.cpp +++ b/osal/linux/PeriodicPosixTask.cpp @@ -56,9 +56,9 @@ void PeriodicPosixTask::taskFunctionality(void){ char name[20] = {0}; int status = pthread_getname_np(pthread_self(),name,sizeof(name)); if(status==0){ - error << "ObjectTask: " << name << " Deadline missed." << std::endl; + sif::error << "ObjectTask: " << name << " Deadline missed." << std::endl; }else{ - error << "ObjectTask: X Deadline missed. " << status << std::endl; + sif::error << "ObjectTask: X Deadline missed. " << status << std::endl; } if (this->deadlineMissedFunc != NULL) { this->deadlineMissedFunc(); diff --git a/osal/linux/PeriodicPosixTask.h b/osal/linux/PeriodicPosixTask.h index e3fa5722..43647eda 100644 --- a/osal/linux/PeriodicPosixTask.h +++ b/osal/linux/PeriodicPosixTask.h @@ -9,7 +9,8 @@ class PeriodicPosixTask: public PosixThread, public PeriodicTaskIF { public: - PeriodicPosixTask(const char* name_, int priority_, size_t stackSize_, uint32_t period_, void(*deadlineMissedFunc_)()); + PeriodicPosixTask(const char* name_, int priority_, size_t stackSize_, + uint32_t period_, void(*deadlineMissedFunc_)()); virtual ~PeriodicPosixTask(); /** * @brief The method to start the task. diff --git a/osal/linux/PosixThread.cpp b/osal/linux/PosixThread.cpp index 2f0176c9..899700f0 100644 --- a/osal/linux/PosixThread.cpp +++ b/osal/linux/PosixThread.cpp @@ -22,7 +22,8 @@ ReturnValue_t PosixThread::sleep(uint64_t ns) { //The nanosleep() function was interrupted by a signal. return HasReturnvaluesIF::RETURN_FAILED; case EINVAL: - //The rqtp argument specified a nanosecond value less than zero or greater than or equal to 1000 million. + //The rqtp argument specified a nanosecond value less than zero or + // greater than or equal to 1000 million. return HasReturnvaluesIF::RETURN_FAILED; default: return HasReturnvaluesIF::RETURN_FAILED; @@ -40,8 +41,8 @@ void PosixThread::suspend() { sigaddset(&waitSignal, SIGUSR1); sigwait(&waitSignal, &caughtSig); if (caughtSig != SIGUSR1) { - error << "FixedTimeslotTask: Unknown Signal received: " << caughtSig - << std::endl; + sif::error << "FixedTimeslotTask: Unknown Signal received: " << + caughtSig << std::endl; } } @@ -112,14 +113,15 @@ uint64_t PosixThread::getCurrentMonotonicTimeMs(){ return currentTime_ms; } -PosixThread::PosixThread(const char* name_, int priority_, size_t stackSize_):thread(0),priority(priority_),stackSize(stackSize_) { +PosixThread::PosixThread(const char* name_, int priority_, size_t stackSize_): + thread(0),priority(priority_),stackSize(stackSize_) { strcpy(name,name_); } void PosixThread::createTask(void* (*fnc_)(void*), void* arg_) { - debug << "PosixThread::createTask" << std::endl; + //sif::debug << "PosixThread::createTask" << std::endl; /* * The attr argument points to a pthread_attr_t structure whose contents are used at thread creation time to determine attributes for the new @@ -130,35 +132,41 @@ void PosixThread::createTask(void* (*fnc_)(void*), void* arg_) { pthread_attr_t attributes; int status = pthread_attr_init(&attributes); if(status != 0){ - error << "Posix Thread attribute init failed with: " << strerror(status) << std::endl; + sif::error << "Posix Thread attribute init failed with: " << + strerror(status) << std::endl; } void* sp; status = posix_memalign(&sp, sysconf(_SC_PAGESIZE), stackSize); if(status != 0){ - error << "Posix Thread stack init failed with: " << strerror(status) << std::endl; + sif::error << "Posix Thread stack init failed with: " << + strerror(status) << std::endl; } status = pthread_attr_setstack(&attributes, sp, stackSize); if(status != 0){ - error << "Posix Thread attribute setStack failed with: " << strerror(status) << std::endl; + sif::error << "Posix Thread attribute setStack failed with: " << + strerror(status) << std::endl; } status = pthread_attr_setinheritsched(&attributes, PTHREAD_EXPLICIT_SCHED); if(status != 0){ - error << "Posix Thread attribute setinheritsched failed with: " << strerror(status) << std::endl; + sif::error << "Posix Thread attribute setinheritsched failed with: " << + strerror(status) << std::endl; } //TODO FIFO -> This needs root privileges for the process status = pthread_attr_setschedpolicy(&attributes,SCHED_FIFO); if(status != 0){ - error << "Posix Thread attribute schedule policy failed with: " << strerror(status) << std::endl; + sif::error << "Posix Thread attribute schedule policy failed with: " << + strerror(status) << std::endl; } sched_param scheduleParams; scheduleParams.__sched_priority = priority; status = pthread_attr_setschedparam(&attributes, &scheduleParams); if(status != 0){ - error << "Posix Thread attribute schedule params failed with: " << strerror(status) << std::endl; + sif::error << "Posix Thread attribute schedule params failed with: " << + strerror(status) << std::endl; } //Set Signal Mask for suspend until startTask is called @@ -167,22 +175,26 @@ void PosixThread::createTask(void* (*fnc_)(void*), void* arg_) { sigaddset(&waitSignal, SIGUSR1); status = pthread_sigmask(SIG_BLOCK, &waitSignal, NULL); if(status != 0){ - error << "Posix Thread sigmask failed failed with: " << strerror(status) << " errno: " << strerror(errno) << std::endl; + sif::error << "Posix Thread sigmask failed failed with: " << + strerror(status) << " errno: " << strerror(errno) << std::endl; } status = pthread_create(&thread,&attributes,fnc_,arg_); if(status != 0){ - error << "Posix Thread create failed with: " << strerror(status) << std::endl; + sif::error << "Posix Thread create failed with: " << + strerror(status) << std::endl; } status = pthread_setname_np(thread,name); if(status != 0){ - error << "Posix Thread setname failed with: " << strerror(status) << std::endl; + sif::error << "Posix Thread setname failed with: " << + strerror(status) << std::endl; } status = pthread_attr_destroy(&attributes); if(status!=0){ - error << "Posix Thread attribute destroy failed with: " << strerror(status) << std::endl; + sif::error << "Posix Thread attribute destroy failed with: " << + strerror(status) << std::endl; } } diff --git a/osal/linux/Timer.cpp b/osal/linux/Timer.cpp index 2347e39d..5e27c328 100644 --- a/osal/linux/Timer.cpp +++ b/osal/linux/Timer.cpp @@ -9,7 +9,8 @@ Timer::Timer() { sigEvent.sigev_value.sival_ptr = &timerId; int status = timer_create(CLOCK_MONOTONIC, &sigEvent, &timerId); if(status!=0){ - error << "Timer creation failed with: " << status << " errno: " << errno << std::endl; + sif::error << "Timer creation failed with: " << status << + " errno: " << errno << std::endl; } } diff --git a/osal/rtems/PollingTask.cpp b/osal/rtems/PollingTask.cpp index c2dc629b..03ba0951 100644 --- a/osal/rtems/PollingTask.cpp +++ b/osal/rtems/PollingTask.cpp @@ -66,10 +66,16 @@ ReturnValue_t PollingTask::startTask() { } } -ReturnValue_t PollingTask::addSlot(object_id_t componentId, uint32_t slotTimeMs, - int8_t executionStep) { - pst.addSlot(componentId, slotTimeMs, executionStep, this); - return HasReturnvaluesIF::RETURN_OK; +ReturnValue_t PollingTask::addSlot(object_id_t componentId, + uint32_t slotTimeMs, int8_t executionStep) { + if (objectManager->get(componentId) != nullptr) { + pst.addSlot(componentId, slotTimeMs, executionStep, this); + return HasReturnvaluesIF::RETURN_OK; + } + + error << "Component " << std::hex << componentId << + " not found, not adding it to pst" << std::endl; + return HasReturnvaluesIF::RETURN_FAILED; } uint32_t PollingTask::getPeriodMs() const { diff --git a/parameters/ParameterWrapper.cpp b/parameters/ParameterWrapper.cpp index 8f661bb3..1dac7075 100644 --- a/parameters/ParameterWrapper.cpp +++ b/parameters/ParameterWrapper.cpp @@ -91,7 +91,7 @@ template ReturnValue_t ParameterWrapper::serializeData(uint8_t** buffer, uint32_t* size, const uint32_t max_size, bool bigEndian) const { const T *element = (const T*) readonlyData; - ReturnValue_t result; + ReturnValue_t result = HasReturnvaluesIF::RETURN_OK; uint16_t dataSize = columns * rows; while (dataSize != 0) { result = SerializeAdapter::serialize(element, buffer, size, max_size, diff --git a/serviceinterface/ServiceInterfaceStream.h b/serviceinterface/ServiceInterfaceStream.h index 32bc263e..df736a1b 100644 --- a/serviceinterface/ServiceInterfaceStream.h +++ b/serviceinterface/ServiceInterfaceStream.h @@ -7,11 +7,15 @@ #include #include -//Unfortunately, there must be a forward declaration of log_fe (MUST be defined in main), to let the system know where to write to. +// Unfortunately, there must be a forward declaration of log_fe +// (MUST be defined in main), to let the system know where to write to. +namespace sif { extern std::ostream debug; extern std::ostream info; extern std::ostream warning; extern std::ostream error; +} + class ServiceInterfaceStream : public std::basic_ostream< char, std::char_traits< char > > { protected: diff --git a/subsystem/SubsystemBase.cpp b/subsystem/SubsystemBase.cpp index 76430b56..6df0b64f 100644 --- a/subsystem/SubsystemBase.cpp +++ b/subsystem/SubsystemBase.cpp @@ -88,7 +88,7 @@ void SubsystemBase::executeTable(HybridIterator tableIter, Submod object_id_t object = tableIter.value->getObject(); if ((iter = childrenMap.find(object)) == childrenMap.end()) { //illegal table entry, should only happen due to misconfigured mode table - debug << std::hex << getObjectId() << ": invalid mode table entry" + sif::debug << std::hex << getObjectId() << ": invalid mode table entry" << std::endl; continue; } diff --git a/tcdistribution/PUSDistributor.cpp b/tcdistribution/PUSDistributor.cpp index a209620f..c214f674 100644 --- a/tcdistribution/PUSDistributor.cpp +++ b/tcdistribution/PUSDistributor.cpp @@ -31,7 +31,7 @@ iterator_t PUSDistributor::selectDestination() { } if (tcStatus != RETURN_OK) { - debug << "PUSDistributor::handlePacket: error with " << (int) tcStatus + sif::debug << "PUSDistributor::handlePacket: error with " << (int) tcStatus << std::endl; return this->queueMap.end(); } else { diff --git a/tcdistribution/TcDistributor.cpp b/tcdistribution/TcDistributor.cpp index a463ea77..57921459 100644 --- a/tcdistribution/TcDistributor.cpp +++ b/tcdistribution/TcDistributor.cpp @@ -39,14 +39,14 @@ ReturnValue_t TcDistributor::handlePacket() { } void TcDistributor::print() { - debug << "Distributor content is: " << std::endl << "ID\t| message queue id" + sif::debug << "Distributor content is: " << std::endl << "ID\t| message queue id" << std::endl; for (iterator_t it = this->queueMap.begin(); it != this->queueMap.end(); it++) { - debug << it->first << "\t| 0x" << std::hex << it->second << std::dec + sif::debug << it->first << "\t| 0x" << std::hex << it->second << std::dec << std::endl; } - debug << std::dec; + sif::debug << std::dec; } diff --git a/tmtcpacket/pus/TcPacketBase.cpp b/tmtcpacket/pus/TcPacketBase.cpp index c81e06b7..0f3bd52e 100644 --- a/tmtcpacket/pus/TcPacketBase.cpp +++ b/tmtcpacket/pus/TcPacketBase.cpp @@ -61,11 +61,11 @@ uint8_t TcPacketBase::getPusVersionNumber() { void TcPacketBase::print() { uint8_t * wholeData = getWholeData(); - debug << "TcPacket contains: " << std::endl; + sif::debug << "TcPacket contains: " << std::endl; for (uint8_t count = 0; count < getFullSize(); ++count) { - debug << std::hex << (uint16_t) wholeData[count] << " "; + sif::debug << std::hex << (uint16_t) wholeData[count] << " "; } - debug << std::dec << std::endl; + sif::debug << std::dec << std::endl; } void TcPacketBase::initializeTcPacket(uint16_t apid, uint16_t sequenceCount, diff --git a/tmtcpacket/pus/TcPacketStored.cpp b/tmtcpacket/pus/TcPacketStored.cpp index 4bfd0e37..0187b08f 100644 --- a/tmtcpacket/pus/TcPacketStored.cpp +++ b/tmtcpacket/pus/TcPacketStored.cpp @@ -48,7 +48,7 @@ bool TcPacketStored::checkAndSetStore() { if (this->store == NULL) { this->store = objectManager->get(objects::TC_STORE); if (this->store == NULL) { - error << "TcPacketStored::TcPacketStored: TC Store not found!" + sif::error << "TcPacketStored::TcPacketStored: TC Store not found!" << std::endl; return false; } diff --git a/tmtcpacket/pus/TmPacketBase.cpp b/tmtcpacket/pus/TmPacketBase.cpp index 74bc9b8a..a7bda5af 100644 --- a/tmtcpacket/pus/TmPacketBase.cpp +++ b/tmtcpacket/pus/TmPacketBase.cpp @@ -63,7 +63,7 @@ bool TmPacketBase::checkAndSetStamper() { if (timeStamper == NULL) { timeStamper = objectManager->get(timeStamperId); if (timeStamper == NULL) { - error << "TmPacketBase::checkAndSetStamper: Stamper not found!" + sif::error << "TmPacketBase::checkAndSetStamper: Stamper not found!" << std::endl; return false; } diff --git a/tmtcpacket/pus/TmPacketStored.cpp b/tmtcpacket/pus/TmPacketStored.cpp index 529f8f8d..0add30a5 100644 --- a/tmtcpacket/pus/TmPacketStored.cpp +++ b/tmtcpacket/pus/TmPacketStored.cpp @@ -98,7 +98,7 @@ bool TmPacketStored::checkAndSetStore() { if (store == NULL) { store = objectManager->get(objects::TM_STORE); if (store == NULL) { - error << "TmPacketStored::TmPacketStored: TM Store not found!" + sif::error << "TmPacketStored::TmPacketStored: TM Store not found!" << std::endl; return false; } diff --git a/tmtcservices/PusServiceBase.cpp b/tmtcservices/PusServiceBase.cpp index 6e105325..b1d97293 100644 --- a/tmtcservices/PusServiceBase.cpp +++ b/tmtcservices/PusServiceBase.cpp @@ -48,7 +48,7 @@ ReturnValue_t PusServiceBase::performOperation(uint8_t opCode) { break; } else { - error << "PusServiceBase::performOperation: Service " + sif::error << "PusServiceBase::performOperation: Service " << (uint16_t) this->serviceId << ": Error receiving packet. Code: " << std::hex << status << std::dec << std::endl; @@ -59,7 +59,7 @@ ReturnValue_t PusServiceBase::performOperation(uint8_t opCode) { return RETURN_OK; } else { - error << "PusService " << (uint16_t) this->serviceId + sif::error << "PusService " << (uint16_t) this->serviceId << ": performService returned with " << (int16_t) return_code << std::endl; return RETURN_FAILED; @@ -89,7 +89,7 @@ ReturnValue_t PusServiceBase::initialize() { distributor->registerService(this); return RETURN_OK; } else { - error << "PusServiceBase::PusServiceBase: Service " + sif::error << "PusServiceBase::PusServiceBase: Service " << (uint32_t) this->serviceId << ": Configuration error." << " Make sure packetSource and packetDestination are defined correctly" << std::endl; return RETURN_FAILED; diff --git a/tmtcservices/VerificationReporter.cpp b/tmtcservices/VerificationReporter.cpp index 36abbeb8..4484fb9b 100644 --- a/tmtcservices/VerificationReporter.cpp +++ b/tmtcservices/VerificationReporter.cpp @@ -24,7 +24,7 @@ void VerificationReporter::sendSuccessReport(uint8_t set_report_id, current_packet->getPacketSequenceControl(), 0, set_step); ReturnValue_t status = MessageQueueSenderIF::sendMessage(acknowledgeQueue, &message); if (status != HasReturnvaluesIF::RETURN_OK) { - error + sif::error << "VerificationReporter::sendSuccessReport: Error writing to queue. Code: " << (uint16_t) status << std::endl; } @@ -40,7 +40,7 @@ void VerificationReporter::sendSuccessReport(uint8_t set_report_id, tcSequenceControl, 0, set_step); ReturnValue_t status = MessageQueueSenderIF::sendMessage(acknowledgeQueue, &message); if (status != HasReturnvaluesIF::RETURN_OK) { - error + sif::error << "VerificationReporter::sendSuccessReport: Error writing to queue. Code: " << (uint16_t) status << std::endl; } @@ -59,7 +59,7 @@ void VerificationReporter::sendFailureReport(uint8_t report_id, parameter1, parameter2); ReturnValue_t status = MessageQueueSenderIF::sendMessage(acknowledgeQueue, &message); if (status != HasReturnvaluesIF::RETURN_OK) { - error + sif::error << "VerificationReporter::sendFailureReport Error writing to queue. Code: " << (uint16_t) status << std::endl; } @@ -76,7 +76,7 @@ void VerificationReporter::sendFailureReport(uint8_t report_id, tcSequenceControl, error_code, step, parameter1, parameter2); ReturnValue_t status = MessageQueueSenderIF::sendMessage(acknowledgeQueue, &message); if (status != HasReturnvaluesIF::RETURN_OK) { - error + sif::error << "VerificationReporter::sendFailureReport Error writing to queue. Code: " << (uint16_t) status << std::endl; } @@ -88,7 +88,7 @@ void VerificationReporter::initialize() { if (temp != NULL) { this->acknowledgeQueue = temp->getVerificationQueue(); } else { - error + sif::error << "VerificationReporter::VerificationReporter: Configuration error." << std::endl; }