Mailinglist Archive: opensuse-commit (861 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package xorg-x11-server for openSUSE:Factory
checked in at Wed Jan 12 09:01:08 CET 2011.



--------
--- xorg-x11-server/xorg-x11-server.changes     2011-01-05 20:58:07.000000000 
+0100
+++ /mounts/work_src_done/STABLE/xorg-x11-server/xorg-x11-server.changes        
2011-01-10 16:18:05.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Jan 10 16:01:13 CET 2011 - vuntz@xxxxxxxxxxxx
+
+- Add xorg-server-stop-cpu-eating.diff to avoid eating 100% of the
+  CPU when auto-detecting which vt to use on startup.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  xorg-server-stop-cpu-eating.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ xorg-x11-server.spec ++++++
--- /var/tmp/diff_new_pack.dD6zXz/_old  2011-01-12 08:48:53.000000000 +0100
+++ /var/tmp/diff_new_pack.dD6zXz/_new  2011-01-12 08:48:53.000000000 +0100
@@ -32,7 +32,7 @@
 %endif
 Url:            http://xorg.freedesktop.org/
 Version:        7.6_%{dirsuffix}
-Release:        3
+Release:        4
 License:        GPLv2+ ; MIT License (or similar)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4
@@ -122,6 +122,7 @@
 Patch222:       sync-fix.patch
 Patch223:       use-last-screen.patch
 Patch224:       pad-size-of-system-memory-copy-for-1x1-pixmaps
+Patch225:       xorg-server-stop-cpu-eating.diff
 %if %moblin
 Patch300:       moblin-use_preferred_mode_for_all_outputs.diff
 %endif
@@ -254,6 +255,7 @@
 %patch222 -p1
 %patch223 -p1
 %patch224 -p1
+%patch225 -p1
 %if %moblin
 %patch300 -p1
 %endif

++++++ xorg-server-stop-cpu-eating.diff ++++++
> From a6b9e8f1e5d5d0b3b0f121a6f677eeca7aab1950 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@xxxxxxxxxx>
Date: Wed, 25 Aug 2010 15:06:38 +0000
Subject: linux: Fix CPU usage bug in console fd flushing

If the vt gets a vhangup from under us, then the tty will appear ready
in select(), but trying to tcflush() it will return -EIO, so we'll spin
around at 100% CPU for no reason.  Notice this condition and unregister
the handler if it happens.

Signed-off-by: Adam Jackson <ajax@xxxxxxxxxx>
Reviewed-by: Mikhail Gusarov <dottedmag@xxxxxxxxxxxxx>
Reviewed-by: Julien Cristau <jcristau@xxxxxxxxxx>
Signed-off-by: Peter Hutterer <peter.hutterer@xxxxxxxxx>
---
diff --git a/hw/xfree86/os-support/linux/lnx_init.c 
b/hw/xfree86/os-support/linux/lnx_init.c
index bf61ceb..7ee9046 100644
--- a/hw/xfree86/os-support/linux/lnx_init.c
+++ b/hw/xfree86/os-support/linux/lnx_init.c
@@ -85,7 +85,11 @@ static void *console_handler;
 static void
 drain_console(int fd, void *closure)
 {
-    tcflush(fd, TCIOFLUSH);
+    errno = 0;
+    if (tcflush(fd, TCIOFLUSH) == -1 && errno == EIO) {
+       xf86RemoveGeneralHandler(console_handler);
+       console_handler = NULL;
+    }
 }
 
 void
--
cgit v0.8.3-6-g21f6

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx