Merge remote-tracking branch 'origin/released'

Conflicts:
	pixman/pixman/pixman-mmx.c
	xorg-server/Xext/shm.c
	xorg-server/Xext/syncsrv.h
	xorg-server/Xext/xvmain.c
	xorg-server/Xi/exevents.c
	xorg-server/Xi/opendev.c
	xorg-server/composite/compalloc.c
	xorg-server/composite/compoverlay.c
	xorg-server/dix/colormap.c
	xorg-server/dix/devices.c
	xorg-server/dix/dispatch.c
	xorg-server/dix/dixfonts.c
	xorg-server/dix/eventconvert.c
	xorg-server/dix/events.c
	xorg-server/dix/gc.c
	xorg-server/dix/getevents.c
	xorg-server/dix/main.c
	xorg-server/dix/privates.c
	xorg-server/dix/registry.c
	xorg-server/dix/resource.c
	xorg-server/exa/exa_accel.c
	xorg-server/exa/exa_migration_classic.c
	xorg-server/exa/exa_unaccel.c
	xorg-server/fb/fb.h
	xorg-server/fb/fbcopy.c
	xorg-server/fb/fbpixmap.c
	xorg-server/glx/dispatch.h
	xorg-server/glx/glapi.h
	xorg-server/glx/glapi_gentable.c
	xorg-server/glx/glapitable.h
	xorg-server/glx/glprocs.h
	xorg-server/glx/glxcmds.c
	xorg-server/glx/glxcmdsswap.c
	xorg-server/glx/glxdricommon.c
	xorg-server/glx/glxdriswrast.c
	xorg-server/glx/glxext.c
	xorg-server/glx/indirect_dispatch.c
	xorg-server/glx/indirect_dispatch.h
	xorg-server/glx/indirect_dispatch_swap.c
	xorg-server/glx/indirect_size.h
	xorg-server/glx/indirect_size_get.h
	xorg-server/glx/indirect_table.c
	xorg-server/glx/indirect_util.c
	xorg-server/glx/rensize.c
	xorg-server/glx/single2swap.c
	xorg-server/glx/singlepix.c
	xorg-server/glx/singlepixswap.c
	xorg-server/glx/singlesize.c
	xorg-server/hw/dmx/dmxinit.c
	xorg-server/hw/kdrive/ephyr/ephyr.c
	xorg-server/hw/kdrive/ephyr/hostx.c
	xorg-server/hw/kdrive/ephyr/hostx.h
	xorg-server/hw/kdrive/src/kinput.c
	xorg-server/hw/xfree86/common/compiler.h
	xorg-server/hw/xwin/InitInput.c
	xorg-server/hw/xwin/InitOutput.c
	xorg-server/hw/xwin/ddraw.h
	xorg-server/hw/xwin/glx/glwrap.c
	xorg-server/hw/xwin/glx/indirect.c
	xorg-server/hw/xwin/glx/wgl_ext_api.h
	xorg-server/hw/xwin/glx/winpriv.c
	xorg-server/hw/xwin/win.h
	xorg-server/hw/xwin/winallpriv.c
	xorg-server/hw/xwin/winauth.c
	xorg-server/hw/xwin/winclipboard.h
	xorg-server/hw/xwin/winclipboardinit.c
	xorg-server/hw/xwin/winclipboardthread.c
	xorg-server/hw/xwin/winclipboardunicode.c
	xorg-server/hw/xwin/winclipboardwndproc.c
	xorg-server/hw/xwin/winclipboardwrappers.c
	xorg-server/hw/xwin/winclipboardxevents.c
	xorg-server/hw/xwin/wincmap.c
	xorg-server/hw/xwin/winconfig.c
	xorg-server/hw/xwin/wincreatewnd.c
	xorg-server/hw/xwin/wincursor.c
	xorg-server/hw/xwin/windialogs.c
	xorg-server/hw/xwin/winengine.c
	xorg-server/hw/xwin/winerror.c
	xorg-server/hw/xwin/wingc.c
	xorg-server/hw/xwin/wingetsp.c
	xorg-server/hw/xwin/winkeybd.c
	xorg-server/hw/xwin/winkeybd.h
	xorg-server/hw/xwin/winlayouts.h
	xorg-server/hw/xwin/winmisc.c
	xorg-server/hw/xwin/winmonitors.c
	xorg-server/hw/xwin/winmouse.c
	xorg-server/hw/xwin/winmsg.c
	xorg-server/hw/xwin/winmsg.h
	xorg-server/hw/xwin/winmultiwindowclass.c
	xorg-server/hw/xwin/winmultiwindowicons.c
	xorg-server/hw/xwin/winmultiwindowshape.c
	xorg-server/hw/xwin/winmultiwindowwindow.c
	xorg-server/hw/xwin/winmultiwindowwm.c
	xorg-server/hw/xwin/winmultiwindowwndproc.c
	xorg-server/hw/xwin/winnativegdi.c
	xorg-server/hw/xwin/winpfbdd.c
	xorg-server/hw/xwin/winpixmap.c
	xorg-server/hw/xwin/winpolyline.c
	xorg-server/hw/xwin/winprefs.c
	xorg-server/hw/xwin/winprocarg.c
	xorg-server/hw/xwin/winregistry.c
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/hw/xwin/winsetsp.c
	xorg-server/hw/xwin/winshaddd.c
	xorg-server/hw/xwin/winshadddnl.c
	xorg-server/hw/xwin/winshadgdi.c
	xorg-server/hw/xwin/wintrayicon.c
	xorg-server/hw/xwin/winwin32rootless.c
	xorg-server/hw/xwin/winwin32rootlesswindow.c
	xorg-server/hw/xwin/winwin32rootlesswndproc.c
	xorg-server/hw/xwin/winwindow.c
	xorg-server/hw/xwin/winwindow.h
	xorg-server/hw/xwin/winwindowswm.c
	xorg-server/hw/xwin/winwndproc.c
	xorg-server/include/callback.h
	xorg-server/include/dixstruct.h
	xorg-server/include/misc.h
	xorg-server/include/os.h
	xorg-server/include/scrnintstr.h
	xorg-server/mi/micmap.c
	xorg-server/mi/miinitext.c
	xorg-server/mi/mioverlay.c
	xorg-server/mi/misprite.c
	xorg-server/mi/mivaltree.c
	xorg-server/mi/miwindow.c
	xorg-server/miext/damage/damage.c
	xorg-server/miext/rootless/rootlessGC.c
	xorg-server/miext/rootless/rootlessWindow.c
	xorg-server/os/WaitFor.c
	xorg-server/os/access.c
	xorg-server/os/connection.c
	xorg-server/os/io.c
	xorg-server/os/log.c
	xorg-server/os/osinit.c
	xorg-server/os/utils.c
	xorg-server/os/xdmcp.c
	xorg-server/os/xprintf.c
	xorg-server/os/xstrans.c
	xorg-server/render/mipict.c
	xorg-server/xkb/xkbActions.c
	xorg-server/xkb/xkbInit.c
	xorg-server/xkeyboard-config/compat/default.in

