Changeset 288 in pacpusframework for trunk/src

Timestamp:

Mar 26, 2014, 9:27:30 PM (11 years ago)

Author:

Marek Kurdej

Message:

Using boost::shared_ptr for storing components.

Location:

trunk/src

Files:

• DBITEPlayerLib/DbtPlyEngine.cpp (modified) (7 diffs)
• DBITEPlayerLib/DbtPlyFileManager.cpp (modified) (2 diffs)
• DBITEPlayerLib/DbtPlyTrigger.cpp (modified) (1 diff)
• DBITEPlayerLib/DbtPlyUserInterface.cpp (modified) (4 diffs)
• PacpusLib/ComponentBase.cpp (modified) (5 diffs)
• PacpusLib/ComponentFactoryBase.cpp (modified) (4 diffs)
• PacpusLib/ComponentManager.cpp (modified) (18 diffs)
• PacpusLib/XmlComponentConfig.cpp (modified) (6 diffs)
• PacpusSensor/src/ui/pacpusmainwindow.h (modified) (1 diff)

trunk/src/DBITEPlayerLib/DbtPlyEngine.cpp

@@ -10 +10 @@
 #include <Pacpus/kernel/Log.h>
 
-#include <cassert>
+#include <boost/assert.hpp>
 #include <limits>
 #include <QDir>
@@ -226 +226 @@
 void DbtPlyEngine::playEvent()
 {
+    using boost::dynamic_pointer_cast;
+
     LOG_DEBUG("Clicked: play");
 
     // get user interface
     ComponentManager * mgr = ComponentManager::getInstance();
-    DbtPlyUserInterface * ui = dynamic_cast<DbtPlyUserInterface *>(mgr->getComponent("dbiteUserInterface"));
-    assert(ui);
+    boost::shared_ptr<DbtPlyUserInterface> ui = dynamic_pointer_cast<DbtPlyUserInterface>(mgr->getComponent("dbiteUserInterface"));
+    BOOST_ASSERT(ui);
     // get time value from slider
     lastTDbt_ = ui->getTime() + tDbtMin_;
@@ -268 +270 @@
 void DbtPlyEngine::setState(DbtPlyEngineState * newState)
 {
-    assert(newState);
+    BOOST_ASSERT(newState);
     LOG_DEBUG(mCurrentState->toString() << " => " << newState->toString());
     mCurrentState = newState;
@@ -284 +286 @@
         mSpeed = kMaxSpeed;
     }
-    assert(kMinSpeed <= mSpeed);
-    assert(mSpeed <= kMaxSpeed);
+    BOOST_ASSERT(kMinSpeed <= mSpeed);
+    BOOST_ASSERT(mSpeed <= kMaxSpeed);
     LOG_INFO("event: Speed Up, speed = " << mSpeed);
     Q_EMIT displayStateSig(mCurrentState, mSpeed);
@@ -296 +298 @@
         mSpeed = kMinSpeed;
     }
-    assert(kMinSpeed <= mSpeed);
-    assert(mSpeed <= kMaxSpeed);
+    BOOST_ASSERT(kMinSpeed <= mSpeed);
+    BOOST_ASSERT(mSpeed <= kMaxSpeed);
     LOG_INFO("event: Speed Up, speed = " << mSpeed);
     Q_EMIT displayStateSig(mCurrentState, mSpeed);
