From 05f8fa1ebccab6eb55ccbd8a3921bc7016512749 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20L=C3=B6fman?= <rlofman@x201.research.nokia.com>
Date: Thu, 18 Nov 2010 14:50:40 +0200
Subject: Added bool ResourceSet::initAndConnect() so that one can connect
 without acquiring.

---
 resourceqt-client/client.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'resourceqt-client')

diff --git a/resourceqt-client/client.cpp b/resourceqt-client/client.cpp
index 25ae5a1..804ac56 100644
--- a/resourceqt-client/client.cpp
+++ b/resourceqt-client/client.cpp
@@ -133,9 +133,10 @@ bool Client::initialize(const CommandLineParser &parser)
                  this, SLOT(doExit()))) {
         return false;
     }
-    output << "accepting input" << endl;
-    showPrompt();
 
+    resourceSet->initAndConnect();
+    output << "connecting...accepting input" << endl;
+    showPrompt();
     return true;
 }
 
-- 
cgit v1.2.3


From b723c98d18c4fdec1654ea283e5bfd9ea44dc701 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20L=C3=B6fman?= <ext-robert.lofman@nokia.com>
Date: Fri, 26 Nov 2010 15:26:32 +0200
Subject: Added connectedToManager() signal

---
 resourceqt-client/client.cpp | 14 ++++++++++++++
 resourceqt-client/client.h   |  1 +
 2 files changed, 15 insertions(+)

(limited to 'resourceqt-client')

diff --git a/resourceqt-client/client.cpp b/resourceqt-client/client.cpp
index 804ac56..fe15586 100644
--- a/resourceqt-client/client.cpp
+++ b/resourceqt-client/client.cpp
@@ -129,11 +129,15 @@ bool Client::initialize(const CommandLineParser &parser)
     if (!connect(&stdInNotifier, SIGNAL(activated(int)), this, SLOT(readLine(int)))) {
         return false;
     }
+    if (!connect(resourceSet , SIGNAL(connectedToManager()), this, SLOT(stopConnectTimerHandler()))) {
+        return false;
+    }
     if (!connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()),
                  this, SLOT(doExit()))) {
         return false;
     }
 
+    start_timer();
     resourceSet->initAndConnect();
     output << "connecting...accepting input" << endl;
     showPrompt();
@@ -146,6 +150,7 @@ void Client::doExit()
         resourceSet->release();
 }
 
+
 const char * resourceTypeToString(ResourceType type)
 {
     switch (type) {
@@ -201,6 +206,15 @@ void Client::showResources(const QList<Resource*> &resList)
     }
 }
 
+void Client::stopConnectTimerHandler()
+{
+    long int ms = stop_timer();
+    if (ms > 0) {
+        outputln << "Register took " << ms << "ms" << endl;
+    }
+
+}
+
 void Client::resourceAcquiredHandler(const QList<ResourceType>&)
 {
     long int ms = stop_timer();
diff --git a/resourceqt-client/client.h b/resourceqt-client/client.h
index c22475d..342f5f9 100644
--- a/resourceqt-client/client.h
+++ b/resourceqt-client/client.h
@@ -62,6 +62,7 @@ private slots:
     void resourcesBecameAvailableHandler(const QList<ResourcePolicy::ResourceType> &availableResources);
     void readLine(int);
     void doExit();
+    void stopConnectTimerHandler();
 
 private:
     QTextStream standardInput;
-- 
cgit v1.2.3


From bd39d64e2e0c08f323187fe9946c437b5ea8af35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20L=C3=B6fman?= <ext-robert.lofman@nokia.com>
Date: Fri, 26 Nov 2010 15:38:14 +0200
Subject: Changed the update command in resourceqt-client to match
 resource-client.

---
 resourceqt-client/client.cpp | 150 +++++++++++++++++++++++++++----------------
 resourceqt-client/client.h   |   1 +
 2 files changed, 97 insertions(+), 54 deletions(-)

(limited to 'resourceqt-client')

diff --git a/resourceqt-client/client.cpp b/resourceqt-client/client.cpp
index fe15586..23d5acb 100644
--- a/resourceqt-client/client.cpp
+++ b/resourceqt-client/client.cpp
@@ -59,9 +59,8 @@ Client::Client()
     commandList["free"] = CommandListArgs("", "destroy and free the resources");
     commandList["acquire"] = CommandListArgs("", "acquire required resources");
     commandList["release"] = CommandListArgs("", "release resources");
-    commandList["update"] = CommandListArgs("", "update modified resource set after add or remove command");
-    commandList["add"] = CommandListArgs("reslist [-o]", "add resource list, if -o provided, set as optional");
-    commandList["remove"] = CommandListArgs("reslist [-o]", "remove resource list, if -o provided, removed only optional flag");
+    commandList["update"] = CommandListArgs("update all[:opt] where 'all' and 'opt' are comma separated resources",
+                                               "update the resource set by specifying the new set");
     commandList["audio"] = CommandListArgs("pid <pid> | group <audio group> | tag <name> <value>", "set audio properties");
     commandList["addaudio"] = CommandListArgs("<audio group> <pid> <tag name> <tag value>", "Add an audio resource and set the properties");
     commandList["show"] = CommandListArgs("", "show resources");
@@ -151,6 +150,80 @@ void Client::doExit()
 }
 
 