1 files changed, 207 insertions, 193 deletions

diff --git a/xorg-server/hw/dmx/dmxsync.c b/xorg-server/hw/dmx/dmxsync.c
index 8ace59470..bf28584b4 100644
--- a/xorg-server/hw/dmx/dmxsync.c
+++ b/xorg-server/hw/dmx/dmxsync.c
@@ -1,193 +1,207 @@
-/*

- * Copyright 2002-2004 Red Hat Inc., Durham, North Carolina.

- *

- * All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining

- * a copy of this software and associated documentation files (the

- * "Software"), to deal in the Software without restriction, including

- * without limitation on the rights to use, copy, modify, merge,

- * publish, distribute, sublicense, and/or sell copies of the Software,

- * and to permit persons to whom the Software is furnished to do so,

- * subject to the following conditions:

- *

- * The above copyright notice and this permission notice (including the

- * next paragraph) shall be included in all copies or substantial

- * portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

- * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS

- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

- * SOFTWARE.

- */

-

-/*

- * Authors:

- *   Rickard E. (Rik) Faith <faith@redhat.com>

- *

- */

-

-/** \file

- *

- * The DMX server code is written to call #dmxSync() whenever an XSync()

- * might be necessary.  However, since XSync() requires a two way

- * communication with the other X server, eliminating unnecessary

- * XSync() calls is a key performance optimization.  Support for this

- * optimization is provided here.  Statistics about XSync() calls and

- * latency are gathered in \a dmxstat.c.

- *

- * During the initial conversion from calling XSync() immediately to the

- * XSync() batching method implemented in this file, it was noted that,

- * out of more than 300 \a x11perf tests, 8 tests became more than 100

- * times faster, with 68 more than 50X faster, 114 more than 10X faster,

- * and 181 more than 2X faster. */

