Changeset 153 in pacpusframework

Timestamp:

08/01/13 11:42:22 (11 years ago)

Author:

Marek Kurdej

Message:

Fixed: C4996 unchecked iterator warning on MSVC.

Location:

branches/2.0-beta1

Files:

• include/Pacpus/kernel/ConnectionBase.h (modified) (2 diffs)
• include/Pacpus/kernel/InputOutputBase.h (modified) (2 diffs)
• include/Pacpus/kernel/InputOutputInterface.h (modified) (5 diffs)
• include/Pacpus/kernel/PacpusEvent.h (modified) (1 diff)
• src/PacpusLib/ComponentManager.cpp (modified) (2 diffs)

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

@@ -1 @@
-#ifndef ConnectionBase_H
-#define ConnectionBase_H
+#ifndef CONNECTIONBASE_H
+#define CONNECTIONBASE_H
 
 #include <Pacpus/kernel/pacpus.h>
@@ -11 +11 @@
 {
 public:
-    ConnectionBase(AbstractInterface * interface, int priority):_interface(interface),_priority(priority) {}
-    ~ConnectionBase() {}
+    ConnectionBase(AbstractInterface * interface, int priority)
+        : m_interface(interface)
+        , m_priority(priority)
+    {}
 
-    AbstractInterface *  getInterface() const {return _interface;}
-    int getPriority() const {return _priority;}
+    ~ConnectionBase()
+    {}
 
-    bool operator== (ConnectionBase const &c) {
-        return _interface == c.getInterface() && _priority == c.getPriority();}
+    AbstractInterface *  getInterface() const
+    {
+        return m_interface;
+    }
+
+    int getPriority() const
+    {
+        return m_priority;
+    }
+
+    bool operator==(ConnectionBase const &c)
+    {
+        return getInterface() == c.getInterface()
+            && getPriority() == c.getPriority()
+            ;
+    }
 
 private:
-    AbstractInterface * _interface;
-    int _priority;
+    AbstractInterface * m_interface;
+    int m_priority;
 };
 
 } // namespace pacpus
 
-#endif // ConnectionBase_H
+#endif // CONNECTIONBASE_H

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

@@ -2 +2 @@
 #define IN_OUT_BASE_H
 
+#include <Pacpus/kernel/Log.h>
 #include <Pacpus/kernel/pacpus.h>
 #include <Pacpus/kernel/ConnectionBase.h>
@@ -26 +27 @@
         , m_component(component)
         , QObject(parent)
-    {}
+    {
+        LOG_DEBUG("constructing abstract connection '" << getName() << "'");
+    }
 
     ~AbstractInterface()

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

@@ -5 +5 @@
 #include <Pacpus/kernel/InputOutputBase.h>
 #include <QApplication>
+#include <QByteArray>
+#include <QThread>
 #include <typeinfo>
