Attachment 400 Details for Bug 786 – new XFD_* macros

[patch] new XFD_* macros

xpoll.diff (text/plain), 4.57 KB, created by Alexander Gottwald on 2004-06-21 08:30:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Gottwald

Created: 2004-06-21 08:30:11 UTC

Size: 4.57 KB

patch

obsolete

>Index: include/Xpoll.h
>===================================================================
>RCS file: /cvs/xorg/xc/include/Xpoll.h,v
>retrieving revision 1.3
>diff -u -r1.3 Xpoll.h
>--- include/Xpoll.h	23 Apr 2004 18:43:05 -0000	1.3
>+++ include/Xpoll.h	21 Jun 2004 15:24:59 -0000
>@@ -118,62 +118,40 @@
> #endif
> 
> /*
>- * The following macros are used by the servers only. There is an
>- * explicit assumption that the bit array in the fd_set is at least
>- * 256 bits long (8 32-bit words). This is true on most modern POSIX 
>- * systems. Note that this is merely an optimization for the servers
>- * based on assumptions about the way that file descripters are
>- * allocated on POSIX systems. 
>- *
>- * When porting X to new systems it is important to adjust these
>- * macros if the system has fewer than 256 bits in the fd_set bit
>- * array.
>+ * The howmany(FD_SETSIZE, NFDBITS) computes the number of elements in the
>+ * array. before accessing an element in the array we check it exists.
>+ * If it does not exist then the compiler discards the code to access it. 
>  */
> #define XFD_ANYSET(p) \
>-		((p)->fds_bits[0] || (p)->fds_bits[1] || \
>-		(p)->fds_bits[2] || (p)->fds_bits[3] || \
>-		(p)->fds_bits[4] || (p)->fds_bits[5] || \
>-		(p)->fds_bits[6] || (p)->fds_bits[7])
>-
>-#define XFD_COPYSET(src,dst) \
>-		(dst)->fds_bits[0] = (src)->fds_bits[0]; \
>-		(dst)->fds_bits[1] = (src)->fds_bits[1]; \
>-		(dst)->fds_bits[2] = (src)->fds_bits[2]; \
>-		(dst)->fds_bits[3] = (src)->fds_bits[3]; \
>-		(dst)->fds_bits[4] = (src)->fds_bits[4]; \
>-		(dst)->fds_bits[5] = (src)->fds_bits[5]; \
>-		(dst)->fds_bits[6] = (src)->fds_bits[6]; \
>-		(dst)->fds_bits[7] = (src)->fds_bits[7];
>-
>-#define XFD_ANDSET(dst,b1,b2) \
>-		(dst)->fds_bits[0] = ((b1)->fds_bits[0] & (b2)->fds_bits[0]); \
>-		(dst)->fds_bits[1] = ((b1)->fds_bits[1] & (b2)->fds_bits[1]); \
>-		(dst)->fds_bits[2] = ((b1)->fds_bits[2] & (b2)->fds_bits[2]); \
>-		(dst)->fds_bits[3] = ((b1)->fds_bits[3] & (b2)->fds_bits[3]); \
>-		(dst)->fds_bits[4] = ((b1)->fds_bits[4] & (b2)->fds_bits[4]); \
>-		(dst)->fds_bits[5] = ((b1)->fds_bits[5] & (b2)->fds_bits[5]); \
>-		(dst)->fds_bits[6] = ((b1)->fds_bits[6] & (b2)->fds_bits[6]); \
>-		(dst)->fds_bits[7] = ((b1)->fds_bits[7] & (b2)->fds_bits[7]);
>-
>-#define XFD_ORSET(dst,b1,b2) \
>-		(dst)->fds_bits[0] = ((b1)->fds_bits[0] | (b2)->fds_bits[0]); \
>-		(dst)->fds_bits[1] = ((b1)->fds_bits[1] | (b2)->fds_bits[1]); \
>-		(dst)->fds_bits[2] = ((b1)->fds_bits[2] | (b2)->fds_bits[2]); \
>-		(dst)->fds_bits[3] = ((b1)->fds_bits[3] | (b2)->fds_bits[3]); \
>-		(dst)->fds_bits[4] = ((b1)->fds_bits[4] | (b2)->fds_bits[4]); \
>-		(dst)->fds_bits[5] = ((b1)->fds_bits[5] | (b2)->fds_bits[5]); \
>-		(dst)->fds_bits[6] = ((b1)->fds_bits[6] | (b2)->fds_bits[6]); \
>-		(dst)->fds_bits[7] = ((b1)->fds_bits[7] | (b2)->fds_bits[7]);
>-
>-#define XFD_UNSET(dst,b1) \
>-		(dst)->fds_bits[0] &= ~((b1)->fds_bits[0]); \
>-		(dst)->fds_bits[1] &= ~((b1)->fds_bits[1]); \
>-		(dst)->fds_bits[2] &= ~((b1)->fds_bits[2]); \
>-		(dst)->fds_bits[3] &= ~((b1)->fds_bits[3]); \
>-		(dst)->fds_bits[4] &= ~((b1)->fds_bits[4]); \
>-		(dst)->fds_bits[5] &= ~((b1)->fds_bits[5]); \
>-		(dst)->fds_bits[6] &= ~((b1)->fds_bits[6]); \
>-		(dst)->fds_bits[7] &= ~((b1)->fds_bits[7]);
>+        ((howmany(FD_SETSIZE, NFDBITS) > 0 && (p)->fds_bits[0]) || \
>+        (howmany(FD_SETSIZE, NFDBITS) > 1 && (p)->fds_bits[1]) || \
>+        (howmany(FD_SETSIZE, NFDBITS) > 2 && (p)->fds_bits[2]) || \
>+        (howmany(FD_SETSIZE, NFDBITS) > 3 && (p)->fds_bits[3]) || \
>+        (howmany(FD_SETSIZE, NFDBITS) > 4 && (p)->fds_bits[4]) || \
>+        (howmany(FD_SETSIZE, NFDBITS) > 5 && (p)->fds_bits[5]) || \
>+        (howmany(FD_SETSIZE, NFDBITS) > 6 && (p)->fds_bits[6]) || \
>+        (howmany(FD_SETSIZE, NFDBITS) > 7 && (p)->fds_bits[7]))
>+
>+#define XFD_COPYSET(src,dst) { \
>+        int __i__; \
>+		for (__i__ = 0; __i__ < howmany(FD_SETSIZE, NFDBITS); __i__++) \
>+            (dst)->fds_bits[__i__] = (src)->fds_bits[__i__]; \
>+        }
>+#define XFD_ANDSET(dst,b1,b2) { \
>+        int __i__; \
>+        for (__i__ = 0; __i__ < howmany(FD_SETSIZE, NFDBITS); __i__++) \
>+            (dst)->fds_bits[__i__] = ((b1)->fds_bits[__i__] & (b2)->fds_bits[__i__]); \
>+        }
>+#define XFD_ORSET(dst,b1,b2) { \
>+        int __i__; \
>+        for (__i__ = 0; __i__ < howmany(FD_SETSIZE, NFDBITS); __i__++) \
>+		    (dst)->fds_bits[__i__] = ((b1)->fds_bits[__i__] | (b2)->fds_bits[__i__]); \
>+        }        
>+#define XFD_UNSET(dst,b1) { \
>+        int __i__; \
>+        for (__i__ = 0; __i__ < howmany(FD_SETSIZE, NFDBITS); __i__++) \
>+    		(dst)->fds_bits[__i__] &= ~((b1)->fds_bits[__i__]); \
>+        }
> 
> #else /* USE_POLL */
> #include <sys/poll.h>

Actions: View | Splinter Review

Attachments on bug 786: 400

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.