Changeset 165 in pacpusframework for branches

Timestamp:

Aug 1, 2013, 6:30:31 PM (11 years ago)

Author:

Marek Kurdej

Message:

Major: changed plugins section name to plugings. Parameters section will be used for something else.

Location:

branches/2.0-beta1

Files:

• examples/ProducerConsumerExample/ConsumerExample.cpp (modified) (2 diffs)
• examples/ProducerConsumerExample/ProducerConsumerExample.xml (modified) (1 diff)
• examples/ProducerConsumerExample/ProducerExample.cpp (modified) (3 diffs)
• include/Pacpus/kernel/PacpusApplication.h (modified) (1 diff)
• include/Pacpus/kernel/XmlConfigFile.h (modified) (1 diff)
• src/PacpusLib/PacpusApplication.cpp (modified) (3 diffs)
• src/PacpusLib/XmlComponentConfig.cpp (modified) (8 diffs)
• src/PacpusLib/XmlConfigFile.cpp (modified) (8 diffs)

branches/2.0-beta1/examples/ProducerConsumerExample/ConsumerExample.cpp

@@ -52 +52 @@
     LOG_TRACE(Q_FUNC_INFO);
     moveToThread(&thread);
+    m_counter = 0;
     
-    m_counter = 0;
-    static const char * outputFileName = "test2.txt";
+    static const char * outputFileName = "consumer.txt";
     m_file.open(outputFileName, std::ios_base::out | std::ios_base::app);
     if (!m_file.is_open()) {
@@ -77 +77 @@
 void ConsumerExample::process(const QImage& matrix)
 {
-    LOG_INFO("Size " << matrix.size().width()<< " x " << matrix.size().height());
-    unsigned int k = 0;
+    m_file << ++m_counter << " " << road_time() << "\n" << std::flush;
 
-    // a process
-    for (int i = 0; i < 100; ++i) {
-        ++k;
-    }
-    m_file << ++m_counter << " " << road_time() << "\n";
+    LOG_INFO("Received QIMage: "
+        << "size = " << matrix.size().width()<< " x " << matrix.size().height()
+        );
+
+    // DO PROCESSING
 
     setState(MONITOR_OK);

branches/2.0-beta1/examples/ProducerConsumerExample/ProducerConsumerExample.xml

@@ -10 +10 @@
     </connections>
 
-    <!-- FIXME: change into plugins -->
-    <parameters prefix="" postfix="_d" extension="dll">
+    <plugins prefix="" postfix="" extension="dll">
         <plugin lib="ProducerConsumerExample" />
-        <plugin lib="ShMem" />
+    </plugins>
+    
+    <parameters>
     </parameters>
 </pacpus>

branches/2.0-beta1/examples/ProducerConsumerExample/ProducerExample.cpp

@@ -71 +71 @@
 void ProducerExample::run()
 {
-    unsigned int counter = 0;
-    int waitTime = 5000;
+    unsigned int counter = 1;
+    int waitTimeMicros = 150 * 1000;
 
     std::fstream file(outputFileName, std::ios_base::out | std::ios_base::app);
@@ -87 +87 @@
     while (isActive()) {
         //mat.setPixel(0,0,i);
-        LOG_INFO("Size " << mat.size().width()<< " x " << mat.size().height());
+        LOG_INFO("Sent QImage: "
+            << "size = " << mat.size().width()<< " x " << mat.size().height()
+            );
 
         if (imageOutput && imageOutput->hasConnection()) {
@@ -93 +95 @@
         }
 
-        LOG_INFO("Send data " << counter << " time " << road_time());
-        file << ++counter << " " << road_time() << "\n";
+        LOG_INFO("Sent data=" << counter << ", time=" << road_time());
+        file << counter << " " << road_time() << "\n" << std::flush;
 
-        usleep(waitTime);
+        usleep(waitTimeMicros);
         ++counter;
         setState(MONITOR_OK);

branches/2.0-beta1/include/Pacpus/kernel/PacpusApplication.h

@@ -41 +41 @@
 
     virtual bool notify(QObject * receiver, QEvent * ev);
+
+private:
+    void installSignalHandler();
 };
 

branches/2.0-beta1/include/Pacpus/kernel/XmlConfigFile.h

@@ -78 +78 @@
 
 protected:
+    QDomElement getSection(const char * name) const;
+    QDomNodeList getNodesInSection(const char * sectionName, const char * nodeName) const;
+
     QDomNodeList getAllComponents() const;
     QDomNodeList getAllConnections() const;
+    QDomNodeList getAllParameters() const;
     QDomNodeList getAllPlugins();
 

branches/2.0-beta1/src/PacpusLib/PacpusApplication.cpp

@@ -9 +9 @@
 /// @copyright Copyright (c) UTC/CNRS Heudiasyc 2006 - 2013. All rights reserved.
 
+#include <csignal>
 #include <Pacpus/kernel/Log.h>
 #include <Pacpus/kernel/PacpusApplication.h>
 #include <Pacpus/kernel/PacpusException.h>
+#include <sstream>
+#include <string>
 
 using namespace pacpus;
@@ -24 +27 @@
     : QApplication(argc, argv, _internal)
 {
+    //installSignalHandler();
 }
 
@@ -92 +96 @@
     return false;
 }
+
+void signalHandler(int signal);
+
+void PacpusApplication::installSignalHandler()
+{
+    LOG_INFO("installing signal handler...");
+
+    typedef void (*SignalHandlerType)(int);
+
+    //std::signal(SIGABRT, &signalHandler);
+    //std::signal(SIGFPE, &signalHandler);
+    //std::signal(SIGILL, &signalHandler);
+    std::signal(SIGINT, &signalHandler); // interrupt (CTRL-C)
+    //std::signal(SIGSEGV, &signalHandler);
+    //std::signal(SIGTERM, &signalHandler);
+
+    LOG_INFO("successfully installed signal handler");
+}
+
+void signalHandler(int signal)
+{
+    LOG_FATAL("signal received: sig = " << signal);
+    std::stringstream errorMessage;
+    errorMessage << "received signal number " << signal;
+    throw PacpusException(errorMessage.str());
+}

branches/2.0-beta1/src/PacpusLib/XmlComponentConfig.cpp

@@ -14 +14 @@
 DECLARE_STATIC_LOGGER("pacpus.core.XmlComponentConfig");
 
-// FIXME: const char* instead of const string
-static const string kPropertyComponentName = "name";
-static const string kPropertyComponentType = "type";
-static const string kPropertyConnectionType = "type";
-static const string kPropertyConnectionInput = "input";
-static const string kPropertyConnectionOutput = "output";
-static const string kPropertyConnectionPriority = "priority";
-//static const string kPropertyConnectionInputC = "inputC";
-//static const string kPropertyConnectionInputP = "inputP";
-//static const string kPropertyConnectionOutputC = "outputC";
-//static const string kPropertyConnectionOutputP = "outputP";
+static const char* kPropertyComponentName = "name";
+static const char* kPropertyComponentType = "type";
+static const char* kPropertyConnectionType = "type";
+static const char* kPropertyConnectionInput = "input";
+static const char* kPropertyConnectionOutput = "output";
+static const char* kPropertyConnectionPriority = "priority";
 
 XmlComponentConfig::XmlComponentConfig(const QString& name)
@@ -47 +42 @@
     {
         LOG_ERROR("cannot add component property:"
-                  << " component '" << component_.attribute(kPropertyComponentName.c_str()) << "'"
+                  << " component '" << component_.attribute(kPropertyComponentName) << "'"
                   << " already contains property '" << name << "'"
                   << " and its value is '" << component_.attribute(name) << "'"
@@ -57 +52 @@
     component_.setAttribute(name, 0);
     LOG_INFO("property '" << name << "'"
-              << " was added to the component " << component_.attribute(kPropertyComponentName.c_str()) << "'"
+              << " was added to the component " << component_.attribute(kPropertyComponentName) << "'"
               << " and set to '" << component_.attribute(name) << "'"
               );
@@ -66 +61 @@
     if (!hasProperty(name)) {
         LOG_WARN("cannot delete compoenent property '" << name << "'"
-                 << " of component '" << component_.attribute(kPropertyComponentName.c_str()) << "'"
+                 << " of component '" << component_.attribute(kPropertyComponentName) << "'"
                  << ". Component does not contain this property."
                  );
@@ -75 +70 @@
     component_.removeAttribute(name);
     LOG_INFO("property '" << name << "' "
-      << " of component '" << component_.attribute(kPropertyComponentName.c_str()) << "'"
+      << " of component '" << component_.attribute(kPropertyComponentName) << "'"
       << " was deleted"
       );
@@ -87 +82 @@
     {
         LOG_WARN("cannot retrieve component property '" << name << "'"
-                 << " of component '" << component_.attribute(kPropertyComponentName.c_str()) << "'"
+                 << " of component '" << component_.attribute(kPropertyComponentName) << "'"
                  << ". Component does not contain this property."
                  );
@@ -116 +111 @@
     component_.setAttribute(name, value);
     LOG_INFO("property " << name
-             << " of the component " << component_.attribute(kPropertyComponentName.c_str())
+             << " of the component " << component_.attribute(kPropertyComponentName)
              << " was set to : " << value
              );
@@ -138 +133 @@
 QString const XmlComponentConfig::getComponentName() const
 {
-    //return component_.attribute(kPropertyComponentName.c_str());
-    return getProperty(kPropertyComponentName.c_str());
+    return getProperty(kPropertyComponentName);
 }
 
 QString const XmlComponentConfig::getComponentType() const
 {
-    return getProperty(kPropertyComponentType.c_str());
+    return getProperty(kPropertyComponentType);
 }
 
 QString const XmlComponentConfig::getConnectionType() const
 {
-    return getProperty(kPropertyConnectionType.c_str());
+    return getProperty(kPropertyConnectionType);
 }
 
 QString const XmlComponentConfig::getConnectionInput() const
 {
-    return getProperty(kPropertyConnectionInput.c_str());
+    return getProperty(kPropertyConnectionInput);
 }
 
 QString const XmlComponentConfig::getConnectionOutput() const
 {
-    return getProperty(kPropertyConnectionOutput.c_str());
+    return getProperty(kPropertyConnectionOutput);
 }
 
 int const XmlComponentConfig::getConnectionPriority() const
 {
-    return getIntProperty(kPropertyConnectionPriority.c_str(),0);
+    return getIntProperty(kPropertyConnectionPriority, /*defaultValue=*/0);
 }

branches/2.0-beta1/src/PacpusLib/XmlConfigFile.cpp

@@ -28 +28 @@
 static const char * kConnectionSection = "connections";
 static const char * kParameterSection = "parameters";
+static const char * kPluginSection = "plugins";
 
 static const char * kComponentNode = "component";
 static const char * kConnectionNode = "connection";
+static const char * kParameterNode = "parameter";
 static const char * kPluginNode = "plugin";
 
@@ -55 +57 @@
     // create the sections
     m_document.documentElement().appendChild(m_document.createElement(kParameterSection));
+    m_document.documentElement().appendChild(m_document.createElement(kPluginSection));
     m_document.documentElement().appendChild(m_document.createElement(kComponentSection));
     m_document.documentElement().appendChild(m_document.createElement(kConnectionSection));
@@ -93 +96 @@
     (void) mutexLocker; // unused
 
-    // TODO: change .tagName => .attribute(kPropertyComponentName.c_str())
+    // TODO: change .tagName => .attribute(kPropertyComponentName)
     QDomNode componentSectionNode = getNamedItemFromDomDocument(m_document, kComponentSection);
     if (componentSectionNode.namedItem(component.attribute(kNameAttribute)/*.tagName()*/).isNull()) {
@@ -206 +209 @@
 }
 
+// XML
+QDomElement XmlConfigFile::getSection(const char * name) const
+{
+    QDomElement sectionElement = getNamedItemFromDomDocument(m_document, name).toElement();
+    if (sectionElement.isNull()) {
+        LOG_WARN("there is no '" << name << "' section in the XML");
+        return QDomElement();
+    }
+    return sectionElement;
+}
+
+QDomNodeList XmlConfigFile::getNodesInSection(const char * sectionName, const char * nodeName) const
+{
+    QDomElement sectionElement = getSection(sectionName);
+    return sectionElement.elementsByTagName(nodeName);
+}
+
 // COMPONENTS
 QDomNodeList XmlConfigFile::getAllComponents() const
 {
-    // get components section
-    QDomElement componentsElement = getNamedItemFromDomDocument(m_document, kComponentSection).toElement();
-    if (componentsElement.isNull()) {
-        LOG_WARN("there is no '" << kComponentSection << "' section in the XML");
-        return QDomNodeList();
-    }
-
-    // get component nodes
-    return componentsElement.elementsByTagName(kComponentNode);
+    return getNodesInSection(kComponentSection, kComponentNode);
 }
 
@@ -252 +264 @@
 QDomNodeList XmlConfigFile::getAllConnections() const
 {
-    // get connections section
-    QDomElement connectionsElement = getNamedItemFromDomDocument(m_document, kParameterSection).toElement();
-    if (connectionsElement.isNull()) {
-        LOG_WARN("there is no '" << kParameterSection << "' section in the XML");
-        return QDomNodeList();
-    }
-
-    // get connection nodes
-    //return connectionsElement.elementsByTagName(kConnectionNode);
-    return getNamedItemFromDomDocument(m_document, kConnectionSection).childNodes();
+    return getNodesInSection(kConnectionSection, kConnectionNode);
 }
 
@@ -281 +284 @@
 }
 
+// PARAMETERS
+QDomNodeList XmlConfigFile::getAllParameters() const
+{
+    return getNodesInSection(kParameterSection, kParameterNode);
+}
+
 // PLUGINS
 QDomNodeList XmlConfigFile::getAllPlugins()
 {
-    // get parameters section
-    QDomElement parametersElement = getNamedItemFromDomDocument(m_document, kParameterSection).toElement();
-    if (parametersElement.isNull()) {
-        LOG_WARN("there is no '" << kParameterSection << "' section in the XML");
-        return QDomNodeList();
-    }
+    // get section
+    QDomElement pluginsElement = getSection(kPluginSection);
 
     // get attributes
-    m_libraryExtension = parametersElement.attribute(kExtensionAttribute);
+    m_libraryExtension = pluginsElement.attribute(kExtensionAttribute);
     if (!m_libraryExtension.isEmpty()) {
         // prefix with a dot '.' if there is no one
@@ -299 +304 @@
         }
     }
-    m_libraryPrefix = parametersElement.attribute(kPrefixAttribute);
-    m_libraryPostfix = parametersElement.attribute(kPostfixAttribute);
+    m_libraryPrefix = pluginsElement.attribute(kPrefixAttribute);
+    m_libraryPostfix = pluginsElement.attribute(kPostfixAttribute);
     
-    // get plugin nodes
-    return parametersElement.elementsByTagName(kPluginNode);
+    // get nodes
+    return getNodesInSection(kPluginSection, kPluginNode);
 }
 
@@ -313 +318 @@
         return QStringList();
     }
+    LOG_INFO("there are " << pluginList.size() << " plugins");
 
     // get plugin library paths