- Removed FilterProperty: it had possible memory leak and could retu…

…rn references to already deleted memory. - AccelerometerChain transformation matrix is now instance specific.
sailfishos · Feb 17, 2011 · a751ba8 · a751ba8
1 parent 06a31da
commit a751ba8
Show file tree

Hide file tree

Showing 18 changed files with 70 additions and 252 deletions.
diff --git a/adaptors/mrstaccelerometer/mrstaccelerometeradaptor.h b/adaptors/mrstaccelerometer/mrstaccelerometeradaptor.h
@@ -4,7 +4,6 @@
 #include <QString>
 #include <QStringList>
 #include <linux/input.h>
-#include <filterproperty.h>
 #include "deviceadaptorringbuffer.h"
 #include "datatypes/orientationdata.h"
 #include <QTime>

diff --git a/adaptors/touchadaptor/touchadaptor.cpp b/adaptors/touchadaptor/touchadaptor.cpp
@@ -7,6 +7,7 @@
 
    @author Ustun Ergenoglu <ext-ustun.ergenoglu@nokia.com>
    @author Timo Rongas <ext-timo.2.rongas@nokia.com>
+   @author Antti Virtanen <antti.i.virtanen@nokia.com>
 
    This file is part of Sensord.
 
@@ -33,9 +34,8 @@
 
 const int TouchAdaptor::HARD_MAX_TOUCH_POINTS = 5;
 
