add some autostart debugging

This commit is contained in:
Rex Dieter 2013-12-06 15:29:50 -06:00
parent 4dc43f67d3
commit a5e6d24f31
2 changed files with 70 additions and 1 deletions

View File

@ -0,0 +1,63 @@
diff -up kdelibs-4.11.3/kinit/autostart.cpp.autostart-debug kdelibs-4.11.3/kinit/autostart.cpp
--- kdelibs-4.11.3/kinit/autostart.cpp.autostart-debug 2013-06-28 18:03:41.000000000 +0100
+++ kdelibs-4.11.3/kinit/autostart.cpp 2013-12-06 17:58:38.202910694 +0000
@@ -20,6 +20,7 @@
#define QT_NO_CAST_FROM_ASCII
#include "autostart.h"
+#include <kdebug.h>
#include <kautostart.h>
#include <kglobal.h>
#include <kstandarddirs.h>
@@ -97,8 +98,10 @@ AutoStart::loadAutoStartList()
item->phase = config.startPhase();
if (item->phase < 0)
item->phase = 0;
+ kWarning() << "Loading autostart list item: name=" << item->name << " phase=" << item->phase;
m_startList->append(item);
}
+ kWarning() << "Loading complete";
}
QString
diff -up kdelibs-4.11.3/kinit/klauncher.cpp.autostart-debug kdelibs-4.11.3/kinit/klauncher.cpp
--- kdelibs-4.11.3/kinit/klauncher.cpp.autostart-debug 2013-12-06 16:40:58.000000000 +0000
+++ kdelibs-4.11.3/kinit/klauncher.cpp 2013-12-06 17:54:47.369608109 +0000
@@ -537,11 +537,13 @@ KLauncher::slotAutoStart()
do
{
QString service = mAutoStart.startService();
+ kWarning() << "Autostarting service: " << service;
if (service.isEmpty())
{
// Done
if( !mAutoStart.phaseDone())
{
+ kWarning() << "Autostarting done. Reporting back to ksmserver";
mAutoStart.setPhaseDone();
switch( mAutoStart.phase())
{
@@ -816,6 +818,7 @@ KLauncher::start_service(KService::Ptr s
const QStringList &envs, const QByteArray &startup_id,
bool blind, bool autoStart, const QDBusMessage &msg)
{
+ kWarning() << "Preparing start: " << service->name();
QStringList urls = _urls;
bool runPermitted = KDesktopFile::isAuthorizedDesktopFile(service->entryPath());
@@ -908,6 +911,7 @@ KLauncher::start_service(KService::Ptr s
msg.setDelayedReply(true);
request->transaction = msg;
}
+ kWarning() << "Queueing service request";
queueRequest(request);
return true;
}
@@ -1051,6 +1055,7 @@ KLauncher::slotDequeue()
KLaunchRequest *request = requestQueue.takeFirst();
// process request
request->status = KLaunchRequest::Launching;
+ kWarning() << "Starting: " << request->name;
requestStart(request);
if (request->status != KLaunchRequest::Launching)
{

View File

@ -37,7 +37,7 @@
Summary: KDE Libraries
Version: 4.11.3
Release: 3%{?dist}
Release: 4%{?dist}
Name: kdelibs
Epoch: 6
@ -85,6 +85,8 @@ Requires: strigi-libs%{?_isa} >= %{strigi_version}
# make kdelibs-devel parallel-installable with kdelibs3-devel
Patch0: kdelibs-4.9.95-parallel_devel.patch
Patch1: http://john5342.fedorapeople.org/patches/kdelibs-4.11.3-autostart-debug.patch
# fix http://bugs.kde.org/149705
Patch2: kdelibs-4.10.0-kde149705.patch
@ -325,6 +327,7 @@ format for use with the Qt 4 Assistant or KDevelop 4.
%setup -q -n kdelibs-%{version}
%patch0 -p1 -b .parallel_devel
%patch1 -p1 -b .autostart_debug
%patch2 -p1 -b .kde149705
%patch8 -p1 -b .install_all_css
%patch9 -p1 -b .branding
@ -612,6 +615,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
%changelog
* Fri Dec 06 2013 Rex Dieter <rdieter@fedoraproject.org> 6:4.11.3-4
- add some autostart debugging
* Mon Dec 02 2013 Than Ngo <than@redhat.com> - 6:4.11.3-3
- add the arm's check in kdelibs