Changeset 291 in pacpusframework for trunk/examples

Timestamp:

Mar 27, 2014, 12:53:43 PM (11 years ago)

Author:

Marek Kurdej

Message:

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

Location:

trunk/examples/ProducerConsumerExample

Files:

• ConsumerExample.cpp (modified) (5 diffs)
• ConsumerExample.h (modified) (2 diffs)
• ProducerExample.cpp (modified) (4 diffs)
• ProducerExample.h (modified) (2 diffs)

trunk/examples/ProducerConsumerExample/ConsumerExample.cpp

@@ -17 +17 @@
     LOG_TRACE("constructor(" << name << ")");
 
-    LOG_INFO("Thread " << thread.currentThread());
-    LOG_INFO("Current Thread " << QThread::currentThread());
-
-    namespace po = boost::program_options;
     addParameters()
-        ("output-path", po::value<std::string>(&mOutputFileName)->default_value("consumer.txt"), "set output file path")
+        ("output-path", value<std::string>(&mOutputFileName)->default_value("consumer.txt"), "set output file path")
     ;
 }
@@ -55 +51 @@
 {
     LOG_TRACE(Q_FUNC_INFO);
-    moveToThread(&thread);
     m_counter = 0;
     
@@ -63 +58 @@
     }
 
-    thread.start();
     setState(MONITOR_OK);
     LOG_INFO("started component '" << getName() << "'");
@@ -72 +66 @@
     LOG_TRACE(Q_FUNC_INFO);
 
-    QMetaObject::invokeMethod(&thread, "quit");
     m_file.close();
     setState(STOPPED);
@@ -97 +90 @@
     
     PacpusTypedEvent<int> intEvent(TYPED_EVENT, 2);
-    //PacpusTypedEvent<QImage> imageEvent = intEvent;
+    //PacpusTypedEvent<QImage> imageEvent = intEvent; // should not compile
 }

trunk/examples/ProducerConsumerExample/ConsumerExample.h

@@ -7 +7 @@
 #include <Pacpus/kernel/ComponentBase.h>
 #include <QImage>
-#include <QThread>
 #include <string>
 
@@ -33 +32 @@
 
     QImage matrix;
-    QThread thread;
 
     int m_counter;

trunk/examples/ProducerConsumerExample/ProducerExample.cpp

@@ -1 +1 @@
 #include "ProducerExample.h"
 
-#include <fstream>
 #include <Pacpus/kernel/ComponentFactory.h>
 #include <Pacpus/kernel/ComponentManager.h>
 #include <Pacpus/kernel/InputOutputInterface.h>
 #include <Pacpus/kernel/Log.h>
+
+#include <boost/bind.hpp>
+#include <boost/thread.hpp>
 
 using namespace pacpus;
@@ -18 +20 @@
 ProducerExample::ProducerExample(QString name)
     : ComponentBase(name)
