Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Robin Cook (0bfa391d4abd1dda52ff2cf3db1ac577cfe25b33)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Robin Cook <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Robin Cook (0bfa391d4abd1dda52ff2cf3db1ac577cfe25b33)
  • Date: Sat, 18 Apr 2009 12:43:21 -0500

GIT changes to master grimoire by Robin Cook <rcook AT wyrms.net>:

xorg-xserver/xorg-server/HISTORY | 3
xorg-xserver/xorg-server/gnome.patch | 151
++++++++++++++++++-----------------
2 files changed, 84 insertions(+), 70 deletions(-)

New commits:
commit 21d536782e7661a697eef7add27d48a3edccd3c8
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

xorg-server: copy correct patch file

diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index 6a0023c..6bd3e31 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,6 @@
+2009-04-18 Robin Cook <rcook AT wyrms.net>
+ * gnome.patch: copy correct patch file
+
2009-04-17 Robin Cook <rcook AT wyrms.net>
* PRE_BUILD: apply patch to fix gnome 2.26 cpu issue bug #573472

http://cgit.freedesktop.org/xorg/xserver/commit/?id=1f4fb0225b278d1cf4145aebeb0bdd23dc8f62d5
diff --git a/xorg-xserver/xorg-server/gnome.patch
b/xorg-xserver/xorg-server/gnome.patch
index c801cde..02fd1d1 100644
--- a/xorg-xserver/xorg-server/gnome.patch
+++ b/xorg-xserver/xorg-server/gnome.patch
@@ -3,80 +3,91 @@ index 88fc03d..d9e66b3 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -2281,7 +2281,7 @@ SyncInitServerTime(void)
-* IDLETIME implementation
-*/
+ * IDLETIME implementation
+ */
+
-static pointer IdleTimeCounter;
+static SyncCounter *IdleTimeCounter;
-static XSyncValue *pIdleTimeValueLess;
-static XSyncValue *pIdleTimeValueGreater;
+ static XSyncValue *pIdleTimeValueLess;
+ static XSyncValue *pIdleTimeValueGreater;
+
@@ -2293,38 +2293,69 @@ IdleTimeQueryValue (pointer pCounter, CARD64
*pValue_return)
-}
-static void
+ }
+
+ static void
-IdleTimeBlockHandler (pointer env,
-- struct timeval **wt,
-- pointer LastSelectMask)
+- struct timeval **wt,
+- pointer LastSelectMask)
+IdleTimeBlockHandler(pointer env, struct timeval **wt, pointer
LastSelectMask)
-{
-- XSyncValue idle;
-+ XSyncValue idle, old_idle;
-+ SyncTriggerList *list = IdleTimeCounter->pTriglist;
-+ SyncTrigger *trig;
-if (!pIdleTimeValueLess && !pIdleTimeValueGreater)
-return;
-+ old_idle = IdleTimeCounter->value;
-IdleTimeQueryValue (NULL, &idle);
-+ IdleTimeCounter->value = idle; /* push, so CheckTrigger works */
-if (pIdleTimeValueLess &&
-XSyncValueLessOrEqual (idle, *pIdleTimeValueLess))
-{
-- AdjustWaitForDelay (wt, 0);
-+ /*
-+ * We've been idle for less than the threshold value, and someone
-+ * wants to know about that, but now we need to know whether they
-+ * want level or edge trigger. Check the trigger list against the
-+ * current idle time, and if any succeed, bomb out of select()
-+ * immediately so we can reschedule.
-+ */
+ {
+- XSyncValue idle;
++ XSyncValue idle, old_idle;
++ SyncTriggerList *list = IdleTimeCounter->pTriglist;
++ SyncTrigger *trig;
+
+ if (!pIdleTimeValueLess && !pIdleTimeValueGreater)
+ return;
+
++ old_idle = IdleTimeCounter->value;
+ IdleTimeQueryValue (NULL, &idle);
++ IdleTimeCounter->value = idle; /* push, so CheckTrigger works */
+
+ if (pIdleTimeValueLess &&
+ XSyncValueLessOrEqual (idle, *pIdleTimeValueLess))
+ {
+- AdjustWaitForDelay (wt, 0);
++ /*
++ * We've been idle for less than the threshold value, and someone
++ * wants to know about that, but now we need to know whether they
++ * want level or edge trigger. Check the trigger list against the
++ * current idle time, and if any succeed, bomb out of select()
++ * immediately so we can reschedule.
++ */
+
-+ for (list = IdleTimeCounter->pTriglist; list; list = list->next) {
-+ trig = list->pTrigger;
-+ if (trig->CheckTrigger(trig, old_idle)) {
-+ AdjustWaitForDelay(wt, 0);
-+ break;
-+ }
-+ }
-}
-else if (pIdleTimeValueGreater)
-{
-- unsigned long timeout = 0;
-+ /*
-+ * There's a threshold in the positive direction. If we've been
-+ * idle less than it, schedule a wakeup for sometime in the future.
-+ * If we've been idle more than it, and someone wants to know about
-+ * that level-triggered, schedule an immediate wakeup.
-+ */
-+ unsigned long timeout = -1;
-- if (XSyncValueLessThan (idle, *pIdleTimeValueGreater))
-- {
-+ if (XSyncValueLessThan (idle, *pIdleTimeValueGreater)) {
-XSyncValue value;
-Bool overflow;
-XSyncValueSubtract (&value, *pIdleTimeValueGreater,
-idle, &overflow);
-- timeout = XSyncValueLow32 (value);
-+ timeout = min(timeout, XSyncValueLow32 (value));
-+ } else {
-+ for (list = IdleTimeCounter->pTriglist; list; list = list->next) {
-+ trig = list->pTrigger;
-+ if (trig->CheckTrigger(trig, old_idle)) {
-+ timeout = min(timeout, 0);
-+ break;
-+ }
-+ }
-}
-AdjustWaitForDelay (wt, timeout);
-}
++ for (list = IdleTimeCounter->pTriglist; list; list = list->next) {
++ trig = list->pTrigger;
++ if (trig->CheckTrigger(trig, old_idle)) {
++ AdjustWaitForDelay(wt, 0);
++ break;
++ }
++ }
+ }
+ else if (pIdleTimeValueGreater)
+ {
+- unsigned long timeout = 0;
++ /*
++ * There's a threshold in the positive direction. If we've been
++ * idle less than it, schedule a wakeup for sometime in the future.
++ * If we've been idle more than it, and someone wants to know about
++ * that level-triggered, schedule an immediate wakeup.
++ */
++ unsigned long timeout = -1;
+
+- if (XSyncValueLessThan (idle, *pIdleTimeValueGreater))
+- {
++ if (XSyncValueLessThan (idle, *pIdleTimeValueGreater)) {
+ XSyncValue value;
+ Bool overflow;
+
+ XSyncValueSubtract (&value, *pIdleTimeValueGreater,
+ idle, &overflow);
+- timeout = XSyncValueLow32 (value);
++ timeout = min(timeout, XSyncValueLow32 (value));
++ } else {
++ for (list = IdleTimeCounter->pTriglist; list; list = list->next) {
++ trig = list->pTrigger;
++ if (trig->CheckTrigger(trig, old_idle)) {
++ timeout = min(timeout, 0);
++ break;
++ }
++ }
+ }
+
+ AdjustWaitForDelay (wt, timeout);
+ }
+
-+ IdleTimeCounter->value = old_idle; /* pop */
-}
-static void
++ IdleTimeCounter->value = old_idle; /* pop */
+ }
+
+ static void
+



  • [SM-Commit] GIT changes to master grimoire by Robin Cook (0bfa391d4abd1dda52ff2cf3db1ac577cfe25b33), Robin Cook, 04/18/2009

Archive powered by MHonArc 2.6.24.

Top of Page