[kdebase-runtime] 4.6.95 (rc2), adds Nepomuk IndexCleaner throttling patch
Jaroslav Reznik
jreznik at fedoraproject.org
Fri Jul 8 13:04:47 UTC 2011
commit b7f572955830ca055c052ba7cb7ba4ab7be5d21f
Author: Jaroslav Reznik <jreznik at redhat.com>
Date: Fri Jul 8 15:04:30 2011 +0200
4.6.95 (rc2), adds Nepomuk IndexCleaner throttling patch
.gitignore | 3 +-
kdebase-runtime-4.2.85-knetattach.patch | 9 --
...e-runtime-4.6.95-nepomuk-index-throttling.patch | 121 ++++++++++++++++++++
kdebase-runtime.spec | 17 ++-
sources | 2 +-
5 files changed, 134 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ad35217..679b514 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/kde-runtime-4.6.80.tar.bz2
-/kde-runtime-4.6.90.tar.bz2
+/kde-runtime-4.6.95.tar.bz2
diff --git a/kdebase-runtime-4.6.95-nepomuk-index-throttling.patch b/kdebase-runtime-4.6.95-nepomuk-index-throttling.patch
new file mode 100644
index 0000000..aa62131
--- /dev/null
+++ b/kdebase-runtime-4.6.95-nepomuk-index-throttling.patch
@@ -0,0 +1,121 @@
+diff -up kde-runtime-4.6.95/nepomuk/services/strigi/indexcleaner.cpp.nepomuk-index-throttling kde-runtime-4.6.95/nepomuk/services/strigi/indexcleaner.cpp
+--- kde-runtime-4.6.95/nepomuk/services/strigi/indexcleaner.cpp.nepomuk-index-throttling 2011-07-07 16:03:18.000000000 +0200
++++ kde-runtime-4.6.95/nepomuk/services/strigi/indexcleaner.cpp 2011-07-08 14:51:36.100719914 +0200
+@@ -47,7 +47,8 @@ using namespace Soprano::Vocabulary;
+
+
+ Nepomuk::IndexCleaner::IndexCleaner(QObject* parent)
+- : KJob(parent)
++ : KJob(parent),
++ m_delay(0)
+ {
+ setCapabilities( Suspendable );
+ }
+@@ -268,7 +269,7 @@ void Nepomuk::IndexCleaner::slotRemoveRe
+
+ QMutexLocker lock(&m_stateMutex);
+ if( !m_suspended ) {
+- clearNextBatch();
++ QTimer::singleShot(m_delay, this, SLOT(clearNextBatch()));
+ }
+ }
+
+@@ -314,4 +315,9 @@ bool Nepomuk::IndexCleaner::doResume()
+ return true;
+ }
+
++void Nepomuk::IndexCleaner::setDelay(int msecs)
++{
++ m_delay = msecs;
++}
++
+ #include "indexcleaner.moc"
+diff -up kde-runtime-4.6.95/nepomuk/services/strigi/indexcleaner.h.nepomuk-index-throttling kde-runtime-4.6.95/nepomuk/services/strigi/indexcleaner.h
+--- kde-runtime-4.6.95/nepomuk/services/strigi/indexcleaner.h.nepomuk-index-throttling 2011-07-07 16:03:18.000000000 +0200
++++ kde-runtime-4.6.95/nepomuk/services/strigi/indexcleaner.h 2011-07-08 14:51:36.107719571 +0200
+@@ -41,6 +41,16 @@ namespace Nepomuk {
+ virtual bool doSuspend();
+ virtual bool doResume();
+
++ public slots:
++ /**
++ * Set the delay between the cleanup queries.
++ * Used for throtteling the cleaner to not grab too
++ * many resources. Default is 0.
++ *
++ * \sa IndexScheduler::setIndexingSpeed()
++ */
++ void setDelay(int msecs);
++
+ private slots:
+ void clearNextBatch();
+ void slotRemoveResourcesDone(KJob* job);
+@@ -52,6 +62,7 @@ namespace Nepomuk {
+
+ QMutex m_stateMutex;
+ bool m_suspended;
++ int m_delay;
+ };
+ }
+
+diff -up kde-runtime-4.6.95/nepomuk/services/strigi/indexscheduler.cpp.nepomuk-index-throttling kde-runtime-4.6.95/nepomuk/services/strigi/indexscheduler.cpp
+--- kde-runtime-4.6.95/nepomuk/services/strigi/indexscheduler.cpp.nepomuk-index-throttling 2011-07-07 16:03:18.000000000 +0200
++++ kde-runtime-4.6.95/nepomuk/services/strigi/indexscheduler.cpp 2011-07-08 14:51:36.132718346 +0200
+@@ -208,7 +208,7 @@ Nepomuk::IndexScheduler::IndexScheduler(
+ : QObject( parent ),
+ m_suspended( false ),
+ m_indexing( false ),
+- m_speed( FullSpeed )
++ m_indexingDelay( 0 )
+ {
+ m_cleaner = new IndexCleaner();
+ m_cleaner->start();
+@@ -267,7 +267,13 @@ void Nepomuk::IndexScheduler::setSuspend
+ void Nepomuk::IndexScheduler::setIndexingSpeed( IndexingSpeed speed )
+ {
+ kDebug() << speed;
+- m_speed = speed;
++ m_indexingDelay = 0;
++ if ( speed != FullSpeed ) {
++ m_indexingDelay = (speed == ReducedSpeed) ? s_reducedSpeedDelay : s_snailPaceDelay;
++ }
++ if( m_cleaner ) {
++ m_cleaner->setDelay(m_indexingDelay);
++ }
+ }
+
+
+@@ -482,11 +488,7 @@ bool Nepomuk::IndexScheduler::analyzeDir
+ void Nepomuk::IndexScheduler::callDoIndexing()
+ {
+ if( !m_suspended ) {
+- uint delay = 0;
+- if ( m_speed != FullSpeed ) {
+- delay = (m_speed == ReducedSpeed) ? s_reducedSpeedDelay : s_snailPaceDelay;
+- }
+- QTimer::singleShot( delay, this, SLOT(doIndexing()) );
++ QTimer::singleShot( m_indexingDelay, this, SLOT(doIndexing()) );
+ }
+ }
+
+diff -up kde-runtime-4.6.95/nepomuk/services/strigi/indexscheduler.h.nepomuk-index-throttling kde-runtime-4.6.95/nepomuk/services/strigi/indexscheduler.h
+--- kde-runtime-4.6.95/nepomuk/services/strigi/indexscheduler.h.nepomuk-index-throttling 2011-06-22 16:30:08.000000000 +0200
++++ kde-runtime-4.6.95/nepomuk/services/strigi/indexscheduler.h 2011-07-08 14:51:36.151717415 +0200
+@@ -121,8 +121,6 @@ namespace Nepomuk {
+ SnailPace
+ };
+
+- IndexingSpeed currentSpeed() const { return m_speed; }
+-
+ public Q_SLOTS:
+ void suspend();
+ void resume();
+@@ -226,7 +224,7 @@ namespace Nepomuk {
+ QString m_currentFolder;
+ KUrl m_currentUrl;
+
+- IndexingSpeed m_speed;
++ int m_indexingDelay;
+ IndexCleaner* m_cleaner;
+ };
+
diff --git a/kdebase-runtime.spec b/kdebase-runtime.spec
index 261d852..927dff3 100644
--- a/kdebase-runtime.spec
+++ b/kdebase-runtime.spec
@@ -10,8 +10,8 @@
Name: kdebase-runtime
Summary: KDE Runtime
-Version: 4.6.90
-Release: 2%{?dist}
+Version: 4.6.95
+Release: 1%{?dist}
# http://techbase.kde.org/Policies/Licensing_Policy
License: LGPLv2+
@@ -23,9 +23,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# add shortcuts for search provider
Patch1: kdebase-runtime-4.1.x-searchproviders-shortcuts.patch
-# make knetattach only show in KDE
-Patch2: kdebase-runtime-4.2.85-knetattach.patch
-
# make icontheme inherit working
Patch3: kdebase-runtime-4.6.90-iconthemes-inherit.patch
@@ -43,6 +40,8 @@ Patch8: kdebase-runtime-4.5.95-compiz.patch
Patch9: kdebase-runtime-4.3.4-man-overrides.patch
## upstream patches
+# Throttle the IndexCleaner, 327ec9a67af653467b670115ebb3e26b00183c1d, kdebz#276593
+Patch50: kdebase-runtime-4.6.95-nepomuk-index-throttling.patch
Provides: kdebase4-runtime = %{version}-%{release}
Obsoletes: kdebase4-runtime < %{version}-%{release}
@@ -142,13 +141,15 @@ BuildArch: noarch
%setup -q -n kde-runtime-%{version}%{?alphatag}
%patch1 -p1 -b .searchproviders-shortcuts
-%patch2 -p1 -b .knetattach
%patch3 -p1 -b .iconthemes-inherit
%patch6 -p1 -b .home_onlyshowin_kde
%patch7 -p1 -b .htsearch
%patch8 -p1 -b .config
%patch9 -p1 -b .man-overrides
+%patch50 -p1 -b .nepomuk-index-throttling
+
+
%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
@@ -301,6 +302,10 @@ fi
%changelog
+* Fri Jul 08 2011 Jaroslav Reznik <jreznik at redhat.com> 4.6.95-1
+- 4.6.95 (rc2)
+- Nepomuk IndexCleaner throttling (kdebz#276593)
+
* Tue Jun 28 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6.90-2
- move oxygen-icons-theme dep (back) here from kdelibs
diff --git a/sources b/sources
index a983150..3618eee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cf01952397458c8e1a33bf124ba37f6c kde-runtime-4.6.90.tar.bz2
+650919d530cdcdd2c83d74cc896f66ba kde-runtime-4.6.95.tar.bz2
More information about the scm-commits
mailing list