[packages/lxdm] - fix event check bug caused cpu 100%
glen
glen at pld-linux.org
Sun Jul 22 02:02:29 CEST 2012
commit d32ff2840cf10e9a4b9f589d9b63a982755fed48
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sun Jul 22 02:00:24 2012 +0300
- fix event check bug caused cpu 100%
patch from fedora, which is from upstream git
lxdm.spec | 4 +++-
softlockup.patch | 21 +++++++++++++++++++++
2 files changed, 24 insertions(+), 1 deletion(-)
---
diff --git a/lxdm.spec b/lxdm.spec
index 9581d91..94d472d 100644
--- a/lxdm.spec
+++ b/lxdm.spec
@@ -1,7 +1,7 @@
Summary: Light weight X11 display manager
Name: lxdm
Version: 0.4.1
-Release: 9
+Release: 10
License: GPL v3
Group: X11/Applications
Source0: http://downloads.sourceforge.net/lxde/%{name}-%{version}.tar.gz
@@ -12,6 +12,7 @@ Source3: %{name}.Xsession
Source4: %{name}.upstart
Patch0: %{name}-setuid.patch
Patch1: greeter-skip-services.patch
+Patch2: softlockup.patch
URL: http://wiki.lxde.org/en/LXDM
BuildRequires: ConsoleKit-devel
BuildRequires: gettext-devel
@@ -51,6 +52,7 @@ Skrypt init dla lxdm-a.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
rm -f data/lxdm.conf
diff --git a/softlockup.patch b/softlockup.patch
new file mode 100644
index 0000000..034707c
--- /dev/null
+++ b/softlockup.patch
@@ -0,0 +1,21 @@
+From: dgod <dgod.osa at gmail.com>
+Date: Sun, 25 Dec 2011 07:23:19 +0000 (+0800)
+Subject: fix event check bug caused cpu 100%
+X-Git-Url: http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde%2Flxdm;a=commitdiff_plain;h=d4e41ecb36a1ea29482b75674d804bb0f05540b2;hp=f0951bdf736026b041001e846d2cb93f7f2852e1
+
+fix event check bug caused cpu 100%
+---
+
+diff --git a/src/lxcom.c b/src/lxcom.c
+index 02763eb..18ee12e 100644
+--- a/src/lxcom.c
++++ b/src/lxcom.c
+@@ -89,7 +89,7 @@ static gboolean lxcom_prepare (GSource *source,gint *timeout)
+
+ static gboolean lxcom_check(GSource *source)
+ {
+- return TRUE;
++ return (((LXComSource*)source)->poll.revents&G_IO_IN)?TRUE:FALSE;
+ }
+
+ static gboolean lxcom_dispatch (GSource *source,GSourceFunc callback,gpointer user_data)
More information about the pld-cvs-commit
mailing list