summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland Mainz <roland.mainz@nrubsig.org>2004-04-29 23:59:15 +0000
committerRoland Mainz <roland.mainz@nrubsig.org>2004-04-29 23:59:15 +0000
commit2c2c1704b542f29fe5ac9917e1141040a0dbd3e9 (patch)
tree2ecfb3a2fbe4b8f62c3f65bce21e6419a0f69a60
parenta8429d76103ff0f4fc61db86201c741f91bfcba2 (diff)
Fix for http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=567 -XACE-SELINUX-MERGE
Xorg Xprt starts to consume 100% CPU when being idle for some time (internal screensaver goes mad after 10mins)
-rw-r--r--Xprint/Init.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/Xprint/Init.c b/Xprint/Init.c
index d773ccf62..ce13d6534 100644
--- a/Xprint/Init.c
+++ b/Xprint/Init.c
@@ -303,6 +303,11 @@ void XprintInitGlobals(void)
* ("Xfree86's "smart scheduler" breaks Xprt") */
SmartScheduleDisable = TRUE;
#endif /* SMART_SCHEDULE */
+
+ /* Disable internal screensaver for Xprint (workaround for
+ * http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=567 ("Xorg
+ * Xprt starts to consume 100% CPU when being idle for some time")) */
+ defaultScreenSaverTime = 0;
}
/*
@@ -1296,11 +1301,22 @@ PrinterInitOutput(
FatalError("Internal error: XprintInitGlobals() not called.");
}
#ifdef SMART_SCHEDULE
+ /* |XprintInitGlobals| should have set |SmartScheduleDisable| to
+ * |TRUE| - if not we will trigger this safeguard. */
if( SmartScheduleDisable != TRUE )
{
FatalError("Internal error: XF86 smart scheduler incompatible to Xprint DDX.");
}
#endif /* SMART_SCHEDULE */
+ /* Safeguard for
+ * http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=567 ("Xorg
+ * Xprt starts to consume 100% CPU when being idle for some time")
+ * |XprintInitGlobals| should have set |defaultScreenSaverTime| to
+ * |0| - if not we will trigger this trap. */
+ if( defaultScreenSaverTime != 0 )
+ {
+ FatalError("Internal screen saver must be OFF for printing.");
+ }
/*
* this little test is just a warning at startup to make sure