Changeset 288 in pacpusframework for trunk/src/PacpusLib/ComponentBase.cpp

Timestamp:

03/26/14 21:27:30 (10 years ago)

Author:

Marek Kurdej

Message:

Using boost::shared_ptr for storing components.

File:

• trunk/src/PacpusLib/ComponentBase.cpp (modified) (5 diffs)

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;
 }