-

-#ifdef HAVE_DMX_CONFIG_H

-#include <dmx-config.h>

-#endif

-

-#include "dmx.h"

-#include "dmxsync.h"

-#include "dmxstat.h"

-#include "dmxlog.h"

-#include <sys/time.h>

-

-static int        dmxSyncInterval = 100; /* Default interval in milliseconds */

-static OsTimerPtr dmxSyncTimer;

-static int        dmxSyncPending;

-

-static void dmxDoSync(DMXScreenInfo *dmxScreen)

-{

-    dmxScreen->needsSync = FALSE;

-

-    if (!dmxScreen->beDisplay)

-	return; /* FIXME: Is this correct behavior for sync stats? */

-

-    if (!dmxStatInterval) {

-        XSync(dmxScreen->beDisplay, False);

-    } else {

-        struct timeval start, stop;

-        

-        gettimeofday(&start, 0);

-        XSync(dmxScreen->beDisplay, False);

-        gettimeofday(&stop, 0);

-        dmxStatSync(dmxScreen, &stop, &start, dmxSyncPending);

-    }

-}

-

-static CARD32 dmxSyncCallback(OsTimerPtr timer, CARD32 time, pointer arg)

-{

-    int           i;

-

-    if (dmxSyncPending) {

-        for (i = 0; i < dmxNumScreens; i++) {

-            DMXScreenInfo *dmxScreen = &dmxScreens[i];

-            if (dmxScreen->needsSync) dmxDoSync(dmxScreen);

-        }

-    }

-    dmxSyncPending = 0;

-    return 0;                   /* Do not place on queue again */

-}

-

-static void dmxSyncBlockHandler(pointer blockData, OSTimePtr pTimeout,

-                                pointer pReadMask)

-{

-    TimerForce(dmxSyncTimer);

-}

-

-static void dmxSyncWakeupHandler(pointer blockData, int result,

-                                 pointer pReadMask)

-{

-}

-

-/** Request the XSync() batching optimization with the specified \a

- * interval (in mS).  If the \a interval is 0, 100mS is used.  If the \a

- * interval is less than 0, then the XSync() batching optimization is

- * not requested (e.g., so the -syncbatch -1 command line option can

- * turn off the default 100mS XSync() batching).

- *

- * Note that the parameter to this routine is a string, since it will

- * usually be called from #ddxProcessArgument in \a dmxinit.c */

-void dmxSyncActivate(const char *interval)

-{

-    dmxSyncInterval = (interval ? atoi(interval) : 100);

-

-    if (dmxSyncInterval < 0) dmxSyncInterval = 0;

-}

-

-/** Initialize the XSync() batching optimization, but only if

- * #dmxSyncActivate was last called with a non-negative value. */

-void dmxSyncInit(void)

-{

-    if (dmxSyncInterval) {

-        RegisterBlockAndWakeupHandlers(dmxSyncBlockHandler,

-                                       dmxSyncWakeupHandler,

-                                       NULL);

-        dmxLog(dmxInfo, "XSync batching with %d ms interval\n",

-               dmxSyncInterval);

-    } else {

-        dmxLog(dmxInfo, "XSync batching disabled\n");

-    }

-}

-

-/** Request an XSync() to the display used by \a dmxScreen.  If \a now

- * is TRUE, call XSync() immediately instead of waiting for the next

- * XSync() batching point.  Note that if XSync() batching was deselected

- * with #dmxSyncActivate() before #dmxSyncInit() was called, then no

- * XSync() batching is performed and this function always calles XSync()

- * immediately.

- *

- * (Note that this function uses TimerSet but works correctly in the

- * face of a server generation.  See the source for details.)

- *

- * If \a dmxScreen is \a NULL, then all pending syncs will be flushed

- * immediately.

- */

-void dmxSync(DMXScreenInfo *dmxScreen, Bool now)