@@ -304 +306 @@
 void DbtPlyEngine::reset()
 {
+    using boost::dynamic_pointer_cast;
+
     lastTNow_ = road_time();
     lastTDbt_ = tDbtMin_;
@@ -311 +315 @@
     // get user interface
     ComponentManager * mgr = ComponentManager::getInstance();
-    DbtPlyUserInterface * ui = dynamic_cast<DbtPlyUserInterface *>(mgr->getComponent("dbiteUserInterface"));
-    assert(ui);
+    boost::shared_ptr<DbtPlyUserInterface> ui = dynamic_pointer_cast<DbtPlyUserInterface>(mgr->getComponent("dbiteUserInterface"));
+    BOOST_ASSERT(ui);
     // reset time value of the slider
     ui->resetTime();

trunk/src/DBITEPlayerLib/DbtPlyFileManager.cpp

@@ -67 +67 @@
 ComponentBase::COMPONENT_CONFIGURATION DbtPlyFileManager::configureComponent(XmlComponentConfig config)
 {
+    using boost::dynamic_pointer_cast;
+
     ComponentManager * mgr = ComponentManager::getInstance();
-    mEngine = static_cast<DbtPlyEngine *>(mgr->getComponent("dbiteEngine"));
-    if (NULL == mEngine ) {
+    mEngine = dynamic_pointer_cast<DbtPlyEngine>(mgr->getComponent("dbiteEngine"));
+    if (!mEngine) {
         LOG_FATAL("cannot get a pointer of the 'dbiteEngine' component");
         return CONFIGURED_FAILED;
@@ -81 +83 @@
     // register the road_time_t type for the connection
     qRegisterMetaType<road_time_t>("road_time_t");
-    connect(mEngine, SIGNAL(play(road_time_t,road_time_t, bool)),
+    connect(mEngine.get(), SIGNAL(play(road_time_t,road_time_t, bool)),
             this, SLOT(playData(road_time_t,road_time_t, bool)),
             Qt::DirectConnection);
     connect(this, SIGNAL(tMinMaxIs(road_time_t,road_time_t )),
-            mEngine, SLOT(tMinMax(road_time_t, road_time_t)));
-    connect(mEngine, SIGNAL(stopfile()),
+            mEngine.get(), SLOT(tMinMax(road_time_t, road_time_t)));
+    connect(mEngine.get(), SIGNAL(stopfile()),
             this, SLOT (beginfile()));
 

trunk/src/DBITEPlayerLib/DbtPlyTrigger.cpp

@@ -39 +39 @@
 ComponentBase::COMPONENT_CONFIGURATION DbtPlyTrigger::configureComponent(XmlComponentConfig /*config*/)
 {
+    using boost::dynamic_pointer_cast;
+
     ComponentManager * mgr = ComponentManager::getInstance();
     // we get a pointer to the engine component
-    mEngine = dynamic_cast<DbtPlyEngine *>(mgr->getComponent("dbiteEngine"));
-    if (NULL == mEngine) {
+    mEngine = dynamic_pointer_cast<DbtPlyEngine>(mgr->getComponent("dbiteEngine"));
+    if (!mEngine) {
         LOG_FATAL("cannot get a pointer of the 'dbiteEngine' component");
         return CONFIGURED_FAILED;
     }
     connect(this, SIGNAL(triggerSig()),
-            mEngine,SLOT(engReceiver()),
+            mEngine.get(), SLOT(engReceiver()),
             Qt::DirectConnection);
 

trunk/src/DBITEPlayerLib/DbtPlyUserInterface.cpp

@@ -61 +61 @@
 ComponentBase::COMPONENT_CONFIGURATION DbtPlyUserInterface::configureComponent(XmlComponentConfig /*config*/)
 {
+    using boost::dynamic_pointer_cast;
+
     ComponentManager * mgr = ComponentManager::getInstance();
-    mEngine = dynamic_cast<DbtPlyEngine *>(mgr->getComponent("dbiteEngine"));
-    if (NULL == mEngine) {
+    mEngine = dynamic_pointer_cast<DbtPlyEngine>(mgr->getComponent("dbiteEngine"));
+    if (!mEngine) {
         LOG_FATAL("cannot get a pointer of the 'dbiteEngine' component");
         return CONFIGURED_FAILED;
@@ -275 +277 @@
         componentTableWidget->setItem(idx, 0, new QTableWidgetItem(componentName));
 
-        ComponentBase * component = mgr->getComponent(componentName);
-        if (component) {
-            COMPONENT_STATE state = component->getState();
-
-            QString stateString;
-            switch (state) {
-            case STOPPED:
-                stateString = tr("Stopped");
-                break;
-            case NOT_MONITORED:
-                stateString = tr("Not monitored");
-                break;
-            case MONITOR_OK:
-                stateString = tr("Monitor OK");
-                break;
-            case MONITOR_NOK:
-                stateString = tr("Monitor wrong");
-                break;
-
-            default:
-                stateString = tr("UNKNOWN");
-                break;
-            }
-            componentTableWidget->setItem(idx, 1, new QTableWidgetItem(stateString));
-
-            // TODO: ADD component type and some detailed information (e.g. parameters)
-            //QString componentInfo = component->getDetails();
-            //componentTableWidget->setItem(idx, 2, new QTableWidgetItem(componentInfo));
+        ComponentSharedPointer component = mgr->getComponent(componentName);
+        if (!component) {
+            continue;
         }
+
+        COMPONENT_STATE state = component->getState();
+
+        QString stateString;
+        switch (state) {
+        case STOPPED:
+            stateString = tr("Stopped");
+            break;
+        case NOT_MONITORED:
+            stateString = tr("Not monitored");
+            break;
+        case MONITOR_OK:
+            stateString = tr("Monitor OK");
+            break;
+        case MONITOR_NOK:
+            stateString = tr("Monitor wrong");
+            break;
+
+        default:
+            stateString = tr("UNKNOWN");
+            break;
+        }
+        componentTableWidget->setItem(idx, 1, new QTableWidgetItem(stateString));
+
+        // TODO: ADD component type and some detailed information (e.g. parameters)
+        //QString componentInfo = component->getDetails();
+        //componentTableWidget->setItem(idx, 2, new QTableWidgetItem(componentInfo));
     }
 }
@@ -309 +313 @@
 void DbtPlyUserInterface::connectButtons()
 {
+    // FIXME: use Qt5 connect style
     connect(playBut, SIGNAL(clicked()),
-        mEngine, SLOT(playEvent()));
+        mEngine.get(), SLOT(playEvent()));
     connect(pauseBut, SIGNAL(clicked()),
-        mEngine, SLOT(pauseEvent()));
+        mEngine.get(), SLOT(pauseEvent()));
     connect(stopBut, SIGNAL(clicked()),
-        mEngine, SLOT(stopEvent()));
+        mEngine.get(), SLOT(stopEvent()));
     connect(speedUpBut, SIGNAL(clicked()),
-        mEngine, SLOT(speedUpEvent()));
+        mEngine.get(), SLOT(speedUpEvent()));
     connect(speedDownBut, SIGNAL(clicked()),
-        mEngine, SLOT(speedDownEvent()));
+        mEngine.get(), SLOT(speedDownEvent()));
 }
 
 void DbtPlyUserInterface::connectDisplay()
 {
-    connect(mEngine, SIGNAL(displayStateSig(DbtPlyEngineState *, float)),
+    connect(mEngine.get(), SIGNAL(displayStateSig(DbtPlyEngineState *, float)),
         this, SLOT(displayStateSlot(DbtPlyEngineState *, float)));
 
-    connect (mEngine, SIGNAL(timeMinMax(road_time_t, road_time_t)),
+    connect (mEngine.get(), SIGNAL(timeMinMax(road_time_t, road_time_t)),
         this, SLOT(displayMinMaxTime(road_time_t , road_time_t)));
-    connect (mEngine, SIGNAL(curReplayTime(road_time_t)),
+    connect (mEngine.get(), SIGNAL(curReplayTime(road_time_t)),
         this, SLOT(displayTime(road_time_t)));
     connect (rev, SIGNAL(toggled(bool)),
-        mEngine, SLOT(changeDirection(bool)));
+        mEngine.get(), SLOT(changeDirection(bool)));
 }
 
@@ -337 +342 @@
 {
     connect (timeSlider, SIGNAL(sliderPressed()),
-        mEngine, SLOT(pauseEvent()));
+        mEngine.get(), SLOT(pauseEvent()));
     connect (timeSlider, SIGNAL(sliderReleased()),
-        mEngine, SLOT(playEvent()));
+        mEngine.get(), SLOT(playEvent()));
 }
 

trunk/src/PacpusLib/ComponentBase.cpp

@@ -17 +17 @@
 #include <boost/program_options/parsers.hpp>
 #include <boost/program_options/variables_map.hpp>
-#include <boost/thread/thread.hpp>
+//#include <boost/thread/thread.hpp>
 #include <ostream>
 #include <string>
@@ -77 +77 @@
 DECLARE_STATIC_LOGGER("pacpus.core.ComponentBase");
 
-ComponentBase::ComponentBase(const QString & componentName)
+ComponentBase::ComponentBase(QString const& componentName)
     : m_componentName(componentName)
     , m_isActive(false)
@@ -131 +131 @@
 }
 
-void ComponentBase::startComponentWithException(boost::exception_ptr& error)
-{
-    try {
-        startActivity();
-        error = boost::exception_ptr();
-    } catch (...) {
-        error = boost::current_exception();
-    }
-}
-
-void ComponentBase::startComponentInThread()
-{
-    boost::exception_ptr error;
-    boost::thread t(
-        boost::bind(
-            &ComponentBase::startComponentWithException,
-            this,
-            boost::ref(error)
-        )
-    );
-    t.join();
-    if (error) {
-        try {
-            boost::rethrow_exception(error);
-        } catch (boost::exception& e) {
-            LOG_FATAL("[" << getName() << "]" << "\tboost::exception thrown: " << boost::diagnostic_information(e));
-            //throw;
-        }
-    }
-}
+//void ComponentBase::startComponentWithException(boost::exception_ptr& error)
+//{
+//    try {
+//        startActivity();
+//        error = boost::exception_ptr();
+//    } catch (...) {
+//        error = boost::current_exception();
+//    }
+//}
+//
+//void ComponentBase::startComponentInThread()
+//{
+//    boost::exception_ptr error;
+//    boost::thread t(
+//        boost::bind(
+//            &ComponentBase::startComponentWithException,
+//            this,
+//            boost::ref(error)
+//        )
+//    );
+//    t.join();
+//    if (error) {
+//        try {
+//            boost::rethrow_exception(error);
+//        } catch (boost::exception& e) {
+//            LOG_FATAL("[" << getName() << "]" << "\tboost::exception thrown: " << boost::diagnostic_information(e));
+//            //throw;
+//        }
+//    }
+//}
 
 int ComponentBase::startComponent()
@@ -170 +170 @@
 
     setActive(true);
-    boost::thread worker(&ComponentBase::startComponentInThread, this);
-    //boost::thread worker(&ComponentBase::startActivity, this);
-    //startActivity();
+    //boost::thread worker(&ComponentBase::startComponentInThread, this);
+    startActivity();
+    //moveToThread(&mThread);
+    //mThread.start();
     return true;
 }
@@ -185 +186 @@
     setActive(false);
     stopActivity();
-    
+    //QMetaObject::invokeMethod(&mThread, "quit");
     return true;
 }

trunk/src/PacpusLib/ComponentFactoryBase.cpp

@@ -10 +10 @@
 #include <Pacpus/kernel/Log.h>
 
-#include <cassert>
+#include <boost/assert.hpp>
 #include <QString>
 
@@ -23 +23 @@
     // get the adress of the ComponentManager instance
     mgr_ = ComponentManager::getInstance();
+    BOOST_ASSERT(mgr_);
 }
 