+void Client::modifyResources(QString resString)
+{
+    //resString example: [mand_resources:opt_resources] res1,res2,res3:res1,res3
+   if ( resString.isEmpty() || resString.isNull())
+   {
+       qDebug("Client::modifyResources(): no resources in string.");
+       return;
+   }
+   QStringList newAllAndOpt = resString.split(":");
+
+   if (newAllAndOpt.size()==1)
+       qDebug("There are only manditory resources.");
+
+   //Every optional res. is also in allSet
+   QSet<ResourcePolicy::ResourceType> newAllSet;
+   QSet<ResourcePolicy::ResourceType> newOptSet;
+
+   if ( !CommandLineParser::parseResourceList(newAllAndOpt.at(0), newAllSet) )
+       return;
+
+   if (newAllAndOpt.size()>1)
+   {
+       if ( !CommandLineParser::parseResourceList(newAllAndOpt.at(1), newOptSet) )
+           return;
+       //If the user forgot to add resource to all when specifying optional -> add to all.
+       foreach(ResourceType newOptRes, newOptSet)
+       {
+           if ( !newAllSet.contains(newOptRes) )
+           {
+               qDebug("Client::modifyResources(): optional resources should be added to all as well.");
+               newAllSet.insert(newOptRes);
+           }
+       }
+   }
+
+   QSet<ResourceType>::iterator newResIt = newAllSet.begin();
+   QList<Resource*>             resList  = resourceSet->resources();
+
+   //Check if new resources are in current resource set.
+   while (newResIt != newAllSet.end())
+   {
+        ResourceType newRes = *newResIt;
+
+        if ( resourceSet->contains(newRes) )
+        {
+            if ( resourceSet->resource(newRes)->isOptional() && !newOptSet.contains(newRes) ) {
+                //New manditory is in set, but is not optional in the new set.
+                resourceSet->resource(newRes)->setOptional(false);
+            }
+            else if ( !resourceSet->resource(newRes)->isOptional() && newOptSet.contains(newRes) )
+            {
+                //New manditory is in set, but is optional.
+                resourceSet->resource(newRes)->setOptional(true);
+            }
+        }
+        else
+        {   //Add new resource.
+            resourceSet->addResource(newRes);
+
+            if ( newOptSet.contains(newRes) )
+                resourceSet->resource(newRes)->setOptional(true);
+
+        }
+        ++newResIt;
+    }
+
+    //Check if there are current resources not in the new set (i.e. removed).
+    foreach(Resource* resource, resList)
+        if ( !newAllSet.contains(resource->type()) )
+            resourceSet->deleteResource(resource->type());
+
+}
+
+
 const char * resourceTypeToString(ResourceType type)
 {
     switch (type) {
@@ -346,60 +419,29 @@ void Client::readLine(int)
             qCritical("%s failed!", qPrintable(command));
         }
     }