-
-#include <QDebug>
-#include <QThread>
-
-#include <QByteArray>
-
-//#define ADD_INPUT(name, ComponentType, DataType, functionName) \
-//    inputs().insert((name), new InputInterface<DataType, ComponentType> ((name), this, &ComponentType::functionName))
-//#define ADD_OUTPUT(name, ComponentType, DataType) \
-//    outputs().insert((name), new OutputInterface<DataType, ComponentType> ((name), this))
-
-//#define GET_INPUT(name, ComponentType, DataType) \
-//    dynamic_cast<InputInterface<DataType, ComponentType> *> (input.value(name))
-//#define GET_OUTPUT(name, ComponentType, DataType) \
-//    dynamic_cast<OutputInterface<DataType, ComponentType> *> (output.value(name))
 
 namespace pacpus {
@@ -61 +48 @@
             PacpusTypedEvent<T> * typedEvent = dynamic_cast<PacpusTypedEvent<T> *> (event);
 
-            //qDebug() << "Reciever " << getSignature() << " thread " << QThread::currentThread() << " Data & " << & typedEvent->data_;
+            LOG_DEBUG("Receiver " << getSignature() << " thread " << QThread::currentThread() << " Data & " << & typedEvent->data_);
 
             //if(_component) get state
 
             if (typedEvent->timerange() < 500 && readingMode() == TimeBounded) {
-                //LOG_WARN("Incorrect TimeRange (0), switch to NeverSkip");
-                qDebug() << "Incorrect TimeRange (0), switch to NeverSkip";
-                readingMode() = NeverSkip;}
+                LOG_WARN("Incorrect TimeRange (0), switch to NeverSkip");
+                readingMode() = NeverSkip;
+            }
 
             switch (readingMode()) {
             case TimeBounded:
-                //qDebug() << "Input " << this->getSignature().leftJustified(20) << QString("Time bournded").leftJustified(15) << road_time()- typedEvent->t_ << "\t" << typedEvent->tr_;
+                LOG_DEBUG("Input " << this->getSignature().leftJustified(20) << QString("Time bournded").leftJustified(15) << road_time()- typedEvent->t_ << "\t" << typedEvent->tr_);
 
                 if (road_time() - typedEvent->time() > typedEvent->timerange()) {
-                    qDebug() << "Data skip " << this->getSignature();
+                    LOG_DEBUG("Data skip " << this->getSignature());
                     break;
                 }
@@ -83 +70 @@
 
             case GetLast:
-                //qDebug() << "Input " << this->getSignature().leftJustified(20) << QString("GetLast").leftJustified(15) << road_time() - typedEvent->t_ << "\t" << typedEvent->tr_;
+                LOG_DEBUG("Input " << this->getSignature().leftJustified(20) << QString("GetLast").leftJustified(15) << road_time() - typedEvent->t_ << "\t" << typedEvent->tr_);
 
                 (dynamic_cast<C*>(component())->*method)(typedEvent->data());
-                QCoreApplication::removePostedEvents(this,TYPED_EVENT); // delete all remining events
+                // delete all remaining events
+                QCoreApplication::removePostedEvents(this, TYPED_EVENT);
                 break;
 
             case NeverSkip:
-                //qDebug() << "Input " << this->getSignature().leftJustified(20) << QString("NeverSkip").leftJustified(15) << road_time() - typedEvent->t_ << "\t" << typedEvent->tr_;
+                LOG_DEBUG("Input " << this->getSignature().leftJustified(20) << QString("NeverSkip").leftJustified(15) << road_time() - typedEvent->t_ << "\t" << typedEvent->tr_);
 
             default:
@@ -118 +106 @@
 
         default:
-
-            qDebug() << "Unknown event ID " << event->type();
+            LOG_WARN("Unknown event ID " << event->type());
             break;
         }
@@ -152 +139 @@
 
     // Used by Components to send data througth typed output
-    void send(const T & data, road_time_t t = road_time(), road_timerange_t tr = 0) {
-
+    void send(const T & data, road_time_t t = road_time(), road_timerange_t tr = 0)
+    {
         //QSharedPointer<T> sharedPointer = new T(data);
 
-        for(QList<ConnectionBase>::iterator it = connections().begin(); it != connections().end(); ++it){
+        for (QList<ConnectionBase>::iterator it = connections().begin(); it != connections().end(); ++it) {
             QApplication::postEvent(it->getInterface(),new PacpusTypedEvent<T>(TYPED_EVENT,data,t,tr),it->getPriority()); // Event is delete by the event loop handler
             //qDebug() << "sender " << it->getInterface()->getSignature() <<  " thread " << QThread::currentThread() << " Data & " << &data << " ";

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

@@ -139 +139 @@
     {
         m_data = new char[m_dataSize];
-        ::std::copy(data, data + m_dataSize, m_data);
+        ::std::copy(data, data + m_dataSize, // source
+#ifdef _MSC_VER
+            ::stdext::checked_array_iterator<char *>(m_data, m_dataSize) // destination
+#else
+            m_data // destination
+#endif
+            );
     }
 

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

@@ -338 +338 @@
 
     ComponentBase* component = getComponent(componentName);
-    if (!component)
-    {
+    if (!component) {
         LOG_WARN("cannot start component '" << componentName << "'.  It does not exist!");
         return false;
@@ -348 +347 @@
         LOG_WARN("cannot start component '" << componentName << "'. It can already be started");
     }
-
+    LOG_INFO("successfully started component '" << componentName << "'");
     return true;
 }