-{

-    static unsigned long dmxGeneration = 0;

-

-    if (dmxSyncInterval) {

-        if (dmxGeneration != serverGeneration) {

-            /* Server generation does a TimerInit, which frees all

-             * timers.  So, at this point dmxSyncTimer is either:

-             * 1) NULL, iff dmxGeneration == 0,

-             * 2) freed, if it was on a queue (dmxSyncPending != 0), or

-             * 3) allocated, if it wasn't on a queue (dmxSyncPending == 0)

-             */

-            if (dmxSyncTimer && !dmxSyncPending) free(dmxSyncTimer);

-            dmxSyncTimer  = NULL;

-            now           = TRUE;

-            dmxGeneration = serverGeneration;

-        }

-                                /* Queue sync */

-        if (dmxScreen) {

-            dmxScreen->needsSync = TRUE;

-            ++dmxSyncPending;

-        }

-

-                                /* Do sync or set time for later */

-        if (now || !dmxScreen) {

-            if (!TimerForce(dmxSyncTimer)) dmxSyncCallback(NULL, 0, NULL);

-            /* At this point, dmxSyncPending == 0 because

-             * dmxSyncCallback must have been called. */

-            if (dmxSyncPending)

-                dmxLog(dmxFatal, "dmxSync(%s,%d): dmxSyncPending = %d\n",

-                       dmxScreen ? dmxScreen->name : "", now, dmxSyncPending);

-        } else {

-            dmxScreen->needsSync = TRUE;

-            if (dmxSyncPending == 1)

-                dmxSyncTimer = TimerSet(dmxSyncTimer, 0, dmxSyncInterval,

-                                        dmxSyncCallback, NULL);

-        }

-    } else {

-                                /* If dmxSyncInterval is not being used,

-                                 * then all the backends are already

-                                 * up-to-date. */

-        if (dmxScreen) dmxDoSync(dmxScreen);

-    }

-}

