diff options
author | Wolf Bergenheim <ext-wolf.2.bergenheim@nokia.com> | 2010-05-28 11:19:21 +0300 |
---|---|---|
committer | Wolf Bergenheim <ext-wolf.2.bergenheim@nokia.com> | 2010-05-28 11:19:21 +0300 |
commit | 5fcbe96c43a70deab3d0ec9af3ecec6c906d245d (patch) | |
tree | edd4f391cee01fab00d143d1b79f6abd8004a5eb /libresourceqt/src | |
parent | dc9c29594133291a2944591a359c7adb8f24a85e (diff) |
Fixed bug in trying to register too many times when the first acquire is
called often.
Diffstat (limited to 'libresourceqt/src')
-rw-r--r-- | libresourceqt/src/resource-engine.cpp | 13 | ||||
-rw-r--r-- | libresourceqt/src/resource-engine.h | 2 | ||||
-rw-r--r-- | libresourceqt/src/resource-set.cpp | 13 |
3 files changed, 23 insertions, 5 deletions
diff --git a/libresourceqt/src/resource-engine.cpp b/libresourceqt/src/resource-engine.cpp index 6489a53..e562e47 100644 --- a/libresourceqt/src/resource-engine.cpp +++ b/libresourceqt/src/resource-engine.cpp @@ -20,7 +20,7 @@ static void handleAdviceMessage(resmsg_t *msg, resset_t *rs, void *data); ResourceEngine::ResourceEngine(ResourceSet *resourceSet) : QObject(), connected(false), resourceSet(resourceSet), libresourceSet(NULL), requestId(0), messageMap(), connectionMode(0), - identifier(resourceSet->id()), aboutToBeDeleted(false) + identifier(resourceSet->id()), aboutToBeDeleted(false), isConnecting(false) { if (resourceSet->alwaysGetReply()) { connectionMode += RESMSG_MODE_ALWAYS_REPLY; @@ -205,6 +205,11 @@ bool ResourceEngine::connectToManager() { qDebug("ResourceEngine(%d)::%s() - **************** locking....", identifier, __FUNCTION__); QMutexLocker locker(&mutex); + if (isConnecting) { + qDebug("ResourceEngine::%s().... allready connecting, ignoring request", __FUNCTION__); + return true; + } + isConnecting = true; resmsg_t resourceMessage; memset(&resourceMessage, 0, sizeof(resmsg_t)); resourceMessage.record.type = RESMSG_REGISTER; @@ -373,6 +378,7 @@ void ResourceEngine::handleStatusMessage(quint32 requestNo) if (originalMessageType == RESMSG_REGISTER) { qDebug("ResourceEngine(%d) - connected!", identifier); connected = true; + isConnecting = false; emit connectedToManager(); messageMap.remove(requestNo); } @@ -405,6 +411,11 @@ bool ResourceEngine::isConnectedToManager() return connected; } +bool ResourceEngine::isConnectingToManager() +{ + return isConnecting; +} + bool ResourceEngine::acquireResources() { qDebug("ResourceEngine(%d)::%s() - **************** locking....", identifier, __FUNCTION__); diff --git a/libresourceqt/src/resource-engine.h b/libresourceqt/src/resource-engine.h index fe3260a..38849aa 100644 --- a/libresourceqt/src/resource-engine.h +++ b/libresourceqt/src/resource-engine.h @@ -30,6 +30,7 @@ public: bool connectToManager(); bool disconnectFromManager(); bool isConnectedToManager(); + bool isConnectingToManager(); bool acquireResources(); bool releaseResources(); @@ -71,6 +72,7 @@ private: static resconn_t *libresourceConnection; quint32 identifier; bool aboutToBeDeleted; + bool isConnecting; }; } diff --git a/libresourceqt/src/resource-set.cpp b/libresourceqt/src/resource-set.cpp index d39d445..7dfd5d7 100644 --- a/libresourceqt/src/resource-set.cpp +++ b/libresourceqt/src/resource-set.cpp @@ -193,19 +193,19 @@ Resource * ResourceSet::resource(ResourceType type) const bool ResourceSet::acquire() { if (!initialized) { - qDebug("**************** ResourceSet::%s().... %d", __FUNCTION__, __LINE__); + qDebug("ResourceSet::%s().... initializing...", __FUNCTION__); pendingAcquire = true; return initialize(); } if (!resourceEngine->isConnectedToManager()) { - qDebug("**************** ResourceSet::%s().... %d", __FUNCTION__, __LINE__); + qDebug("ResourceSet::%s().... connecting...", __FUNCTION__); pendingAcquire = true; resourceEngine->connectToManager(); return true; } else { - qDebug("**************** ResourceSet::%s().... %d", __FUNCTION__, __LINE__); + qDebug("ResourceSet::%s().... acquiring", __FUNCTION__); return resourceEngine->acquireResources(); } } @@ -216,6 +216,7 @@ bool ResourceSet::release() return true; } + qDebug("ResourceSet::%s().... releasing...", __FUNCTION__); return resourceEngine->releaseResources(); } @@ -227,8 +228,10 @@ bool ResourceSet::update() if (!resourceEngine->isConnectedToManager()) { pendingUpdate = true; + resourceEngine->connectToManager(); return true; } + qDebug("ResourceSet::%s().... updating...", __FUNCTION__); return resourceEngine->updateResources(); } @@ -267,6 +270,7 @@ void ResourceSet::connectedHandler() { qDebug("**************** ResourceSet::%s().... %d", __FUNCTION__, __LINE__); qDebug("Connected to manager!"); + if (pendingAudioProperties) { registerAudioProperties(); } @@ -287,8 +291,9 @@ void ResourceSet::registerAudioProperties() pendingAudioProperties = true; initialize(); } - else if (!resourceEngine->isConnectedToManager()) { + if (!resourceEngine->isConnectedToManager() && !resourceEngine->isConnectingToManager()) { qDebug("%s(): Connecting to Manager...", __FUNCTION__); + pendingAudioProperties = true; resourceEngine->connectToManager(); } |