@@ -30 +31 @@
 }
 
-void ComponentFactoryBase::addFactory(ComponentFactoryBase* addr, const QString& type)
+void ComponentFactoryBase::addFactory(ComponentFactoryBase* addr, QString const& type)
 {
     LOG_DEBUG("addFactory(type="<< type << ")");
 
-    assert(mgr_);
     if (!mgr_->registerComponentFactory(addr, type)) {
         /*
@@ -44 +44 @@
 }
 
-void ComponentFactoryBase::addComponent(const QString& name)
+void ComponentFactoryBase::createComponent(QString const& name)
 {
     LOG_DEBUG("addComponent(" << name << ")");
 
-    // FIXME: instantiated component is never deleted!
-    // who should do it? ComponentManager?
-    ComponentBase * addr = instantiateComponent(name);
-    assert(mgr_);
-    if (!mgr_->registerComponent(addr, name)) {
-        delete addr;
-        addr = NULL;
-    }
+    ComponentSharedPointer component = instantiateComponent(name);
+    mgr_->registerComponent(component, name);
 }

trunk/src/PacpusLib/ComponentManager.cpp

@@ -125 +125 @@
 }
 
-bool ComponentManager::registerComponentFactory(ComponentFactoryBase* addr, const QString& type)
+bool ComponentManager::registerComponentFactory(ComponentFactoryBase* addr, QString const& type)
 {
     LOG_TRACE("registerComponentFactory(type="<< type << ")");
@@ -141 +141 @@
 }
 
-bool ComponentManager::unregisterComponentFactory(const QString& type)
+bool ComponentManager::unregisterComponentFactory(QString const& type)
 {
     LOG_TRACE("unregisterComponentFactory(type="<< type << ")");
@@ -156 +156 @@
 }
 
-bool ComponentManager::registerComponent(ComponentBase* addr, const QString& name)
+bool ComponentManager::registerComponent(boost::shared_ptr<ComponentBase> addr, QString const& name)
 {
     LOG_TRACE("registerComponent(name="<< name << ")");
@@ -171 +171 @@
 }
 
-bool ComponentManager::unregisterComponent(const QString& name)
+bool ComponentManager::unregisterComponent(QString const& name)
 {
     LOG_TRACE("unregisterComponent(name="<< name << ")");
@@ -180 +180 @@
     }
 
-    // FIXME: delete component
-    ComponentBase* component = componentMap_.value(name, NULL);
-    //delete component;
-
+    boost::shared_ptr<ComponentBase> component = componentMap_.value(name, NULL);
+    
     // FIXME: remove from map (causes segfault in QMap::qMapLessThanKey on Windows)
     //componentMap_.remove(name);
     LOG_INFO("unregistered component '" << name << "'");
-
-    return true;
-}
-
-bool ComponentManager::createComponent(const QString& type, const QString& name)
+    return true;
+}
+
+bool ComponentManager::createComponent(QString const& type, QString const& name)
 {
     LOG_TRACE("createComponent(type=" << type << ", " << "name="<< name << ")");
@@ -198 +195 @@
         ComponentFactoryBase* factory = factoryMap_.value(type);
         assert(factory);
-        factory->addComponent(name);
+        factory->createComponent(name);
         return true;
     }
@@ -209 +206 @@
 }
 
-bool ComponentManager::loadPlugin(const QString& filename)
+bool ComponentManager::loadPlugin(QString const& filename)
 {
     LOG_TRACE("loadPlugin(filename=" << filename << ")");
@@ -236 +233 @@
 }
 
-bool ComponentManager::checkComponent(const QString & componentName)
+bool ComponentManager::checkComponent(QString const& componentName)
 {
     if (NULL == getComponent(componentName)) {
@@ -245 +242 @@
 }
 
-bool ComponentManager::checkComponentInput(const QString & componentName, const QString & inputName)
+bool ComponentManager::checkComponentInput(QString const& componentName, QString const& inputName)
 {
     if (!checkComponent(componentName)) {
@@ -257 +254 @@
 }
 
-bool ComponentManager::checkComponentOutput(const QString & componentName, const QString & outputName)
+bool ComponentManager::checkComponentOutput(QString const& componentName, QString const& outputName)
 {
     if (!checkComponent(componentName)) {
@@ -269 +266 @@
 }
 
-bool ComponentManager::createConnection(const QString & outputSignature, const QString & inputSignature, const QString & type, int priority = 0)
+bool ComponentManager::createConnection(QString const& outputSignature, QString const& inputSignature, QString const& type, int priority = 0)
 {
     // FIXME: use 2 signatures (output component + output connection) instead of 1 separated by a (".") dot
@@ -289 +286 @@
 }
 
-std::size_t ComponentManager::loadComponents(const QString& configFilename)
+std::size_t ComponentManager::loadComponents(QString const& configFilename)
 {
     LOG_TRACE("loadComponents(filename=" << configFilename << ")");
@@ -334 +331 @@
 
         // copy locally the config parameters of the component
-        ComponentBase * component = getComponent(componentName);
+        ComponentSharedPointer component = getComponent(componentName);
         if (NULL == component) {
             LOG_WARN("component '" << componentName << "' does not exist");
@@ -356 +353 @@
         QString componentName = cfg.getComponentName();
 
-        ComponentBase * component = getComponent(componentName);
-        if (NULL == component) {
+        ComponentSharedPointer component = getComponent(componentName);
+        if (!component) {
             LOG_WARN("component '" << componentName << "' does not exist");
             continue;
@@ -430 +427 @@
 }
 
-bool ComponentManager::start(const QString & componentName)
+bool ComponentManager::start(QString const& componentName)
 {
     LOG_TRACE("start(component=" << componentName << ")");
 
-    ComponentBase* component = getComponent(componentName);
+    ComponentSharedPointer component = getComponent(componentName);
     if (!component) {
         LOG_WARN("cannot start component '" << componentName << "'.  It does not exist!");
@@ -465 +462 @@
 }
 
-bool ComponentManager::stop(ComponentBase * component) const
+bool ComponentManager::stop(ComponentSharedPointer component) const
 {
     if (!component) {
@@ -477 +474 @@
 }
 
-bool ComponentManager::stop(const QString & componentName)
+bool ComponentManager::stop(QString const& componentName)
 {
     LOG_TRACE("stop(component=" << componentName << ")");
 
-    ComponentBase* component = getComponent(componentName);
+    ComponentSharedPointer component = getComponent(componentName);
     if (!component) {
         LOG_WARN("cannot stop component '" << componentName << "'" << ". It does not exist");
@@ -495 +492 @@
 }
 
-ComponentBase * ComponentManager::getComponent(const QString & name)
+ComponentSharedPointer ComponentManager::getComponent(QString const& name)
 {
     LOG_TRACE("getComponent(name=" << name << ")");

trunk/src/PacpusLib/XmlComponentConfig.cpp

@@ -22 +22 @@
 static const char* kPropertyConnectionPriority = "priority";
 
-XmlComponentConfig::XmlComponentConfig(const QString& name)
+XmlComponentConfig::XmlComponentConfig(QString const& name)
 {
     LOG_TRACE("XmlComponentConfig(QString)");
@@ -43 +43 @@
 }
 
-void XmlComponentConfig::addProperty(const QString& name)
+void XmlComponentConfig::addProperty(QString const& name)
 {
     if (hasProperty(name)) {
@@ -62 +62 @@
 }
 
-int XmlComponentConfig::delProperty(const QString& name)
+int XmlComponentConfig::delProperty(QString const& name)
 {
     if (!hasProperty(name)) {
@@ -82 +82 @@
 }
 
-QString XmlComponentConfig::getProperty(const QString& name, const QString& defaultValue) const
+QString XmlComponentConfig::getProperty(QString const& name, QString const& defaultValue) const
 {
     if (!hasProperty(name))
@@ -97 +97 @@
 }
 
-bool XmlComponentConfig::getBoolProperty(const QString& name, bool defaultValue) const
+bool XmlComponentConfig::getBoolProperty(QString const& name, bool defaultValue) const
 {
   return hasProperty(name) ? getProperty(name) == "true" : defaultValue;
 }
 
-int XmlComponentConfig::getIntProperty(const QString& name, int defaultValue) const
+int XmlComponentConfig::getIntProperty(QString const& name, int defaultValue) const
 {
   return hasProperty(name) ? getProperty(name).toInt() : defaultValue;
 }
 
-double XmlComponentConfig::getDoubleProperty(const QString& name, double defaultValue) const
+double XmlComponentConfig::getDoubleProperty(QString const& name, double defaultValue) const
 {
   return hasProperty(name) ? getProperty(name).toDouble() : defaultValue;
 }
 
-void XmlComponentConfig::setProperty(const QString& name, const QString& value)
+void XmlComponentConfig::setProperty(QString const& name, QString const& value)
 {
     component_.setAttribute(name, value);
@@ -121 +121 @@
 }
 
-bool XmlComponentConfig::hasProperty(const QString& name) const
+bool XmlComponentConfig::hasProperty(QString const& name) const
 {
     return component_.hasAttribute(name);

trunk/src/PacpusSensor/src/ui/pacpusmainwindow.h

@@ -36 +36 @@
 public:
     /// @todo Documentation
-    ComponentCheckBox(const QString & text, QWidget * parent, const char * /*name*/ = 0 )
+    ComponentCheckBox(QString const& text, QWidget * parent, const char * /*name*/ = 0 )
         : QCheckBox(text, parent)
     {