FCL/sf/app/contacts: comparison phonebookengines/cntlistmodel/src/cntcache

equal deleted inserted replaced

-:59984e68247d
+:6abfb1094884
 #include <qcontactmanager.h>
 #include <hbapplication.h>
 #include <thumbnailmanager_qt.h>
 #include <hbicon.h>
 #include <QTimer>
 #include "cntcache.h"
 #include "cntcache_p.h"
 #include <cntinfoproviderfactory.h>
 #include <cntinfoprovider.h>
 #include "cntdefaultinfoprovider.h"
 // maximum amount of info and icon jobs respectively -- if there are more jobs,
 // then the oldest job is skipped and the client informed that this happened
 // in this way the client can request the job again if wanted
 static const int CntMaxInfoJobs = 20;
 static const int CntMaxIconJobs = 20;
-// amount of milliseconds to postpone the jobs if the UI is very active
-static const int PostponeJobsMilliSeconds = 300;
 // the event for starting to process all outstanding jobs
 static const QEvent::Type ProcessJobsEvent = QEvent::User;
 // the id that states that no icon is currently pending from thumbnail manager
 static const int NoIconRequest = -1;
 // the id that states that there is no job with that key
 static const int NoSuchJob = -1;
+// different states of postponement
+static const int JobsNotPostponed = 0;
+static const int JobsPostponedForDuration = 1;
+static const int JobsPostponedUntilResume = 2;
 const char *CNT_INFO_PROVIDER_EXTENSION_PLUGIN_DIRECTORY = "/resource/qt/plugins/contacts/infoproviders/";
 // TODO: Provide a way (cenrep keys?) for UI to set which provider to use for
 //       what info field (and what info fields are indeed even in use).
 /*!
 Creates a new thread for fetching contact info and icons in the background.
 */
 CntCacheThread::CntCacheThread()
 : mContactManager(new QContactManager()),
-mStarted(false),
 mProcessingJobs(false),