-TouchAdaptor::TouchAdaptor(const QString& id) : InputDevAdaptor(id, HARD_MAX_TOUCH_POINTS), rangeInfo_(*this)
+TouchAdaptor::TouchAdaptor(const QString& id) : InputDevAdaptor(id, HARD_MAX_TOUCH_POINTS)
 {
-    rangeInfo_((RangeInfo){0, 0, 0, 0});
 
     //This was previously in the base class, but it's not
     //possible call virtual methods from base class constructor.
@@ -65,7 +65,6 @@ bool TouchAdaptor::checkInputDevice(QString path, QString matchString)
     int fd;
     char deviceName[256];
     unsigned char evtype_bitmask[20+1];
-    RangeInfo rInfo;
 
     fd = open(path.toLocal8Bit().constData(), O_RDONLY);
     if (fd == -1) {
@@ -105,14 +104,12 @@ bool TouchAdaptor::checkInputDevice(QString path, QString matchString)
     // Make separate for each input device if necessary.
     struct input_absinfo info;
     ioctl(fd, EVIOCGABS(ABS_X), &info);
-    rInfo.xMin = info.minimum;
-    rInfo.xRange = info.maximum - info.minimum;
+    rangeInfo_.xMin = info.minimum;
+    rangeInfo_.xRange = info.maximum - info.minimum;
 
     ioctl(fd, EVIOCGABS(ABS_Y), &info);
-    rInfo.yMin = info.minimum;
-    rInfo.yRange = info.maximum - info.minimum;
-
-    rangeInfo_(rInfo);
+    rangeInfo_.yMin = info.minimum;
+    rangeInfo_.yRange = info.maximum - info.minimum;
 
     close(fd);
 

diff --git a/adaptors/touchadaptor/touchadaptor.h b/adaptors/touchadaptor/touchadaptor.h
@@ -7,6 +7,7 @@
 
    @author Ustun Ergenoglu <ext-ustun.ergenoglu@nokia.com>
    @author Timo Rongas <ext-timo.2.rongas@nokia.com>
+   @author Antti Virtanen <antti.i.virtanen@nokia.com>
 
    This file is part of Sensord.
 
@@ -29,7 +30,6 @@
 
 #include "inputdevadaptor.h"
 #include "deviceadaptorringbuffer.h"
-#include "filterproperty.h"
 #include <QObject>
 #include "touchdata.h"
 
@@ -44,7 +44,6 @@
 class TouchAdaptor : public InputDevAdaptor
 {
     Q_OBJECT;
-    Q_PROPERTY(TouchAdaptor::RangeInfo rangeinfo READ rangeInfo_)
 public:
     /**
      * Factory method for gaining a new instance of TouchAdaptor class.
@@ -70,26 +69,26 @@ class TouchAdaptor : public InputDevAdaptor
     /**
      * Holds values read from the driver.
      */
-    struct TouchValues_ {
+    struct TouchValues {
         int x;
         int y;
         int z;
         int volume;
         int toolWidth;
         TouchData::FingerState fingerState;
     };
-    typedef struct TouchValues_ TouchValues;
 
     /**
      * Holds information related to screen properties.
      */
-    struct RangeInfo_ {
+    struct RangeInfo {
+        RangeInfo() : xMin(0), yMin(0), xRange(0), yRange(0) {};
+
         int xMin;   /**< Minimum value from the driver for X-axis */
         int yMin;   /**< Minimum value from the driver for Y-axis */
         int xRange; /**< Width of X-axis */
         int yRange; /**< Width of Y-axis */
     };
-    typedef struct RangeInfo_ RangeInfo;
 
     /**
      * Verify whether the input device handle on given path is a touchscreen device.
@@ -114,7 +113,7 @@ class TouchAdaptor : public InputDevAdaptor
 
     DeviceAdaptorRingBuffer<TouchData>* outputBuffer_;
     TouchValues touchValues_[5];
-    FilterProperty<RangeInfo> rangeInfo_;
+    RangeInfo rangeInfo_;
 };
 
 #endif
diff --git a/chains/accelerometerchain/accelerometerchain.cpp b/chains/accelerometerchain/accelerometerchain.cpp
@@ -7,6 +7,7 @@
 
    @author Timo Rongas <ext-timo.2.rongas@nokia.com>
    @author Ustun Ergenoglu <ext-ustun.ergenoglu@nokia.com>
+   @author Antti Virtanen <antti.i.virtanen@nokia.com>
 
    This file is part of Sensord.
 
@@ -35,13 +36,12 @@
 
 #include "coordinatealignfilter/coordinatealignfilter.h"
 
-double AccelerometerChain::aconv_[3][3] = { { 1.0, 0.0, 0.0 },
-                                            { 0.0, 1.0, 0.0 },
-                                            { 0.0, 0.0, 1.0 } };
-
 AccelerometerChain::AccelerometerChain(const QString& id) :
     AbstractChain(id)
 {
+    aconv_ = { { 1.0, 0.0, 0.0 },
+               { 0.0, 1.0, 0.0 },
+               { 0.0, 0.0, 1.0 } };
     SensorManager& sm = SensorManager::instance();
 
     accelerometerAdaptor_ = sm.requestDeviceAdaptor("accelerometeradaptor");
@@ -64,8 +64,7 @@ AccelerometerChain::AccelerometerChain(const QString& id) :
 
     accCoordinateAlignFilter_ = sm.instantiateFilter("coordinatealignfilter");
     Q_ASSERT(accCoordinateAlignFilter_);
-    qRegisterMetaType<TMatrix>("TMatrix");
-    ((CoordinateAlignFilter*)accCoordinateAlignFilter_)->setProperty("transMatrix", QVariant::fromValue(TMatrix(aconv_)));
+    ((CoordinateAlignFilter*)accCoordinateAlignFilter_)->setMatrix(TMatrix(aconv_));
 
     outputBuffer_ = new RingBuffer<AccelerationData>(128);
     nameOutputBuffer("accelerometer", outputBuffer_);
@@ -132,7 +131,7 @@ bool AccelerometerChain::setMatrixFromString(const QString& str)
         return false;
     }
 
-    for (int i = 0; i < 9; i++)
+    for (int i = 0; i < 9; ++i)
     {
         aconv_[i/3][i%3] = strList.at(i).toInt();
     }

diff --git a/chains/accelerometerchain/accelerometerchain.h b/chains/accelerometerchain/accelerometerchain.h
@@ -6,6 +6,7 @@
    Copyright (C) 2009-2010 Nokia Corporation
 
    @author Timo Rongas <ext-timo.2.rongas@nokia.com>
+   @author Antti Virtanen <antti.i.virtanen@nokia.com>
 
    This file is part of Sensord.
 
@@ -71,7 +72,7 @@ public Q_SLOTS:
 
     bool setMatrixFromString(const QString& str);
 
-    static double                    aconv_[3][3];
+    double                           aconv_[3][3];
     Bin*                             filterBin_;
 
     DeviceAdaptor*                   accelerometerAdaptor_;

diff --git a/core/core.pro b/core/core.pro
@@ -30,7 +30,6 @@ SOURCES += sensormanager.cpp \
     deviceadaptor.cpp \
     loader.cpp \
     plugin.cpp \
-    filterproperty.cpp \
     abstractsensor_a.cpp \
     abstractsensor.cpp \
     logging.cpp \

diff --git a/core/filterproperty.cpp b/core/filterproperty.cpp
diff --git a/core/filterproperty.h b/core/filterproperty.h
diff --git a/core/inputdevadaptor.h b/core/inputdevadaptor.h
@@ -33,7 +33,6 @@
 #include <QStringList>
 #include <QFile>
 #include <linux/input.h>
-#include "filterproperty.h"
 
 /**
  * @brief Base class for adaptors accessing device drivers through Linux Input