Re: [PATCH 2/4] X event queue mutex

[Jeremy Huddleston]

On Nov 3, 2008, at 22:08, Peter Hutterer wrote:

...

righty-o. hunk 2 is different, with the change you suggested. To make

copies into local variables below it.

the flow cleaner, I moved all the EQ and memory alloc stuff together and the

Almost... you need to move the pop down 4 lines.  ie this:

<bad>
        miEventQueue.head = (miEventQueue.head + 1) % QUEUE_SIZE;

+        dev     = e->pDev;

+        type    = e->events->event->u.u.type;
+        screen  = e->pScreen;
+
</bad>

should be this:
<good>
+        dev     = e->pDev;

+        type    = e->events->event->u.u.type;
+        screen  = e->pScreen;
+
        miEventQueue.head = (miEventQueue.head + 1) % QUEUE_SIZE;
</good>



<good>
+        dev     = e->pDev;
+        screen  = e->pScreen;
+
        miEventQueue.head = (miEventQueue.head + 1) % QUEUE_SIZE;

+        type    = event->u.u.type;

</good>

--Jeremy

+ master = (!dev->isMaster && dev->u.master) ? dev->u.master : NULL; + master = (!dev->isMaster && dev->u.master) ? dev->u.master : NULL; After you increment miEventQueue.head, you can't read from e. ... so you could also do this if you wanted to be anal about popping quickly: + master = (!dev->isMaster && dev->u.master) ? dev->u.master : NULL;

smime.p7s
Description: S/MIME cryptographic signature

_______________________________________________
xorg mailing list
xorg@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/xorg