-    else if (command == "add") {
-        QString resourceList, flag;
-        input >> resourceList >> flag;
-        if (!resourceSet) {
-            qCritical("%s failed!", qPrintable(command));
-        }
-        else if (resourceList.isEmpty() || resourceList.isNull()) {
-            output << "List of desired resources is missing. Use help.";
-        }
-        else {
-            bool optional = false;
-            QSet<ResourcePolicy::ResourceType> resToAdd;
-            CommandLineParser::parseResourceList(resourceList, resToAdd);
-            if (flag == "-o") {
-                optional = true;
-            }
-            foreach(ResourcePolicy::ResourceType resource, resToAdd) {
-                if (!resourceSet->contains(resource)) {
-                    resourceSet->addResource(resource);
-                }
-                if (optional) {
-                    resourceSet->resource(resource)->setOptional();
-                }
-            }
-        }
-    }
-    else if (command == "remove") {
-        QString resourceList, flag;
-        input >> resourceList >> flag;
-        if (!resourceSet) {
-            qCritical("%s failed!", qPrintable(command));
-        }
-        else if (resourceList.isEmpty() || resourceList.isNull()) {
-            output << "List of desired resources is missing. Use help.";
-        }
-        else {
-            QSet<ResourcePolicy::ResourceType> resToRemove;
-            CommandLineParser::parseResourceList(resourceList, resToRemove);
-            if (flag == "-o") {
-                foreach(ResourcePolicy::ResourceType resource, resToRemove) {
-                    resourceSet->resource(resource)->setOptional(false);
-                }
-            }
-            else {
-                foreach(ResourcePolicy::ResourceType resource, resToRemove) {
-                    resourceSet->deleteResource(resource);
-                }
-            }
-        }
-    }
+
     else if (command == "update") {
-        if (!resourceSet || !resourceSet->update()) {
+
+        QString resourceList;
+        input >> resourceList;
+
+        if (!resourceSet)
             qCritical("%s failed!", qPrintable(command));
+
+        if (resourceList.isEmpty() || resourceList.isNull())
+        {
+             qCritical("%s failed! List of desired resources is missing. Use help.",
+                       qPrintable(command));
         }
+        else
+        {
+            start_timer();
+            modifyResources(resourceList);
+
+            if (!resourceSet->update())
+                qCritical("%s failed!", qPrintable(command));
+        }
+
     }
     else if (command == "audio") {
         QString what, group, tagName, tagValue;
diff --git a/resourceqt-client/client.h b/resourceqt-client/client.h
index 342f5f9..b2aca41 100644
--- a/resourceqt-client/client.h
+++ b/resourceqt-client/client.h
@@ -80,6 +80,7 @@ private:
     void showPrompt();
     void showResources(const QList<ResourcePolicy::ResourceType> &resList);
     void showResources(const QList<ResourcePolicy::Resource*> &resList);
+    void modifyResources(QString resString);
 };
 
 QTextStream & operator<< (QTextStream &output,
-- 
cgit v1.2.3


From 248ec24e0e776588278053c33bef18be52c489c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20L=C3=B6fman?= <ext-robert.lofman@nokia.com>
Date: Wed, 1 Dec 2010 11:51:22 +0200
Subject: Implemented suggestions from reviews.

---
 resourceqt-client/client.cpp | 56 +++++++++++++++++++-------------------------
 resourceqt-client/client.h   |  2 +-
 2 files changed, 25 insertions(+), 33 deletions(-)

(limited to 'resourceqt-client')

diff --git a/resourceqt-client/client.cpp b/resourceqt-client/client.cpp
index 23d5acb..ee76bf8 100644
--- a/resourceqt-client/client.cpp
+++ b/resourceqt-client/client.cpp
@@ -138,7 +138,7 @@ bool Client::initialize(const CommandLineParser &parser)
 
     start_timer();
     resourceSet->initAndConnect();
-    output << "connecting...accepting input" << endl;
+    output << "accepting input" << endl;
     showPrompt();
     return true;
 }
@@ -150,72 +150,64 @@ void Client::doExit()
 }
 
 