+/*
+ * Copyright 2002-2004 Red Hat Inc., Durham, North Carolina.
+ *
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation on the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/*
+ * Authors:
+ *   Rickard E. (Rik) Faith <faith@redhat.com>
+ *
+ */
+
+/** \file
+ *
+ * The DMX server code is written to call #dmxSync() whenever an XSync()
+ * might be necessary.  However, since XSync() requires a two way
+ * communication with the other X server, eliminating unnecessary
+ * XSync() calls is a key performance optimization.  Support for this
+ * optimization is provided here.  Statistics about XSync() calls and
+ * latency are gathered in \a dmxstat.c.
+ *
+ * During the initial conversion from calling XSync() immediately to the
+ * XSync() batching method implemented in this file, it was noted that,
+ * out of more than 300 \a x11perf tests, 8 tests became more than 100
+ * times faster, with 68 more than 50X faster, 114 more than 10X faster,
+ * and 181 more than 2X faster. */
+
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
+#include "dmx.h"
+#include "dmxsync.h"
+#include "dmxstat.h"
+#include "dmxlog.h"
+#include <sys/time.h>
+
+static int dmxSyncInterval = 100;       /* Default interval in milliseconds */
+static OsTimerPtr dmxSyncTimer;
+static int dmxSyncPending;
+
+static void
+dmxDoSync(DMXScreenInfo * dmxScreen)
+{
+    dmxScreen->needsSync = FALSE;
+
+    if (!dmxScreen->beDisplay)
+        return;                 /* FIXME: Is this correct behavior for sync stats? */
+
+    if (!dmxStatInterval) {
+        XSync(dmxScreen->beDisplay, False);
+    }
+    else {
+        struct timeval start, stop;
+
+        gettimeofday(&start, 0);
+        XSync(dmxScreen->beDisplay, False);
+        gettimeofday(&stop, 0);
+        dmxStatSync(dmxScreen, &stop, &start, dmxSyncPending);
+    }
+}
+
+static CARD32
+dmxSyncCallback(OsTimerPtr timer, CARD32 time, pointer arg)
+{
+    int i;
+
+    if (dmxSyncPending) {
+        for (i = 0; i < dmxNumScreens; i++) {
+            DMXScreenInfo *dmxScreen = &dmxScreens[i];
+
+            if (dmxScreen->needsSync)
+                dmxDoSync(dmxScreen);
+        }
+    }
+    dmxSyncPending = 0;
+    return 0;                   /* Do not place on queue again */
+}
+
+static void
+dmxSyncBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadMask)
+{
+    TimerForce(dmxSyncTimer);
+}
+
+static void
+dmxSyncWakeupHandler(pointer blockData, int result, pointer pReadMask)
+{
+}
+
+/** Request the XSync() batching optimization with the specified \a
+ * interval (in mS).  If the \a interval is 0, 100mS is used.  If the \a
+ * interval is less than 0, then the XSync() batching optimization is
+ * not requested (e.g., so the -syncbatch -1 command line option can
+ * turn off the default 100mS XSync() batching).
+ *
+ * Note that the parameter to this routine is a string, since it will
+ * usually be called from #ddxProcessArgument in \a dmxinit.c */
+void
+dmxSyncActivate(const char *interval)
+{
+    dmxSyncInterval = (interval ? atoi(interval) : 100);
+
+    if (dmxSyncInterval < 0)
+        dmxSyncInterval = 0;
+}
+
+/** Initialize the XSync() batching optimization, but only if
+ * #dmxSyncActivate was last called with a non-negative value. */
+void
+dmxSyncInit(void)
+{
+    if (dmxSyncInterval) {
+        RegisterBlockAndWakeupHandlers(dmxSyncBlockHandler,
+                                       dmxSyncWakeupHandler, NULL);
+        dmxLog(dmxInfo, "XSync batching with %d ms interval\n",
+               dmxSyncInterval);
+    }
+    else {
+        dmxLog(dmxInfo, "XSync batching disabled\n");
+    }
+}
+
+/** Request an XSync() to the display used by \a dmxScreen.  If \a now
+ * is TRUE, call XSync() immediately instead of waiting for the next
+ * XSync() batching point.  Note that if XSync() batching was deselected
+ * with #dmxSyncActivate() before #dmxSyncInit() was called, then no
+ * XSync() batching is performed and this function always calles XSync()
+ * immediately.
+ *
+ * (Note that this function uses TimerSet but works correctly in the
+ * face of a server generation.  See the source for details.)
+ *
+ * If \a dmxScreen is \a NULL, then all pending syncs will be flushed
+ * immediately.
+ */
+void
+dmxSync(DMXScreenInfo * dmxScreen, Bool now)
+{
+    static unsigned long dmxGeneration = 0;
+
+    if (dmxSyncInterval) {
+        if (dmxGeneration != serverGeneration) {
+            /* Server generation does a TimerInit, which frees all
+             * timers.  So, at this point dmxSyncTimer is either:
+             * 1) NULL, iff dmxGeneration == 0,
+             * 2) freed, if it was on a queue (dmxSyncPending != 0), or
+             * 3) allocated, if it wasn't on a queue (dmxSyncPending == 0)
+             */
+            if (dmxSyncTimer && !dmxSyncPending)
+                free(dmxSyncTimer);
+            dmxSyncTimer = NULL;
+            now = TRUE;
+            dmxGeneration = serverGeneration;
+        }
+        /* Queue sync */
+        if (dmxScreen) {
+            dmxScreen->needsSync = TRUE;
+            ++dmxSyncPending;
+        }
+
+        /* Do sync or set time for later */
+        if (now || !dmxScreen) {
+            if (!TimerForce(dmxSyncTimer))
+                dmxSyncCallback(NULL, 0, NULL);
+            /* At this point, dmxSyncPending == 0 because
+             * dmxSyncCallback must have been called. */
+            if (dmxSyncPending)
+                dmxLog(dmxFatal, "dmxSync(%s,%d): dmxSyncPending = %d\n",
+                       dmxScreen ? dmxScreen->name : "", now, dmxSyncPending);
+        }
+        else {
+            dmxScreen->needsSync = TRUE;
+            if (dmxSyncPending == 1)
+                dmxSyncTimer = TimerSet(dmxSyncTimer, 0, dmxSyncInterval,
+                                        dmxSyncCallback, NULL);
+        }
+    }
+    else {
+        /* If dmxSyncInterval is not being used,
+         * then all the backends are already
+         * up-to-date. */
+        if (dmxScreen)
+            dmxDoSync(dmxScreen);
+    }
+}