[asterisk-commits] tilghman: branch 1.6.2 r285930 - in /branches/1.6.2: ./ include/asterisk/ tests/

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Thu Sep 9 20:16:44 CDT 2010


Author: tilghman
Date: Thu Sep  9 20:16:32 2010
New Revision: 285930

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=285930
Log:
Merged revisions 285889 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r285889 | tilghman | 2010-09-09 19:13:45 -0500 (Thu, 09 Sep 2010) | 7 lines
  
  Fix Mac OS X build.
  
  This also fixes a rather grievous calculation error for the offset of
  ast_fdset, which was masked on Linux and FreeBSD, because these platforms
  check the first 256 FDs regardless of the bitmask setting (due to backwards
  compatibility).
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/configure
    branches/1.6.2/configure.ac
    branches/1.6.2/include/asterisk/autoconfig.h.in
    branches/1.6.2/include/asterisk/select.h
    branches/1.6.2/tests/test_poll.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: branches/1.6.2/configure.ac
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/configure.ac?view=diff&rev=285930&r1=285929&r2=285930
==============================================================================
--- branches/1.6.2/configure.ac (original)
+++ branches/1.6.2/configure.ac Thu Sep  9 20:16:32 2010
@@ -797,6 +797,25 @@
                 [AC_DEFINE_UNQUOTED([HAVE_OSX_ATOMICS], 1, [Define to 1 if OSX atomic operations are supported.])])
 
 AC_CHECK_SIZEOF(int)
+AC_CHECK_SIZEOF(long)
+AC_CHECK_SIZEOF(long long)
+AC_COMPUTE_INT([ac_cv_sizeof_fd_set_fds_bits], [sizeof(foo.fds_bits[[0]])], [$ac_includes_default
+fd_set foo;])
+# This doesn't actually work; what it does is to use the variable set in the
+# previous test as a cached value to set the right output variables.
+AC_CHECK_SIZEOF(fd_set.fds_bits)
+
+# Set a type compatible with the previous.  We cannot just use a generic type
+# for these bits, because on big-endian systems, the bits won't match up
+# correctly if the size is wrong.
+if test $ac_cv_sizeof_int = $ac_cv_sizeof_fd_set_fds_bits; then
+  AC_DEFINE([TYPEOF_FD_SET_FDS_BITS], [int], [Define to a type of the same size as fd_set.fds_bits[[0]]])
+else if test $ac_cv_sizeof_long = $ac_cv_sizeof_fd_set_fds_bits; then
+  AC_DEFINE([TYPEOF_FD_SET_FDS_BITS], [long], [Define to a type of the same size as fd_set.fds_bits[[0]]])
+else if test $ac_cv_sizeof_long_long = $ac_cv_sizeof_fd_set_fds_bits; then
+  AC_DEFINE([TYPEOF_FD_SET_FDS_BITS], [long long], [Define to a type of the same size as fd_set.fds_bits[[0]]])
+fi ; fi ; fi
+
 
 # do the package library checks now
 

Modified: branches/1.6.2/include/asterisk/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/include/asterisk/autoconfig.h.in?view=diff&rev=285930&r1=285929&r2=285930
==============================================================================
--- branches/1.6.2/include/asterisk/autoconfig.h.in (original)
+++ branches/1.6.2/include/asterisk/autoconfig.h.in Thu Sep  9 20:16:32 2010
@@ -965,8 +965,17 @@
    release 3. */
 #undef SETVBUF_REVERSED
 
+/* The size of `fd_set.fds_bits', as computed by sizeof. */
+#undef SIZEOF_FD_SET_FDS_BITS
+
 /* The size of `int', as computed by sizeof. */
 #undef SIZEOF_INT
+
+/* The size of `long', as computed by sizeof. */
+#undef SIZEOF_LONG
+
+/* The size of `long long', as computed by sizeof. */
+#undef SIZEOF_LONG_LONG
 
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
@@ -984,6 +993,9 @@
 
 /* Define to 1 if your <sys/time.h> declares `struct tm'. */
 #undef TM_IN_SYS_TIME
