Skip to content

Commit

Permalink
[sensorfwd] Tweak plugin loading related logging
Browse files Browse the repository at this point in the history 
Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>
  • Loading branch information
@spiiroin
spiiroin committed May 24, 2018
1 parent 6fcb893 commit cdea3ec
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
8 changes: 4 additions & 4 deletions core/nodebase.cpp
View file
Expand Up @@ -80,7 +80,7 @@ void NodeBase::introduceAvailableDataRange(const DataRange& range)
{
if (!m_dataRangeList.contains(range))
{
sensordLogD() << "Introduced new data range: " << range.min << "-" << range.max << ", " << range.resolution;
sensordLogD() << "Introduced new data range for '" << id_ << "':" << range.min << "-" << range.max << "," << range.resolution;
m_dataRangeList.append(range);
}
}
Expand Down Expand Up @@ -273,7 +273,7 @@ void NodeBase::introduceAvailableInterval(const DataRange& interval)
{
if (!m_intervalList.contains(interval))
{
sensordLogD() << "Introduced new interval: " << interval.min << "-" << interval.max;
sensordLogD() << "Introduced new interval for '" << id_ << "':" << interval.min << "-" << interval.max;
m_intervalList.append(interval);
}
}
Expand Down Expand Up @@ -375,7 +375,7 @@ bool NodeBase::standbyOverride() const

bool NodeBase::setStandbyOverrideRequest(const int sessionId, const bool override)
{
sensordLogD() << sessionId << " requested standbyoverride for '" << id() << "' :" << override;
sensordLogD() << sessionId << "requested standbyoverride for '" << id() << "' :" << override;
// Only store true requests, id is enough, no need for value
if (override == false)
{
Expand Down Expand Up @@ -459,7 +459,7 @@ bool NodeBase::setDefaultInterval(const unsigned int value)
{
if (!isValidIntervalRequest(value))
{
sensordLogW() << "Attempting to define invalid default data rate: " << value;
sensordLogW() << "Attempting to define invalid default data rate:" << value;
return false;
}
m_defaultInterval = value;
Expand Down
22 changes: 11 additions & 11 deletions core/sensormanager.cpp
View file
Expand Up @@ -310,7 +310,7 @@ AbstractSensorChannel* SensorManager::addSensor(const QString& id)

void SensorManager::removeSensor(const QString& id)
{
sensordLogD() << "Removing sensor: " << id;
sensordLogD() << "SensorManager removing sensor:" << id;

QMap<QString, SensorInstanceEntry>::iterator entryIt = sensorInstanceMap_.find(id);
bus().unregisterObject(OBJECT_PATH + "/" + id);
Expand All @@ -321,7 +321,7 @@ void SensorManager::removeSensor(const QString& id)

bool SensorManager::loadPlugin(const QString& name)
{
sensordLogD() << "Loading plugin: " << name;
sensordLogD() << "SensorManager loading plugin:" << name;

QString errorMessage;
bool result;
Expand All @@ -335,7 +335,7 @@ bool SensorManager::loadPlugin(const QString& name)

int SensorManager::requestSensor(const QString& id)
{
sensordLogD() << "Requesting sensor: " << id;
sensordLogD() << "Requesting sensor:" << id;

clearError();

Expand Down Expand Up @@ -440,7 +440,7 @@ AbstractChain* SensorManager::requestChain(const QString& id)
{
chain = chainFactoryMap_[type](id);
Q_ASSERT(chain);
sensordLogD() << "Instantiated chain '" << id << "'. Valid = " << chain->isValid();
sensordLogD() << "Instantiated chain '" << id << "'. Valid =" << chain->isValid();

entryIt.value().cnt_++;
entryIt.value().chain_ = chain;
Expand Down Expand Up @@ -499,7 +499,7 @@ void SensorManager::releaseChain(const QString& id)

DeviceAdaptor* SensorManager::requestDeviceAdaptor(const QString& id)
{
sensordLogD() << "Requesting adaptor: " << id;
sensordLogD() << "Requesting adaptor:" << id;

clearError();
if( id.contains(';') ) // no parameter passing in release
Expand All @@ -517,7 +517,7 @@ DeviceAdaptor* SensorManager::requestDeviceAdaptor(const QString& id)
Q_ASSERT( entryIt.value().adaptor_ );
da = entryIt.value().adaptor_;
entryIt.value().cnt_++;
sensordLogD() << "Found adaptor '" << id << "'. Ref count: " << entryIt.value().cnt_;
sensordLogD() << "Found adaptor '" << id << "'. Ref count:" << entryIt.value().cnt_;
}
else
{
Expand All @@ -538,7 +538,7 @@ DeviceAdaptor* SensorManager::requestDeviceAdaptor(const QString& id)
{
entryIt.value().adaptor_ = da;
entryIt.value().cnt_++;
sensordLogD() << "Instantiated adaptor '" << id << "'. Valid = " << da->isValid();
sensordLogD() << "Instantiated adaptor '" << id << "'. Valid =" << da->isValid();
}
else
{
Expand All @@ -563,7 +563,7 @@ DeviceAdaptor* SensorManager::requestDeviceAdaptor(const QString& id)

void SensorManager::releaseDeviceAdaptor(const QString& id)
{
sensordLogD() << "Releasing adaptor: " << id;
sensordLogD() << "Releasing adaptor:" << id;

clearError();
if( id.contains(';') ) // no parameter passing in release
Expand Down Expand Up @@ -594,7 +594,7 @@ void SensorManager::releaseDeviceAdaptor(const QString& id)
}
else
{
sensordLogD() << "Adaptor '" << id << "' has ref count: " << entryIt.value().cnt_;
sensordLogD() << "Adaptor '" << id << "' has ref count:" << entryIt.value().cnt_;
}
}
else
Expand All @@ -610,7 +610,7 @@ void SensorManager::releaseDeviceAdaptor(const QString& id)

FilterBase* SensorManager::instantiateFilter(const QString& id)
{
sensordLogD() << "Instantiating filter: " << id;
sensordLogD() << "Instantiating filter:" << id;

QMap<QString, FilterFactoryMethod>::iterator it = filterFactoryMap_.find(id);
if(it == filterFactoryMap_.end())
Expand Down Expand Up @@ -673,7 +673,7 @@ void SensorManager::lostClient(int sessionId)

void SensorManager::displayStateChanged(bool displayState)
{
sensordLogD() << "Signal detected, display state changed to: " << displayState;
sensordLogD() << "Signal detected, display state changed to:" << displayState;
if (displayState) {
/// Emit signal to make background calibration resume from sleep
emit displayOn();
Expand Down

0 comments on commit cdea3ec

Please sign in to comment.