KSat/fsfw
15
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 1 Releases Wiki Activity

object manager improvements

Browse Source
This commit is contained in:
Robin Müller 2020-06-04 21:11:49 +02:00
parent 849053b830
commit 569724843e
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
objectmanager/ObjectManager.cpp
View File

@ -2,21 +2,19 @@
#include <framework/serviceinterface/ServiceInterfaceStream.h> #include <framework/serviceinterface/ServiceInterfaceStream.h>
#include <cstdlib> #include <cstdlib>
ObjectManager::ObjectManager( void (*setProducer)() ) : produceObjects(setProducer) { ObjectManager::ObjectManager( void (*setProducer)() ):
produceObjects(setProducer) {
//There's nothing special to do in the constructor. //There's nothing special to do in the constructor.
} }
ObjectManager::~ObjectManager() { ObjectManager::~ObjectManager() {
std::map<object_id_t, SystemObjectIF*>::iterator it; // Map is STL object and deletes its own pointers.
for (it = this->objectList.begin(); it != this->objectList.end(); it++) {
delete it->second;
}
} }
ReturnValue_t ObjectManager::insert( object_id_t id, SystemObjectIF* object) { 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; auto returnPair = objectList.emplace(id, object);
if (insert_return == true) { if (returnPair.second) {
// sif::debug << "ObjectManager::insert: Object " << std::hex // sif::debug << "ObjectManager::insert: Object " << std::hex
// << (int)id << std::dec << " inserted." << std::endl; // << (int)id << std::dec << " inserted." << std::endl;
return this->RETURN_OK; return this->RETURN_OK;
@ -44,18 +42,15 @@ ReturnValue_t ObjectManager::remove( object_id_t id ) {
SystemObjectIF* ObjectManager::getSystemObject( object_id_t id ) { SystemObjectIF* ObjectManager::getSystemObject( object_id_t id ) {
std::map<object_id_t, SystemObjectIF*>::iterator it = this->objectList.find( id ); auto listIter = this->objectList.find( id );
if (it == this->objectList.end() ) { if (listIter == this->objectList.end() ) {
//Changed for testing different method. return nullptr;
// SystemObjectIF* object = this->produceObjects( id );
// return object;
return NULL;
} else { } else {
return it->second; return listIter->second;
} }
} }
ObjectManager::ObjectManager( ) : produceObjects(NULL) { ObjectManager::ObjectManager() : produceObjects(nullptr) {
} }
@ -63,7 +58,7 @@ void ObjectManager::initialize() {
this->produceObjects(); this->produceObjects();
ReturnValue_t return_value = RETURN_FAILED; ReturnValue_t return_value = RETURN_FAILED;
uint32_t error_count = 0; uint32_t error_count = 0;
for (std::map<object_id_t, SystemObjectIF*>::iterator it = this->objectList.begin(); it != objectList.end(); it++ ) { for (auto it = this->objectList.begin(); it != objectList.end(); it++ ) {
return_value = it->second->initialize(); return_value = it->second->initialize();
if ( return_value != RETURN_OK ) { if ( return_value != RETURN_OK ) {
object_id_t var = it->first; object_id_t var = it->first;
@ -79,10 +74,11 @@ void ObjectManager::initialize() {
} }
//Init was successful. Now check successful interconnections. //Init was successful. Now check successful interconnections.
error_count = 0; error_count = 0;
for (std::map<object_id_t, SystemObjectIF*>::iterator it = this->objectList.begin(); it != objectList.end(); it++ ) { for (auto listIter = this->objectList.begin();
return_value = it->second->checkObjectConnections(); listIter != objectList.end(); listIter++ ) {
return_value = listIter->second->checkObjectConnections();
if ( return_value != RETURN_OK ) { if ( return_value != RETURN_OK ) {
sif::error << "Object " << std::hex << (int) it->first sif::error << "Object " << std::hex << (int) listIter->first
<< " connection check failed with code 0x" << return_value << " connection check failed with code 0x" << return_value
<< std::dec << std::endl; << std::dec << std::endl;
error_count++; error_count++;