+
+/* Define to a type of the same size as fd_set.fds_bits[[0]] */
+#undef TYPEOF_FD_SET_FDS_BITS
 
 /* Define to 1 if on AIX 3.
    System headers sometimes define this.

Modified: branches/1.6.2/include/asterisk/select.h
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/include/asterisk/select.h?view=diff&rev=285930&r1=285929&r2=285930
==============================================================================
--- branches/1.6.2/include/asterisk/select.h (original)
+++ branches/1.6.2/include/asterisk/select.h Thu Sep  9 20:16:32 2010
@@ -23,6 +23,7 @@
 #ifndef __AST_SELECT_H
 #define __AST_SELECT_H
 
+#include "asterisk/autoconfig.h"
 #include <sys/select.h>
 #include <errno.h>
 #include "asterisk/utils.h"
@@ -37,24 +38,24 @@
 #define ast_fdset fd_set
 #else
 typedef struct {
-	long fds_bits[4096 / sizeof(long)]; /* 32768 bits */
+	TYPEOF_FD_SET_FDS_BITS fds_bits[4096 / SIZEOF_FD_SET_FDS_BITS]; /* 32768 bits */
 } ast_fdset;
 
 #undef FD_ZERO
 #define FD_ZERO(a) \
 	do { \
-		long *bytes = (long *) a; \
+		TYPEOF_FD_SET_FDS_BITS *bytes = (TYPEOF_FD_SET_FDS_BITS *) a; \
 		int i; \
-		for (i = 0; i < sizeof(*(a)) / sizeof(long); i++) { \
+		for (i = 0; i < sizeof(*(a)) / SIZEOF_FD_SET_FDS_BITS; i++) { \
 			bytes[i] = 0; \
 		} \
 	} while (0)
 #undef FD_SET
 #define FD_SET(fd, fds) \
 	do { \
-		long *bytes = (long *) fds; \
+		TYPEOF_FD_SET_FDS_BITS *bytes = (TYPEOF_FD_SET_FDS_BITS *) fds; \
 		if (fd / sizeof(*bytes) + ((fd + 1) % sizeof(*bytes) ? 1 : 0) < sizeof(*(fds))) { \
-			bytes[fd / (sizeof(*bytes))] |= 1L << (fd % sizeof(*bytes)); \
+			bytes[fd / (sizeof(*bytes) * 8)] |= ((TYPEOF_FD_SET_FDS_BITS) 1) << (fd % (sizeof(*bytes) * 8)); \
 		} else { \
 			ast_log(LOG_ERROR, "FD %d exceeds the maximum size of ast_fdset!\n", fd); \
 		} \

Modified: branches/1.6.2/tests/test_poll.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/tests/test_poll.c?view=diff&rev=285930&r1=285929&r2=285930
==============================================================================
--- branches/1.6.2/tests/test_poll.c (original)
+++ branches/1.6.2/tests/test_poll.c Thu Sep  9 20:16:32 2010
@@ -45,7 +45,6 @@
 #include "asterisk/test.h"
 #include "asterisk/poll-compat.h"
 
-#ifndef HAVE_SBIN_LAUNCHD
 static void *failsafe_cancel(void *vparent)
 {
 	pthread_t parent = (pthread_t) (long) vparent;
@@ -232,21 +231,16 @@
 #endif
 	return res;
 }
-#endif
 
 static int unload_module(void)
 {
-#ifndef HAVE_SBIN_LAUNCHD
 	AST_TEST_UNREGISTER(poll_test);
-#endif
 	return 0;
 }
 
 static int load_module(void)
 {
-#ifndef HAVE_SBIN_LAUNCHD
 	AST_TEST_REGISTER(poll_test);
-#endif
 	return AST_MODULE_LOAD_SUCCESS;
 }
 




More information about the asterisk-commits mailing list