alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* queue the job in the service if the service isn't ready

Browse Source 
* check the validity of a job before executing; things may have changed!

svn path=/trunk/KDE/kdelibs/; revision=1038158
This commit is contained in:
Aaron J. Seigo 2009-10-20 18:23:32 +00:00
parent 8df22fd9b1
commit 979d295565
2 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
private/remoteservicejob.cpp
View File

@ -54,15 +54,22 @@ void RemoteServiceJob::start()
{ {
QTimer::singleShot(30000, this, SLOT(timeout())); QTimer::singleShot(30000, this, SLOT(timeout()));
Jolie::Client *client = m_service->m_client; if (m_service->m_busy || !m_service->m_ready) {
if (m_service->m_busy) {
//enqueue and wait //enqueue and wait
m_service->m_queue.enqueue(this); m_service->m_queue.enqueue(this);
kDebug() << "already busy... enqueue, queue contains " << m_service->m_queue.count(); kDebug() << "already busy... enqueue, queue contains " << m_service->m_queue.count();
return; return;
} else { }
m_service->m_busy = true;
// the service is now busy ... with us!
m_service->m_busy = true;
// while waiting in the queue, our validity may have changed; it's all async
// so don't assume anything
checkValidity();
if (error()) {
emitResult();
return;
} }
//serialize the parameters //serialize the parameters
@ -80,12 +87,32 @@ void RemoteServiceJob::start()
data.children(Message::Field::DESTINATION) << Jolie::Value(destination().toAscii()); data.children(Message::Field::DESTINATION) << Jolie::Value(destination().toAscii());
message.setData(data); message.setData(data);
Jolie::Client *client = m_service->m_client;
Jolie::PendingCall pendingReply = client->asyncCall(m_service->signMessage(message)); Jolie::PendingCall pendingReply = client->asyncCall(m_service->signMessage(message));
Jolie::PendingCallWatcher *watcher = new Jolie::PendingCallWatcher(pendingReply, this); Jolie::PendingCallWatcher *watcher = new Jolie::PendingCallWatcher(pendingReply, this);
connect(watcher, SIGNAL(finished(Jolie::PendingCallWatcher*)), connect(watcher, SIGNAL(finished(Jolie::PendingCallWatcher*)),
this, SLOT(callCompleted(Jolie::PendingCallWatcher*))); this, SLOT(callCompleted(Jolie::PendingCallWatcher*)));
} }
void RemoteServiceJob::checkValidity()
{
if (!m_service->isOperationEnabled(operationName())) {
setError(-1);
setErrorText(i18n("Job no longer valid, operation is not enabled!"));
} else {
KConfigGroup description = m_service->operationDescription(operationName());
QMapIterator<QString, QVariant> param(parameters());
while (param.hasNext()) {
param.next();
if (!description.hasKey(param.key())) {
setError(-1);
setErrorText(i18n("Job no longer valid, invalid parameters."));
break;
}
}
}
}
void RemoteServiceJob::callCompleted(Jolie::PendingCallWatcher *watcher) void RemoteServiceJob::callCompleted(Jolie::PendingCallWatcher *watcher)
{ {
m_service->m_busy = false; m_service->m_busy = false;

2
private/remoteservicejob_p.h
View File

@ -53,6 +53,8 @@ class RemoteServiceJob : public Plasma::ServiceJob
void timeout(); void timeout();
private: private:
void checkValidity();
QByteArray m_token; QByteArray m_token;
KUrl m_location; KUrl m_location;
RemoteService *m_service; RemoteService *m_service;