Changeset 293 in pacpusframework for trunk

Timestamp:

Mar 27, 2014, 3:50:21 PM (11 years ago)

Author:

Marek Kurdej

Message:

REVERTED: Reworked threading in InputInterfaceBase, each slot has its own processing thread.

Location:

trunk

Files:

• examples/ProducerConsumerExample/ConsumerExample.cpp (modified) (2 diffs)
• examples/ProducerConsumerExample/ConsumerExample.h (modified) (2 diffs)
• examples/ProducerConsumerExample/ProducerExample.cpp (modified) (2 diffs)
• include/Pacpus/kernel/InputOutputInterface.h (modified) (3 diffs)
• src/PacpusLib/InputOutputBase.cpp (modified) (1 diff)

trunk/examples/ProducerConsumerExample/ConsumerExample.cpp

@@ -60 +60 @@
     setState(MONITOR_OK);
     LOG_INFO("started component '" << getName() << "'");
+
+    moveToThread(&mThread);
+    mThread.start();
 }
 
@@ -69 +72 @@
     setState(STOPPED);
     LOG_INFO("stopped component '" << getName() << "'");
+    QMetaObject::invokeMethod(&mThread, "quit");
 }
 

trunk/examples/ProducerConsumerExample/ConsumerExample.h

@@ -7 +7 @@
 #include <Pacpus/kernel/ComponentBase.h>
 #include <QImage>
+#include <QThread>
 #include <string>
 
@@ -37 +38 @@
 
     std::string mOutputFileName;
+    QThread mThread;
 };
 

trunk/examples/ProducerConsumerExample/ProducerExample.cpp

@@ -15 +15 @@
 
 PACPUS_REGISTER_COMPONENT(ProducerExample);
-
-static const char * outputFileName = "producer.txt";
 
 ProducerExample::ProducerExample(QString name)
@@ -62 +60 @@
     using boost::ref;
 
-    std::fstream mFile(outputFileName, std::ios_base::out | std::ios_base::app);
+    std::fstream mFile(mOutputFileName, std::ios_base::out | std::ios_base::app);
     if (!mFile.is_open()) {
-        LOG_ERROR("file '" << outputFileName << "' cannot be opened");
+        LOG_ERROR("file '" << mOutputFileName << "' cannot be opened");
         return;
     }

trunk/include/Pacpus/kernel/InputOutputInterface.h

@@ -8 +8 @@
 #include <QByteArray>
 #include <QCoreApplication>
-#include <QThread>
+//#include <QThread>
 #include <typeinfo>
 
@@ -33 +33 @@
     {
         // each input slot will be processed by a separate thread
-        moveToThread(&mProcessingThread);
-        mProcessingThread.start();
+        //moveToThread(&mProcessingThread);
+        //mProcessingThread.start();
     }
 
@@ -215 +215 @@
 
     ProcessingMethod mProcessingMethod;
-    QThread mProcessingThread;
+    //QThread mProcessingThread;
 };
 

trunk/src/PacpusLib/InputOutputBase.cpp

@@ -72 +72 @@
 
 InputInterfaceBase::InputInterfaceBase(QString name, ComponentBase * component, QObject * parent)
-    : AbstractInterface(name, component, /*parent*/ NULL)
+    : AbstractInterface(name, component, parent)
 {
 }