summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolf Bergenheim <ext-wolf.2.bergenheim@nokia.com>2010-11-18 08:18:10 +0200
committerWolf Bergenheim <ext-wolf.2.bergenheim@nokia.com>2010-11-18 08:18:10 +0200
commit6a47ede3a71e22b09a09169818705351c00abf9d (patch)
tree83a4c008606ed5de7db8a227fa75f26164f6a308
parente205f049b23a16eca17cc66b70e0c285db538c2b (diff)
parent2db176e028c54684e2fe6adf58ab0c5807d298c9 (diff)
downloadlibresourceqt-6a47ede3a71e22b09a09169818705351c00abf9d.tar.gz
Merge branch 'master' into meego
-rw-r--r--resourceqt-client/client.cpp103
-rw-r--r--resourceqt-client/client.h4
-rw-r--r--resourceqt-client/commandlineparser.cpp29
-rw-r--r--resourceqt-client/commandlineparser.h5
-rw-r--r--resourceqt-client/resourceqt-client.cpp1
5 files changed, 90 insertions, 52 deletions
diff --git a/resourceqt-client/client.cpp b/resourceqt-client/client.cpp
index 25ae5a1..7fdb2f6 100644
--- a/resourceqt-client/client.cpp
+++ b/resourceqt-client/client.cpp
@@ -29,7 +29,8 @@ USA.
#include "client.h"
-#define outputln output << "\n"
+#define OUTPUT output << prefix
+#define outputln output << "\n" << prefix
using namespace ResourcePolicy;
@@ -52,7 +53,7 @@ CommandListArgs::~CommandListArgs()
Client::Client()
: QObject(), standardInput(stdin, QIODevice::ReadOnly), stdInNotifier(0, QSocketNotifier::Read), pendingAddAudio(false), applicationClass(),
- resourceSet(NULL), output(stdout)
+ resourceSet(NULL), output(stdout), prefix(""), showTimings(false)
{
commandList["help"] = CommandListArgs("", "print this help message");
commandList["quit"] = CommandListArgs("", "exit application");
@@ -75,7 +76,7 @@ Client::~Client()
void Client::showPrompt()
{
- output << "resource-Qt> " << flush;
+ OUTPUT << "resource-Qt> " << flush;
}
bool Client::initialize(const CommandLineParser &parser)
@@ -83,13 +84,16 @@ bool Client::initialize(const CommandLineParser &parser)
QSet<ResourcePolicy::ResourceType> allResources;
QSet<ResourcePolicy::ResourceType> optionalResources;
+ prefix = parser.getPrefix();
+
if (parser.shouldAlwaysReply()) {
- output << "client: AlwaysReply" << endl;
+ OUTPUT << "client: AlwaysReply" << endl;
}
if (parser.shouldAutoRelease()) {
- output << "client: AutoRelease" << endl;
+ OUTPUT << "client: AutoRelease" << endl;
}
+ showTimings = parser.showTimings();
resourceSet = new ResourceSet(parser.resourceApplicationClass(), this,
parser.shouldAlwaysReply(),
@@ -133,7 +137,7 @@ bool Client::initialize(const CommandLineParser &parser)
this, SLOT(doExit()))) {
return false;
}
- output << "accepting input" << endl;
+ OUTPUT << "accepting input" << endl;
showPrompt();
return true;
@@ -202,10 +206,7 @@ void Client::showResources(const QList<Resource*> &resList)
void Client::resourceAcquiredHandler(const QList<ResourceType>&)
{
- long int ms = stop_timer();
- if (ms > 0) {
- outputln << "Operation took " << ms << "ms" << endl;
- }
+ stopTimer();
QList<Resource*> list = resourceSet->resources();
if (!list.count()) {
@@ -218,28 +219,22 @@ void Client::resourceAcquiredHandler(const QList<ResourceType>&)
grantedResources << resource->type();
}
}
- output << "granted:" << grantedResources << endl;
+ OUTPUT << "granted:" << grantedResources << endl;
}
showPrompt();
}
void Client::resourceDeniedHandler()
{
- long int ms = stop_timer();
- if (ms > 0) {
- outputln << "Operation took " << ms << "ms" << endl;
- }
+ stopTimer();
QList<Resource*> allResources = resourceSet->resources();
- output << "denied:" << allResources << endl;
+ OUTPUT << "denied:" << allResources << endl;
showPrompt();
}
void Client::resourceLostHandler()
{
- long int ms = stop_timer();
- if (ms > 0) {
- outputln << "Operation took " << ms << "ms" << endl;
- }
+ stopTimer();
QList<Resource*> allResources = resourceSet->resources();
outputln << "lost:" << allResources << endl;
@@ -248,10 +243,7 @@ void Client::resourceLostHandler()
void Client::resourceReleasedHandler()
{
- long int ms = stop_timer();
- if (ms > 0) {
- outputln << "Operation took " << ms << "ms" << endl;
- }
+ stopTimer();
QList<Resource*> allResources = resourceSet->resources();
outputln << "released:"<< allResources << endl;
@@ -262,10 +254,7 @@ void Client::resourcesBecameAvailableHandler(const QList<ResourcePolicy::Resourc
{
if (pendingAddAudio) {
pendingAddAudio = false;
- long int ms = stop_timer();
- if (ms > 0) {
- outputln << "Operation took " << ms << "ms" << endl;
- }
+ stopTimer();
}
outputln << "advice:" << availableResources << endl;
showPrompt();
@@ -291,11 +280,11 @@ void Client::readLine(int)
return;
}
else if (command == "help") {
- output << "Available commands:\n";
+ OUTPUT << "Available commands:\n";
QMap<QString, CommandListArgs>::const_iterator i =
commandList.constBegin();
while (i != commandList.constEnd()) {
- output << qSetFieldWidth(10) << right << i.key()
+ OUTPUT << qSetFieldWidth(10) << right << i.key()
<< qSetFieldWidth(1) << " "
<< qSetFieldWidth(55) << left << i.value().args
<< qSetFieldWidth(0) << i.value().help << endl;
@@ -309,7 +298,7 @@ void Client::readLine(int)
else {
QList<Resource*> list = resourceSet->resources();
if (!list.count()) {
- output << "Resource set is empty, use add command to add some."
+ OUTPUT << "Resource set is empty, use add command to add some."
<< endl;
}
else {
@@ -318,16 +307,16 @@ void Client::readLine(int)
}
}
else if (command == "acquire") {
- start_timer();
+ startTimer();
if (!resourceSet || !resourceSet->acquire()) {
- stop_timer();
+ stopTimer();
qCritical("%s failed!", qPrintable(command));
}
}
else if (command == "release") {
- start_timer();
+ startTimer();
if (!resourceSet || !resourceSet->release()) {
- stop_timer();
+ stopTimer();
qCritical("%s failed!", qPrintable(command));
}
}
@@ -335,10 +324,10 @@ void Client::readLine(int)
QString resourceList, flag;
input >> resourceList >> flag;
if (!resourceSet) {
- qCritical("%s failed!", qPrintable(command));
+ qCritical("%s%s failed!", qPrintable(prefix), qPrintable(command));
}
else if (resourceList.isEmpty() || resourceList.isNull()) {
- output << "List of desired resources is missing. Use help.";
+ OUTPUT << "List of desired resources is missing. Use help.";
}
else {
bool optional = false;
@@ -361,10 +350,10 @@ void Client::readLine(int)
QString resourceList, flag;
input >> resourceList >> flag;
if (!resourceSet) {
- qCritical("%s failed!", qPrintable(command));
+ qCritical("%s%s failed!", qPrintable(prefix), qPrintable(command));
}
else if (resourceList.isEmpty() || resourceList.isNull()) {
- output << "List of desired resources is missing. Use help.";
+ OUTPUT << "List of desired resources is missing. Use help.";
}
else {
QSet<ResourcePolicy::ResourceType> resToRemove;
@@ -383,7 +372,7 @@ void Client::readLine(int)
}
else if (command == "update") {
if (!resourceSet || !resourceSet->update()) {
- qCritical("%s failed!", qPrintable(command));
+ qCritical("%s%s failed!", qPrintable(prefix), qPrintable(command));
}
}
else if (command == "audio") {
@@ -392,14 +381,14 @@ void Client::readLine(int)
input >> what;
if (what.isEmpty() || what.isNull()) {
- output << "Not enough parameters! See help" << endl;
+ OUTPUT << "Not enough parameters! See help" << endl;
}
else {
Resource *resource = resourceSet->resource(AudioPlaybackType);
AudioResource *audioResource = static_cast<AudioResource*>(resource);
qDebug("resource = %p audioResource = %p", resource, audioResource);
if (audioResource == NULL) {
- output << "No AudioResource available in set!" << endl;
+ OUTPUT << "No AudioResource available in set!" << endl;
}
else {
if (what == "group") {
@@ -413,14 +402,14 @@ void Client::readLine(int)
audioResource->setProcessID(pid);
}
else {
- output << "Bad pid parameter!" << endl;
+ OUTPUT << "Bad pid parameter!" << endl;
}
}
else if (what == "tag") {
input >> tagName >> tagValue;
if (tagName.isEmpty() || tagName.isNull() ||
tagValue.isEmpty() || tagValue.isNull()) {
- output << "tag requires 2 parameters name and value. See help"
+ OUTPUT << "tag requires 2 parameters name and value. See help"
<< endl;
}
else {
@@ -428,7 +417,7 @@ void Client::readLine(int)
}
}
else {
- output << "Unknown audio command!";
+ OUTPUT << "Unknown audio command!";
}
}
}
@@ -439,18 +428,18 @@ void Client::readLine(int)
input >> group >> pid >> tagName >> tagValue;
if (group.isEmpty() || (pid == 0) || tagName.isEmpty() || tagValue.isEmpty()) {
- output << "Invalid parameters! See help!" << endl;
+ OUTPUT << "Invalid parameters! See help!" << endl;
}
else {
AudioResource *audioResource = new AudioResource(group);
if (audioResource == NULL) {
- output << "Failed to create an AudioResource object!" << endl;
+ OUTPUT << "Failed to create an AudioResource object!" << endl;
}
else {
audioResource->setProcessID(pid);
audioResource->setStreamTag(tagName, tagValue);
pendingAddAudio = true;
- start_timer();
+ startTimer();
resourceSet->addResourceObject(audioResource);
}
}
@@ -460,7 +449,7 @@ void Client::readLine(int)
resourceSet = new ResourceSet(applicationClass);
}
else {
- output << "unknown command '" << command << "'" << endl;
+ OUTPUT << "unknown command '" << command << "'" << endl;
}
showPrompt();
@@ -488,3 +477,19 @@ QTextStream & operator<< (QTextStream &output,
return output;
}
+void Client::startTimer()
+{
+ if (showTimings) {
+ start_timer();
+ }
+}
+
+void Client::stopTimer()
+{
+ if (showTimings) {
+ long int ms = stop_timer();
+ if (ms > 0) {
+ outputln << "Operation took " << ms << " ms" << endl;
+ }
+ }
+}
diff --git a/resourceqt-client/client.h b/resourceqt-client/client.h
index c22475d..3967fee 100644
--- a/resourceqt-client/client.h
+++ b/resourceqt-client/client.h
@@ -70,6 +70,8 @@ private:
QString applicationClass;
ResourcePolicy::ResourceSet *resourceSet;
QTextStream output;
+ QString prefix;
+ bool showTimings;
static QMap<QString, CommandListArgs> commandList;
@@ -79,6 +81,8 @@ private:
void showPrompt();
void showResources(const QList<ResourcePolicy::ResourceType> &resList);
void showResources(const QList<ResourcePolicy::Resource*> &resList);
+ inline void startTimer();
+ inline void stopTimer();
};
QTextStream & operator<< (QTextStream &output,
diff --git a/resourceqt-client/commandlineparser.cpp b/resourceqt-client/commandlineparser.cpp
index f169801..cb477fd 100644
--- a/resourceqt-client/commandlineparser.cpp
+++ b/resourceqt-client/commandlineparser.cpp
@@ -28,7 +28,8 @@ QHash<QString, ResourcePolicy::ResourceType> CommandLineParser::resourceValues;
CommandLineParser::CommandLineParser():
allResources(), optResources(), autoRelease(false), alwaysReply(false),
- verbose(false), allowUnkownResourceClass(false), output(stdout)
+ verbose(false), allowUnkownResourceClass(false), output(stdout), prefix(""),
+ timings(false)
{
resourceValues["AudioPlayback"] = ResourcePolicy::AudioPlaybackType;
resourceValues["VideoPlayback"] = ResourcePolicy::VideoPlaybackType;
@@ -63,6 +64,8 @@ bool CommandLineParser::parseArguments()
case 'm':
case 's':
case 'i':
+ timings = true;
+ break;
case 't':
break;
case 'f':
@@ -82,6 +85,9 @@ bool CommandLineParser::parseArguments()
case 'v':
verbose = true;
break;
+ case 'p':
+ parsePrefix(*(++ci));
+ break;
case 'h':
default:
usage();
@@ -139,6 +145,16 @@ bool CommandLineParser::parseClassString(const QString &str)
return true;
}
+void CommandLineParser::parsePrefix(const QString &str)
+{
+ prefix = str + ": ";
+}
+
+QString CommandLineParser::getPrefix() const
+{
+ return prefix;
+}
+
bool CommandLineParser::parseResourceList(const QString &resourceListStr,
QSet<ResourcePolicy::ResourceType> &resources)
{
@@ -182,11 +198,14 @@ bool CommandLineParser::parseModeValues(const QString &modeListStr)
void CommandLineParser::usage()
{
- output << "usage: resourceqt-client [-h] [-m mode-values]" <<
- "[-o optional-resources] [-s shared-resources -m shared-mask] " <<
+ output << "usage: resourceqt-client [-h] [-f mode-values]" <<
+ "[-o optional-resources] [-i] [-v] [-p prefix] " <<
"class all-resources" << endl;
output << "\toptions:" << endl;
output << "\t h\tprint this help message and exit" << endl;
+ output << "\t i\tshow timings of requests" << endl;
+ output << "\t v\tshow debug of libresourceqt" << endl;
+ output << "\t p\tPrefix all output with the given prefix" << endl;
output << "\t f\tmode values. See 'modes' below for the "
"\n\t\tsyntax of <mode-values>" << endl;
output << "\t o\toptional resources. See 'resources' below for the "
@@ -247,3 +266,7 @@ bool CommandLineParser::shouldBeVerbose() const
return verbose;
}
+bool CommandLineParser::showTimings() const
+{
+ return timings;
+}
diff --git a/resourceqt-client/commandlineparser.h b/resourceqt-client/commandlineparser.h
index 000fb80..deab478 100644
--- a/resourceqt-client/commandlineparser.h
+++ b/resourceqt-client/commandlineparser.h
@@ -46,6 +46,8 @@ public:
bool shouldAutoRelease() const;
bool shouldAlwaysReply() const;
bool shouldBeVerbose() const;
+ QString getPrefix() const;
+ bool showTimings() const;
private:
QSet<ResourcePolicy::ResourceType> allResources;
@@ -57,8 +59,11 @@ private:
bool verbose;
bool allowUnkownResourceClass;
QTextStream output;
+ QString prefix;
+ bool timings;
bool parseClassString(const QString &str);
+ void parsePrefix(const QString &str);
bool parseModeValues(const QString &modeListStr);
void usage();
diff --git a/resourceqt-client/resourceqt-client.cpp b/resourceqt-client/resourceqt-client.cpp
index 240b3ce..9bf61d2 100644
--- a/resourceqt-client/resourceqt-client.cpp
+++ b/resourceqt-client/resourceqt-client.cpp
@@ -56,6 +56,7 @@ int main(int argc, char *argv[])
if (!parser.parseArguments()) {
return 1;
}
+ verbose = parser.shouldBeVerbose();
if (!client.initialize(parser)) {
qFatal("Initialization failed");