Merge pull request #70 from lpotter/errors

[sensorfw] Contributes to MER#1001. send errors to clients.

adaptors/hybrisproximityadaptor/hybrisproximityadaptor.cpp

@@ -33,15 +33,19 @@ HybrisProximityAdaptor::HybrisProximityAdaptor(const QString& id) :
     HybrisAdaptor(id,SENSOR_TYPE_PROXIMITY),
     lastNearValue(true)
 {
-    buffer = new DeviceAdaptorRingBuffer<ProximityData>(1);
-    setAdaptedSensor("proximity", "Internal proximity coordinates", buffer);
+    if (isValid()) {
+        buffer = new DeviceAdaptorRingBuffer<ProximityData>(1);
+        setAdaptedSensor("proximity", "Internal proximity coordinates", buffer);
 
-    setDescription("Hybris proximity");
+        setDescription("Hybris proximity");
+    }
 }
 
 HybrisProximityAdaptor::~HybrisProximityAdaptor()
 {
-    delete buffer;
+    if (isValid()) {
+        delete buffer;
+    }
 }
 
 bool HybrisProximityAdaptor::startSensor()

core/hybrisadaptor.cpp

@@ -188,10 +188,11 @@ bool HybrisManager::setDelay(int sensorHandle, int interval)
 void HybrisManager::startReader(HybrisAdaptor *adaptor)
 {
     if (registeredAdaptors.values().contains(adaptor)) {
-        sensordLogD() << "activating " << adaptor->name();
+        sensordLogD() << "activating " << adaptor->name() << adaptor->sensorHandle;
         int error = device->activate(device, adaptor->sensorHandle, 1);
         if (error != 0) {
             sensordLogW() <<Q_FUNC_INFO<< "failed for"<< strerror(-error);
+            adaptor->setValid(false);
         }
         if (!adaptorReader.isRunning())
             adaptorReader.startReader();
@@ -315,7 +316,7 @@ void HybrisManager::processSample(const sensors_event_t& data)
 
 void HybrisManager::registerAdaptor(HybrisAdaptor *adaptor)
 {
-    if (!registeredAdaptors.values().contains(adaptor)) {
+    if (!registeredAdaptors.values().contains(adaptor) && adaptor->isValid()) {
         registeredAdaptors.insertMulti(adaptor->sensorType, adaptor);
     }
 }
@@ -328,8 +329,10 @@ HybrisAdaptor::HybrisAdaptor(const QString& id, int type)
       inStandbyMode_(false),
       running_(false)
 {
-    if (!HybrisAdaptor_sensorTypes().values().contains(sensorType)) {
+    sensorHandle = hybrisManager()->handleForType(sensorType);
+    if (sensorHandle == -1) {
         qDebug() << Q_FUNC_INFO <<"no such sensor" << id;
+        setValid(false);
         return;
     }
 
@@ -345,10 +348,6 @@ HybrisAdaptor::~HybrisAdaptor()
 
 void HybrisAdaptor::init()
 {
-    sensorHandle = hybrisManager()->handleForType(sensorType);
-    if (sensorHandle == -1) {
-        setValid(false);
-    }
     maxRange = hybrisManager()->maxRange(sensorType);
     minDelay = hybrisManager()->minDelay(sensorType);
     if (minDelay > 1000)
@@ -364,6 +363,8 @@ bool HybrisAdaptor::addSensorType(int type)
 
 bool HybrisAdaptor::startAdaptor()
 {
+    if (!isValid())
+        return false;
     return hybrisManager()->openSensors();
 }
 

core/sensormanager.cpp

@@ -268,6 +268,8 @@ AbstractSensorChannel* SensorManager::addSensor(const QString& id)
     {
         sensordLogC() << QString("%1 instantiation failed").arg(cleanId);
         delete sensorChannel;
+        removeSensor(getCleanId(id));
+        sensorFactoryMap_.remove(id);
         return NULL;
     }
 
@@ -291,6 +293,7 @@ void SensorManager::removeSensor(const QString& id)
     bus().unregisterObject(OBJECT_PATH + "/" + id);
     delete entryIt.value().sensor_;
     entryIt.value().sensor_ = 0;
+    sensorInstanceMap_.remove(id);
 }
 
 bool SensorManager::loadPlugin(const QString& name)
@@ -498,11 +501,14 @@ DeviceAdaptor* SensorManager::requestDeviceAdaptor(const QString& id)
             {
                 da = deviceAdaptorFactoryMap_[type](id);
                 Q_ASSERT( da );
-                da->init();
+                bool ok = da->isValid();
+                if (ok) {
+                    da->init();
 
-                ParameterParser::applyPropertyMap(da, entryIt.value().propertyMap_);
+                    ParameterParser::applyPropertyMap(da, entryIt.value().propertyMap_);
 
-                bool ok = da->startAdaptor();
+                    ok = da->startAdaptor();
+                }
                 if (ok)
                 {
                     entryIt.value().adaptor_ = da;

core/sensormanager_a.cpp

@@ -36,7 +36,7 @@
 SensorManagerAdaptor::SensorManagerAdaptor(QObject *parent)
     : QDBusAbstractAdaptor(parent)
 {
-    setAutoRelaySignals(false); //disabling signals since no public client API supports the use of these
+    setAutoRelaySignals(true);//be sure to send error signals on
 }
 
 int SensorManagerAdaptor::errorCodeInt() const

qt-api/sensormanager_i.h

@@ -43,7 +43,7 @@ class LocalSensorManagerInterface : public QDBusAbstractInterface
     Q_DISABLE_COPY(LocalSensorManagerInterface)
     Q_PROPERTY(SensorManagerError errorCode READ errorCode)
     Q_PROPERTY(QString errorString READ errorString)
-    Q_PROPERTY(int errorCodeInt READ errorCodeInt)
+    Q_PROPERTY(int errorCodeInt READ errorCodeInt NOTIFY errorSignal)
 
     /**
      * Get error code integer.

sensors/accelerometersensor/accelerometersensor.cpp

@@ -39,7 +39,10 @@ AccelerometerSensorChannel::AccelerometerSensorChannel(const QString& id) :
     SensorManager& sm = SensorManager::instance();
 
     accelerometerChain_ = sm.requestChain("accelerometerchain");
-    Q_ASSERT( accelerometerChain_ );
+    if (!accelerometerChain_) {
+        setValid(false);
+        return;
+    }
     setValid(accelerometerChain_->isValid());
 
     accelerometerReader_ = new BufferReader<AccelerationData>(1);
@@ -71,16 +74,18 @@ AccelerometerSensorChannel::AccelerometerSensorChannel(const QString& id) :
 
 AccelerometerSensorChannel::~AccelerometerSensorChannel()
 {
-    SensorManager& sm = SensorManager::instance();
+    if (isValid()) {
+        SensorManager& sm = SensorManager::instance();
 
-    disconnectFromSource(accelerometerChain_, "accelerometer", accelerometerReader_);
+        disconnectFromSource(accelerometerChain_, "accelerometer", accelerometerReader_);
 
-    sm.releaseChain("accelerometerchain");
+        sm.releaseChain("accelerometerchain");
 
-    delete accelerometerReader_;
-    delete outputBuffer_;
-    delete marshallingBin_;
-    delete filterBin_;
+        delete accelerometerReader_;
+        delete outputBuffer_;
+        delete marshallingBin_;
+        delete filterBin_;
+    }
 }
 
 bool AccelerometerSensorChannel::start()

sensors/alssensor/alssensor.cpp

@@ -47,7 +47,10 @@ ALSSensorChannel::ALSSensorChannel(const QString& id) :
     SensorManager& sm = SensorManager::instance();
 
     alsAdaptor_ = sm.requestDeviceAdaptor("alsadaptor");
-    Q_ASSERT( alsAdaptor_ );
+    if (!alsAdaptor_) {
+        setValid(false);
+        return;
+    }
 
     alsReader_ = new BufferReader<TimedUnsigned>(1);
 
@@ -93,16 +96,18 @@ ALSSensorChannel::ALSSensorChannel(const QString& id) :
 
 ALSSensorChannel::~ALSSensorChannel()
 {
-    SensorManager& sm = SensorManager::instance();
+    if (isValid()) {
+        SensorManager& sm = SensorManager::instance();
 
-    disconnectFromSource(alsAdaptor_, "als", alsReader_);
+        disconnectFromSource(alsAdaptor_, "als", alsReader_);
 
-    sm.releaseDeviceAdaptor("alsadaptor");
+        sm.releaseDeviceAdaptor("alsadaptor");
 
-    delete alsReader_;
-    delete outputBuffer_;
-    delete marshallingBin_;
-    delete filterBin_;
+        delete alsReader_;
+        delete outputBuffer_;
+        delete marshallingBin_;
+        delete filterBin_;
+    }
 }
 
 bool ALSSensorChannel::start()

sensors/compasssensor/compasssensor.cpp

@@ -38,7 +38,10 @@ CompassSensorChannel::CompassSensorChannel(const QString& id) :
     SensorManager& sm = SensorManager::instance();
 
     compassChain_ = sm.requestChain("compasschain");
-    Q_ASSERT( compassChain_ );
+    if (!compassChain_) {
+        setValid(false);
+        return;
+    }
     setValid(compassChain_->isValid());
 
     inputReader_ = new BufferReader<CompassData>(1);
@@ -69,15 +72,17 @@ CompassSensorChannel::CompassSensorChannel(const QString& id) :
 
 CompassSensorChannel::~CompassSensorChannel()
 {
-    SensorManager& sm = SensorManager::instance();
+    if (isValid()) {
+        SensorManager& sm = SensorManager::instance();
 
-    disconnectFromSource(compassChain_, "truenorth", inputReader_);
-    sm.releaseChain("compasschain");
+        disconnectFromSource(compassChain_, "truenorth", inputReader_);
+        sm.releaseChain("compasschain");
 
-    delete inputReader_;
-    delete outputBuffer_;
-    delete marshallingBin_;
-    delete filterBin_;
+        delete inputReader_;
+        delete outputBuffer_;
+        delete marshallingBin_;
+        delete filterBin_;
+    }
 }
 
 quint16 CompassSensorChannel::declinationValue() const

sensors/gyroscopesensor/gyroscopesensor.cpp

@@ -38,7 +38,10 @@ GyroscopeSensorChannel::GyroscopeSensorChannel(const QString& id) :
     SensorManager& sm = SensorManager::instance();
 
     gyroscopeAdaptor_ = sm.requestDeviceAdaptor("gyroscopeadaptor");
-    Q_ASSERT( gyroscopeAdaptor_ );
+    if (!gyroscopeAdaptor_) {
+        setValid(false);
+        return;
+    }
 
     gyroscopeReader_ = new BufferReader<TimedXyzData>(1);
 
@@ -70,16 +73,18 @@ GyroscopeSensorChannel::GyroscopeSensorChannel(const QString& id) :
 
 GyroscopeSensorChannel::~GyroscopeSensorChannel()
 {
-    SensorManager& sm = SensorManager::instance();
+    if (isValid()) {
+        SensorManager& sm = SensorManager::instance();
 
-    disconnectFromSource(gyroscopeAdaptor_, "gyroscope", gyroscopeReader_);
+        disconnectFromSource(gyroscopeAdaptor_, "gyroscope", gyroscopeReader_);
 
-    sm.releaseDeviceAdaptor("gyroscopeadaptor");
+        sm.releaseDeviceAdaptor("gyroscopeadaptor");
 
-    delete gyroscopeReader_;
-    delete outputBuffer_;
-    delete marshallingBin_;
-    delete filterBin_;
+        delete gyroscopeReader_;
+        delete outputBuffer_;
+        delete marshallingBin_;
+        delete filterBin_;
+    }
 }
 
 bool GyroscopeSensorChannel::start()

sensors/magnetometersensor/magnetometersensor.cpp

@@ -41,7 +41,10 @@ MagnetometerSensorChannel::MagnetometerSensorChannel(const QString& id) :
     SensorManager& sm = SensorManager::instance();
 
     magChain_ = sm.requestChain("magcalibrationchain");
-    Q_ASSERT( magChain_ );
+    if (!magChain_) {
+        setValid(false);
+        return;
+    }
     setValid(magChain_->isValid());
 
     magnetometerReader_ = new BufferReader<CalibratedMagneticFieldData>(1);
@@ -110,17 +113,19 @@ MagnetometerSensorChannel::MagnetometerSensorChannel(const QString& id) :
 
 MagnetometerSensorChannel::~MagnetometerSensorChannel()
 {
-    SensorManager& sm = SensorManager::instance();
+    if (isValid()) {
+        SensorManager& sm = SensorManager::instance();
 
-    disconnectFromSource(magChain_, "calibratedmagnetometerdata", magnetometerReader_);
-    sm.releaseChain("magcalibrationchain");
+        disconnectFromSource(magChain_, "calibratedmagnetometerdata", magnetometerReader_);
+        sm.releaseChain("magcalibrationchain");
 
-    if (scaleFilter_) delete scaleFilter_;
+        if (scaleFilter_) delete scaleFilter_;
 
-    delete magnetometerReader_;
-    delete outputBuffer_;
-    delete marshallingBin_;
-    delete filterBin_;
+        delete magnetometerReader_;
+        delete outputBuffer_;
+        delete marshallingBin_;
+        delete filterBin_;
+    }
 }
 
 bool MagnetometerSensorChannel::start()

sensors/orientationsensor/orientationsensor.cpp

@@ -38,7 +38,10 @@ OrientationSensorChannel::OrientationSensorChannel(const QString& id) :
     SensorManager& sm = SensorManager::instance();
 
     orientationChain_ = sm.requestChain("orientationchain");
-    Q_ASSERT( orientationChain_ );
+    if (!orientationChain_) {
+        setValid(false);
+        return;
+    }
     setValid(orientationChain_->isValid());
 
     orientationReader_ = new BufferReader<PoseData>(1);
@@ -70,16 +73,18 @@ OrientationSensorChannel::OrientationSensorChannel(const QString& id) :
 
 OrientationSensorChannel::~OrientationSensorChannel()
 {
-    SensorManager& sm = SensorManager::instance();
+    if (isValid()) {
+        SensorManager& sm = SensorManager::instance();
 
-    disconnectFromSource(orientationChain_, "orientation", orientationReader_);
+        disconnectFromSource(orientationChain_, "orientation", orientationReader_);
 
-    sm.releaseChain("orientationchain");
+        sm.releaseChain("orientationchain");
 
-    delete orientationReader_;
-    delete outputBuffer_;
-    delete marshallingBin_;
-    delete filterBin_;
+        delete orientationReader_;
+        delete outputBuffer_;
+        delete marshallingBin_;
+        delete filterBin_;
+    }
 }
 
 bool OrientationSensorChannel::start()

sensors/proximitysensor/proximitysensor.cpp

@@ -38,7 +38,10 @@ ProximitySensorChannel::ProximitySensorChannel(const QString& id) :
     SensorManager& sm = SensorManager::instance();
 
     proximityAdaptor_ = sm.requestDeviceAdaptor("proximityadaptor");
-    Q_ASSERT( proximityAdaptor_ );
+    if (!proximityAdaptor_ ) {
+        setValid(false);
+        return;
+    }
 
     proximityReader_ = new BufferReader<ProximityData>(1);
 
@@ -70,16 +73,18 @@ ProximitySensorChannel::ProximitySensorChannel(const QString& id) :
 
 ProximitySensorChannel::~ProximitySensorChannel()
 {
-    SensorManager& sm = SensorManager::instance();
+    if (isValid()) {
+        SensorManager& sm = SensorManager::instance();
 
-    disconnectFromSource(proximityAdaptor_, "proximity", proximityReader_);
+        disconnectFromSource(proximityAdaptor_, "proximity", proximityReader_);
 
-    sm.releaseDeviceAdaptor("proximityadaptor");
+        sm.releaseDeviceAdaptor("proximityadaptor");
 
-    delete proximityReader_;
-    delete outputBuffer_;
-    delete marshallingBin_;
-    delete filterBin_;
+        delete proximityReader_;
+        delete outputBuffer_;
+        delete marshallingBin_;
+        delete filterBin_;
+    }
 }
 
 bool ProximitySensorChannel::start()