-mPostponeJobs(false),
+mJobsPostponed(JobsNotPostponed),
-mIconRequestId(NoIconRequest)
+mIconRequestId(NoIconRequest),
+mTimer(new QTimer())
 {
 CNT_ENTRY
 // create static provider plugins
 mInfoProviders.insert(new CntDefaultInfoProvider(), ContactInfoAllFields);
 mInfoProviders.insert(new CntPresenceInfoProvider(), ContactInfoIcon2Field);
 // load dynamic provider plugins
 QDir pluginsDir(CNT_INFO_PROVIDER_EXTENSION_PLUGIN_DIRECTORY);
-foreach (QString fileName, pluginsDir.entryList(QDir::Files))
+foreach (QString fileName, pluginsDir.entryList(QDir::Files)) {
-{
 // Create plugin loader
 QPluginLoader pluginLoader(pluginsDir.absoluteFilePath(fileName));
-if ( pluginLoader.load() )
+if (pluginLoader.load()) {
-{
 CntInfoProviderFactory *factory = qobject_cast<CntInfoProviderFactory*>(pluginLoader.instance());
-if (factory)
+if (factory) {
-{
 CntInfoProvider *provider = factory->infoProvider();
 mInfoProviders.insert(provider, provider->supportedFields());
 }
 }
 }
 connect(static_cast<CntInfoProvider*>(i.key()),
 SIGNAL(infoFieldReady(CntInfoProvider*, int, ContactInfoField, const QString&)),
 this,
 SLOT(onInfoFieldReady(CntInfoProvider*, int, ContactInfoField, const QString&)));
 }
 // create & connect the thumbnail manager
 mThumbnailManager = new ThumbnailManager(this);
 mThumbnailManager->setMode(ThumbnailManager::Default);
 mThumbnailManager->setQualityPreference(ThumbnailManager::OptimizeForPerformance);
 mThumbnailManager->setThumbnailSize(ThumbnailManager::ThumbnailSmall);
 connect(mThumbnailManager, SIGNAL(thumbnailReady(QPixmap, void *, int, int)),
 this, SLOT(onIconReady(QPixmap, void *, int, int)));
+mTimer->setSingleShot(true);
+connect(mTimer, SIGNAL(timeout()), this, SLOT(resumeJobs()));
 CNT_EXIT
 }
 /*!
 CNT_ENTRY
 delete mContactManager;
 disconnect(this);
-mJobMutex.lock();
 mInfoJobs.clear();
 mCancelledInfoJobs.clear();
 mIconJobs.clear();
 mCancelledIconJobs.clear();
 mThumbnailManager = NULL;
 qDeleteAll(mInfoProviders.keys());
 mInfoProviders.clear();
-mJobMutex.unlock();
-exit();
-wait();
-CNT_EXIT
-}
-/*!
-Starts the event loop for this thread.
-*/
-void CntCacheThread::run()
-{
-CNT_ENTRY
-exec();
 CNT_EXIT
 }
 /*!
 Schedules a info to be fetched for a contact. When info has been fetched
 {
 CNT_ENTRY_ARGS( contactId )
 if (contactId <= 0)
 return;
-mJobMutex.lock();
 int index = infoJobIndex(contactId);
 if (index != NoSuchJob) {
 // if the job already exists, update the priority
 if (priority < mInfoJobs.at(index).second) {
 mInfoJobs[index] = QPair<int,int>(contactId,priority);
 }
-mJobMutex.unlock();
 return;
-}
-if (!mStarted) {
-// starting the event loop; minimum priority is used as this thread
-// should interfere as little as possible with more time-critical tasks,
-// like updating the UI during scrolling
-start(QThread::IdlePriority);
-mStarted = true;
 }
 if (!mProcessingJobs) {
 // new job => start processing jobs
 mProcessingJobs = true;
 // since this job has now been scheduled, remove it from the list of
 // cancelled jobs in case it is there
 mCancelledInfoJobs.removeOne(contactId);
-mJobMutex.unlock();
 CNT_EXIT
 }
 /*!
 Schedules an icon to be fetched. An iconUpdated() signal will be emitted when the icon
 {
 CNT_ENTRY_ARGS( iconName )
 if (iconName.isEmpty())
 return;
-mJobMutex.lock();
 int index = iconJobIndex(iconName);
 if (index != NoSuchJob) {
 // if the job already exists, update the priority
 if (priority < mIconJobs.at(index).second) {
 mIconJobs[index] = QPair<QString,int>(iconName,priority);
 }
-mJobMutex.unlock();
 return;
 }
 if (!mProcessingJobs) {
 // new job, so restart job loop
 // since this job has now been rescheduled, remove it from the list of
 // cancelled jobs in case it is there
 mCancelledIconJobs.removeOne(iconName);
-mJobMutex.unlock();
+CNT_EXIT
+}
-CNT_EXIT
-}
+/*!
+Postpones outstanding jobs until milliseconds ms has passed or resumeJobs() is called.
-/*!
+This should be called if the client wants to reserve more CPU time for some urgent tasks.
-Postpones outstanding jobs for a few tenths of a second. This should be called if
-the client wants to reserve more CPU time for some urgent task.
+\param milliseconds The duration of the delay; 0, which is the default, means to delay
-*/
+until resumeJobs() is called
-void CntCacheThread::postponeJobs()
+*/
-{
+void CntCacheThread::postponeJobs(int milliseconds)
-CNT_ENTRY
+{
+CNT_ENTRY_ARGS("ms =" << milliseconds << "  type =" << mJobsPostponed)
-mPostponeJobs = true;
+Q_ASSERT(milliseconds >= 0);
+if (milliseconds == 0) {
+mTimer->stop();
+mJobsPostponed = JobsPostponedUntilResume;
+} else if (mJobsPostponed != JobsPostponedUntilResume) {
+mTimer->stop();
+mJobsPostponed = JobsPostponedForDuration;
+mTimer->start(milliseconds);
+}
+CNT_EXIT
+}
+/*!
+Postpones outstanding jobs until resumeJobs() is called. This must always be called after
+postponeJobs.
+*/
+void CntCacheThread::resumeJobs()
+{
+CNT_ENTRY
+mTimer->stop();
+mJobsPostponed = JobsNotPostponed;
+HbApplication::instance()->postEvent(this, new QEvent(ProcessJobsEvent));
 CNT_EXIT
 }
 /*!
 if (event->type() == ProcessJobsEvent) {
 processJobs();
 return true;
 }
-return QThread::event(event);
+return QObject::event(event);
 }
 /*!
 Processes all scheduled jobs. The loop runs until all jobs are done.
 It pauses for a while if new info jobs appear -- this means that the
 */
 void CntCacheThread::processJobs()
 {
 CNT_ENTRY
+bool hasDoneJobs = false;
 forever {
-mJobMutex.lock();
 int infoJobs = mInfoJobs.count();
 int iconJobs = mIconJobs.count();
 int totalJobs = infoJobs + iconJobs + mCancelledInfoJobs.count() + mCancelledIconJobs.count();
-if (totalJobs == 0 || totalJobs == iconJobs && mIconRequestId != NoIconRequest || mPostponeJobs) {
+if (totalJobs == 0 || totalJobs == iconJobs && mIconRequestId != NoIconRequest || mJobsPostponed != JobsNotPostponed) {
-if (mPostponeJobs) {
+if (mJobsPostponed == JobsNotPostponed || totalJobs == 0) {
-// client has requested a pause in activies (e.g. due to high UI activity)
-mPostponeJobs = false;
-if (totalJobs > 0) {
-QTimer::singleShot(PostponeJobsMilliSeconds, this, SLOT(processJobs()));
-}
-else {
-mProcessingJobs = false;
-}
-}
-else {
 mProcessingJobs = false;
 }
-mJobMutex.unlock();
+if (totalJobs == 0 && hasDoneJobs) {
-if (totalJobs == 0) {
 emit allJobsDone();
 }
 break;
 }
-bool doInfoJob = infoJobs > 0; // && (iconJobs == 0 || mIconRequestId != NoIconRequest || qrand() % (infoJobs + iconJobs) < infoJobs);
-if (doInfoJob) {
+if (infoJobs > 0) {
 // get next job
 int contactId = takeNextInfoJob();
-mJobMutex.unlock();
 // fetch qcontact
 QContactFetchHint restrictions;
 restrictions.setOptimizationHints(QContactFetchHint::NoRelationships);
 			QContact contact = mContactManager->contact(contactId, restrictions);
 // request contact info from providers
 QMapIterator<CntInfoProvider*, ContactInfoFields> i(mInfoProviders);
 while (i.hasNext()) {
 i.next();
 if (i.value() != 0) {
 else if (iconJobs > 0 && mIconRequestId == NoIconRequest) {
 // request icon from thumbnail manager
 QString iconName  = takeNextIconJob();
 mIconRequestId = mThumbnailManager->getThumbnail(iconName, NULL, 0);
 mIconRequestName = iconName;
-mJobMutex.unlock();
 }
 else {
 if (mCancelledInfoJobs.count() > 0) {
 int contactId = mCancelledInfoJobs.takeLast();
-mJobMutex.unlock();
 emit infoCancelled(contactId);
 }
 else if (mCancelledIconJobs.count() > 0) {
 QString iconName = mCancelledIconJobs.takeFirst();
-mJobMutex.unlock();
 emit iconCancelled(iconName);
 }
 }
+hasDoneJobs = true;
 // allow signals to be passed from providers and from the client
 HbApplication::processEvents();
 }
 CNT_EXIT
 CNT_ENTRY
 Q_UNUSED(id);
 Q_UNUSED(data);
-mJobMutex.lock();
 Q_ASSERT(id == mIconRequestId && !mIconRequestName.isEmpty());
 if (!mProcessingJobs) {
 // job loop quit while waiting for this icon, so restart it
 mProcessingJobs = true;
 HbApplication::instance()->postEvent(this, new QEvent(ProcessJobsEvent));
 }
 mIconRequestId = NoIconRequest;
-mJobMutex.unlock();
 if (error == 0) {
 emit iconUpdated(mIconRequestName, HbIcon(pixmap));
 }
 CNT_EXIT
 }
 /*!
-Finds out the index of an info job in the job list. Job mutex must be held when calling this function.
+Finds out the index of an info job in the job list.
 \return index of the contact in the job list, or NoSuchJob if no job is scheduled for the contact
 */
 int CntCacheThread::infoJobIndex(int contactId)
 {
 return mIconJobs.takeAt(selectionIndex).first;
 }
 /*!
-Finds out the index of an icon job in the job list. Job mutex must be held when calling this function.
+Finds out the index of an icon job in the job list.
 \return index of the icon in the job list, or NoSuchJob if a job for the icon is not scheduled.
 */
 int CntCacheThread::iconJobIndex(QString iconName)
 {
 }
 }
 return NoSuchJob;
 }

changeset 72	6abfb1094884
parent 66	554fe4dbbb59