-void Client::modifyResources(QString resString)
+void Client::modifyResources(const QString &resString)
 {
     //resString example: [mand_resources:opt_resources] res1,res2,res3:res1,res3
-   if ( resString.isEmpty() || resString.isNull())
-   {
+   if ( resString.isEmpty() || resString.isNull()){
        qDebug("Client::modifyResources(): no resources in string.");
        return;
    }
    QStringList newAllAndOpt = resString.split(":");
 
    if (newAllAndOpt.size()==1)
-       qDebug("There are only manditory resources.");
+       qDebug("There are only mandatory resources.");
 
    //Every optional res. is also in allSet
    QSet<ResourcePolicy::ResourceType> newAllSet;
    QSet<ResourcePolicy::ResourceType> newOptSet;
 
-   if ( !CommandLineParser::parseResourceList(newAllAndOpt.at(0), newAllSet) )
+   if ( !CommandLineParser::parseResourceList(newAllAndOpt.at(0), newAllSet) ) {
+       qDebug("Client::modifyResources(): could not parse all resources.");
        return;
+   }
 
-   if (newAllAndOpt.size()>1)
-   {
-       if ( !CommandLineParser::parseResourceList(newAllAndOpt.at(1), newOptSet) )
+   if (newAllAndOpt.size()>1) {
+       if ( !CommandLineParser::parseResourceList(newAllAndOpt.at(1), newOptSet) ){
+           qDebug("Client::modifyResources(): could not parse optional resources.");
            return;
+       }
+       bool optNotInAll = false;
        //If the user forgot to add resource to all when specifying optional -> add to all.
-       foreach(ResourceType newOptRes, newOptSet)
-       {
-           if ( !newAllSet.contains(newOptRes) )
-           {
-               qDebug("Client::modifyResources(): optional resources should be added to all as well.");
+       foreach(ResourceType newOptRes, newOptSet){
+           if ( !newAllSet.contains(newOptRes) ){
+               optNotInAll = true;
                newAllSet.insert(newOptRes);
            }
        }
+       if (optNotInAll)
+           qDebug("Client::modifyResources(): optional resources should be added to all as well.");
    }
 
-   QSet<ResourceType>::iterator newResIt = newAllSet.begin();
-   QList<Resource*>             resList  = resourceSet->resources();
-
    //Check if new resources are in current resource set.
-   while (newResIt != newAllSet.end())
-   {
-        ResourceType newRes = *newResIt;
-
-        if ( resourceSet->contains(newRes) )
-        {
+   foreach ( ResourceType newRes, newAllSet) {
+        if ( resourceSet->contains(newRes) ){
             if ( resourceSet->resource(newRes)->isOptional() && !newOptSet.contains(newRes) ) {
-                //New manditory is in set, but is not optional in the new set.
+                //New mandatory is in set, but is not optional in the new set.
                 resourceSet->resource(newRes)->setOptional(false);
             }
-            else if ( !resourceSet->resource(newRes)->isOptional() && newOptSet.contains(newRes) )
-            {
-                //New manditory is in set, but is optional.
+            else if ( !resourceSet->resource(newRes)->isOptional() && newOptSet.contains(newRes) ){
+                //New mandatory is in set, but is optional.
                 resourceSet->resource(newRes)->setOptional(true);
             }
         }
-        else
-        {   //Add new resource.
+        else {   //Add new resource.
             resourceSet->addResource(newRes);
 
             if ( newOptSet.contains(newRes) )
                 resourceSet->resource(newRes)->setOptional(true);
-
         }
-        ++newResIt;
     }
-
+    QList<Resource*> resList  = resourceSet->resources();
     //Check if there are current resources not in the new set (i.e. removed).
     foreach(Resource* resource, resList)
         if ( !newAllSet.contains(resource->type()) )
diff --git a/resourceqt-client/client.h b/resourceqt-client/client.h
index b2aca41..e592fb9 100644
--- a/resourceqt-client/client.h
+++ b/resourceqt-client/client.h
@@ -80,7 +80,7 @@ private:
     void showPrompt();
     void showResources(const QList<ResourcePolicy::ResourceType> &resList);
     void showResources(const QList<ResourcePolicy::Resource*> &resList);
-    void modifyResources(QString resString);
+    void modifyResources(const QString &resString);
 };
 
 QTextStream & operator<< (QTextStream &output,
-- 
cgit v1.2.3