+    , mInterval(boost::posix_time::milliseconds(150))
+    , mTimer(mIo, mInterval)
 {
-    LOG_TRACE("constructor(" << name << ")");
+    PACPUS_LOG_FUNCTION();
 
     namespace po = boost::program_options;
@@ -30 +34 @@
 ProducerExample::~ProducerExample()
 {
-    LOG_TRACE("destructor");
+    PACPUS_LOG_FUNCTION();
 }
 
-ComponentBase::COMPONENT_CONFIGURATION
-ProducerExample::configureComponent(XmlComponentConfig /*config*/)
+ComponentBase::COMPONENT_CONFIGURATION ProducerExample::configureComponent(XmlComponentConfig /*config*/)
 {
     PACPUS_LOG_FUNCTION();
@@ -54 +57 @@
 void ProducerExample::startActivity()
 {
-    LOG_TRACE(Q_FUNC_INFO);
+    PACPUS_LOG_FUNCTION();
 
-    start();
+    using boost::bind;
+    using boost::ref;
+
+    std::fstream mFile(outputFileName, std::ios_base::out | std::ios_base::app);
+    if (!mFile.is_open()) {
+        LOG_ERROR("file '" << outputFileName << "' cannot be opened");
+        return;
+    }
+
+    mImageOutput = getTypedOutput<QImage, ProducerExample>("image");
+
     setActive(true);
     setState(MONITOR_OK);
     LOG_INFO("started component '" << getName() << "'");
+
+    int counter = 0;
+    mTimer.async_wait(bind(&ProducerExample::produce, this, ref(counter)));
+    boost::thread t(bind(&boost::asio::io_service::run, ref(mIo)));
+    //mIo.run();
 }
 
 void ProducerExample::stopActivity()
 {
-    LOG_TRACE(Q_FUNC_INFO);
+    PACPUS_LOG_FUNCTION();
 
     setActive(false);
     setState(STOPPED);
     LOG_INFO("stopped component '" << getName() << "'");
+    
+    mFile.close();
 }
 
-void ProducerExample::run()
+void ProducerExample::produce(int& counter)
 {
-    unsigned int counter = 1;
-    int waitTimeMicros = 150 * 1000;
+    if (!isActive()) {
+        return;
+    }
+    
+    QImage mat(10, 10, QImage::Format_RGB32);
+    //mat.fill( qRgb(189, 149, 39));
+    //mat.setPixel(0,0,i);
+    LOG_INFO("Sending QImage: "
+        << "size = " << mat.size().width()<< " x " << mat.size().height()
+        );
 
-    std::fstream file(outputFileName, std::ios_base::out | std::ios_base::app);
-    if (!file.is_open()) {
-        LOG_ERROR("file '" << outputFileName << "' cannot be opened");
-    }
-
-    QImage mat(10000, 1000, QImage::Format_RGB32);
-    //mat.fill( qRgb(189, 149, 39));
-
-    OutputInterface<QImage, ProducerExample> * imageOutput = 
-        getTypedOutput<QImage, ProducerExample>("image");
-
-    while (isActive()) {
-        //mat.setPixel(0,0,i);
-        LOG_INFO("Sent QImage: "
-            << "size = " << mat.size().width()<< " x " << mat.size().height()
-            );
-
-        checkedSend(imageOutput, mat);
-
-        LOG_INFO("Sent data=" << counter << ", time=" << road_time());
-        file << counter << " " << road_time() << "\n" << std::flush;
-
-        usleep(waitTimeMicros);
-        ++counter;
-        setState(MONITOR_OK);
-    }
-
-    file.close();
+    checkedSend(mImageOutput, mat);
+    LOG_INFO("Sent data=" << counter << ", time=" << road_time());
+    mFile << counter << " " << road_time() << "\n" << std::flush;
+    ++counter;
+    setState(MONITOR_OK);
+    
+    using boost::bind;
+    using boost::ref;
+    mTimer.expires_at(mTimer.expires_at() + mInterval);
+    mTimer.async_wait(bind(&ProducerExample::produce, this, ref(counter)));
 }

trunk/examples/ProducerConsumerExample/ProducerExample.h

@@ -16 +16 @@
 #include <Pacpus/kernel/road_time.h>
 //#include <Pacpus/structure/genericStructures.h>
-#include <QThread>
+
+#include <boost/asio.hpp>
+#include <boost/date_time/posix_time/posix_time_types.hpp>
+#include <fstream>
 #include <QImage>
 
-namespace pacpus {                                                                              
+namespace pacpus
+{
 
 class PRODUCERCONSUMEREXAMPLE_API ProducerExample
-        : public QThread
-        , public ComponentBase
+    : public QObject
+    , public ComponentBase
 {
     Q_OBJECT
@@ -41 +45 @@
     virtual COMPONENT_CONFIGURATION configureComponent(XmlComponentConfig config);
 
-protected:
-    void run();
-
-public Q_SLOTS:
+private:
+    void produce(int& counter);
 
 private:
     std::string mOutputFileName;
-    //QThread thread;
+
+    std::fstream mFile;
+    OutputInterface<QImage, ProducerExample>* mImageOutput;
+
+    boost::asio::io_service mIo;
+    boost::posix_time::time_duration mInterval;
+    boost::asio::deadline_timer mTimer;
 };