September 2009 - libdispatch-changes

[26] trunk/src/Makefile.am
by source_changes＠macosforge.org 14 Sep '09

14 Sep '09

Revision: 26 http://trac.macosforge.org/projects/libdispatch/changeset/26 Author: robert(a)fledge.watson.org Date: 2009-09-14 11:31:33 -0700 (Mon, 14 Sep 2009) Log Message: ----------- Expand build path for libdispatch to include XNU and libc private headers on Mac OS X. Build Mach IPC headers/etc with MIG on Mac OS X. Modified Paths: -------------- trunk/src/Makefile.am Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2009-09-14 18:28:24 UTC (rev 25) +++ trunk/src/Makefile.am 2009-09-14 18:31:33 UTC (rev 26) @@ -16,6 +16,7 @@ time.c libdispatch_la_CFLAGS=-Wall -Werror +INCLUDES=@APPLE_LIBC_SOURCE_PATH@ @APPLE_XNU_SOURCE_PATH@ # # This will need some refinement: gcc requires a minimum of -march=i486 on @@ -34,6 +35,20 @@ libdispatch_la_LIBADD=-lpthread endif +if USE_MIG +libdispatch_la_SOURCES+= \ + protocolServer.c +BUILT_SOURCES= \ + protocol.h \ + protocolServer.c \ + protocolServer.h +CLEANFILES=$BUILT_SOURCES + +protocol.h protocolServer.h protocolServer.c: protocol.defs + $(MIG) -user /dev/null -header protocol.h -server protocolServer.c \ + -sheader protocolServer.h protocol.defs +endif + # # This hack is needed because the default include line from automake will add # -I. to compiler commands. That leads to the local semaphore.h overriding

1 0

[25] trunk/configure.ac
by source_changes＠macosforge.org 14 Sep '09

14 Sep '09

Revision: 25 http://trac.macosforge.org/projects/libdispatch/changeset/25 Author: robert(a)fledge.watson.org Date: 2009-09-14 11:28:24 -0700 (Mon, 14 Sep 2009) Log Message: ----------- Add private header checks for two XNU headers needed to build on Mac OS X. We have to expand the autoconf include path, not just the build-time one, for this to work. Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2009-09-14 16:32:24 UTC (rev 24) +++ trunk/configure.ac 2009-09-14 18:28:24 UTC (rev 25) @@ -16,7 +16,9 @@ AC_ARG_WITH([apple-libc-source], [AS_HELP_STRING([--with-apple-libc-source], [Specify path to Apple Libc source])], - [APPLE_LIBC_SOURCE_PATH=-I${withval}/pthreads], + [apple_libc_source_path=${withval}/pthreads + APPLE_LIBC_SOURCE_PATH=-I$apple_libc_source_path + CPPFLAGS="$CPPFLAGS -I$apple_libc_source_path"], [APPLE_LIBC_SOURCE_PATH=] ) AC_SUBST([APPLE_LIBC_SOURCE_PATH]) @@ -24,7 +26,9 @@ AC_ARG_WITH([apple-xnu-source], [AS_HELP_STRING([--with-apple-xnu-source], [Specify path to Apple XNU source])], - [APPLE_XNU_SOURCE_PATH=-I${withval}/libkern ], + [apple_xnu_source_path=${withval}/libkern + APPLE_XNU_SOURCE_PATH=-I$apple_xnu_source_path + CPPFLAGS="$CPPFLAGS -I$apple_xnu_source_path"], [APPLE_XNU_SOURCE_PATH=] ) AC_SUBST([APPLE_XNU_SOURCE_PATH]) @@ -118,7 +122,7 @@ # Checks for header files. # AC_HEADER_STDC -AC_CHECK_HEADERS([Availability.h pthread_np.h malloc/malloc.h]) +AC_CHECK_HEADERS([Availability.h pthread_machdep.h pthread_np.h malloc/malloc.h libkern/OSCrossEndian.h libkern/OSAtomic.h]) # # We use the availability of mach.h to decide whether to compile in all sorts

1 0

[24] trunk/configure.ac
by source_changes＠macosforge.org 14 Sep '09

14 Sep '09

Revision: 24 http://trac.macosforge.org/projects/libdispatch/changeset/24 Author: robert(a)fledge.watson.org Date: 2009-09-14 09:32:24 -0700 (Mon, 14 Sep 2009) Log Message: ----------- Add configure options to point the build at Apple libc and XNU source, required to find private headers on Mac OS X. Use AC_ARG_ENABLE instead of AC_ARG_WITH for functional frobs, such as legacy API, libdispatch_init constructor tagging, Apple-specific TSD and semaphore optimizations, as well as new settings such as the use of crashreporter_info. Locate MIG on Mac OS X, as we need it to build protocols.def. Use pthread_workqueue.h to decide whether to define HAVE_PTHREAD_WORKQUEUES. We may want to offer a --disable frob for this on Mac OS X. Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2009-09-14 11:49:45 UTC (rev 23) +++ trunk/configure.ac 2009-09-14 16:32:24 UTC (rev 24) @@ -10,15 +10,37 @@ AM_MAINTAINER_MODE # +# On Mac OS X, some required header files come from other source packages; +# allow specifying where those are. +# +AC_ARG_WITH([apple-libc-source], + [AS_HELP_STRING([--with-apple-libc-source], + [Specify path to Apple Libc source])], + [APPLE_LIBC_SOURCE_PATH=-I${withval}/pthreads], + [APPLE_LIBC_SOURCE_PATH=] +) +AC_SUBST([APPLE_LIBC_SOURCE_PATH]) + +AC_ARG_WITH([apple-xnu-source], + [AS_HELP_STRING([--with-apple-xnu-source], + [Specify path to Apple XNU source])], + [APPLE_XNU_SOURCE_PATH=-I${withval}/libkern ], + [APPLE_XNU_SOURCE_PATH=] +) +AC_SUBST([APPLE_XNU_SOURCE_PATH]) + +# # Try to build the legacy API only if specifically requested. # -AC_ARG_WITH([legacy-api], - [AS_HELP_STRING([--with-legacy-api], - [Support historic (deprecated) Apple API in libdispatch.]) - ],[],[ - use_legacy_api=false - AC_DEFINE(DISPATCH_NO_LEGACY,,Define to compile out legacy API) - ]) +AC_ARG_ENABLE([legacy-api], + [AS_HELP_STRING([--enable-legacy-api], [Enable legacy (deprecated) API.])] +) + +AS_IF([test "x$enable_legacy_api" != "xyes"], + [use_legacy_api=false + AC_DEFINE(DISPATCH_NO_LEGACY,,[Define to compile out legacy API])], + [use_legacy_api=true] +) AM_CONDITIONAL(USE_LEGACY_API, $use_legacy_api) # @@ -26,36 +48,59 @@ # libsyscall process setup. On other systems, it is tagged as a library # constructor to be run by automatically by the runtime linker. # -AC_ARG_WITH([libdispatch-init-constructor], - [AS_HELP_STRING([--without-libdispatch-init-constructor], - [Don't tag libdispatch_init as a constructor]) - ],[],[ - AC_DEFINE(USE_LIBDISPATCH_INIT_CONSTRUCTOR,,Define to tag libdispatch_init as a constructor) - ]) +AC_ARG_ENABLE([libdispatch-init-constructor], + [AS_HELP_STRING([--disable-libdispatch-init-constructor], + [Disable libdispatch_init as a constructor])] +) +AS_IF([test "x$enable_libdispatch_init_constructor" != "xno"], + [AC_DEFINE(USE_LIBDISPATCH_INIT_CONSTRUCTOR,, + [Define to tag libdispatch_init as a constructor])] +) + # -# libdispatch has micro-optimized and deeply personal knowledge of the Mac OS +# Whether or not to include/reference a crashreporter symbol. +# +AC_ARG_ENABLE([apple-crashreporter-info], + [AS_HELP_STRING([--enable-apple-crashreporter-info], + [Use Mac OS X crashreporter info])] +) + +AS_IF([test "x$enable_apple_crashreporter_info" = "xyes"], + [AC_DEFINE(USE_APPLE_CRASHREPORTER_INFO,, + [Define to use Mac OS X crashreporter info])] +) + +# +# libdispatch has micro-optimized and deeply personal knowledge of Mac OS # implementation details. Only enable this if explicitly requested, as it # will lead to data corruption if applied on systems violating its # expectations. # -AC_ARG_WITH([apple-tsd-optimizations], - [AS_HELP_STRING([--with-apple-tsd-optimizations], - [Use less portable pthread TSD optimizations for Mac OS X.]) - ],[ - AC_DEFINE(USE_APPLE_TSD_OPTIMIZATIONS,,Define to compile in tsd optimizations) - ],[]) +AC_ARG_ENABLE([apple-tsd-optimizations], + [AS_HELP_STRING([--enable-apple-tsd-optimizations], + [Use non-portable pthread TSD optimizations for Mac OS X.])] +) -AC_ARG_WITH([apple-semaphore-optimizations], - [AS_HELP_STRING([--with-apple-semaphore-optimizations], - [Use less portable semaphore optimizations for Mac OS X.]) - ],[ - AC_DEFINE(USE_APPLE_SEMAPHORE_OPTIMIZATIONS,,Define to compile in semaphore optimizations) - ],[]) +AS_IF([test "x$enable_apple_tsd_optimizations" = "xyes"], + [AC_DEFINE(USE_APPLE_TSD_OPTIMIZATIONS,, + [Define to use non-portable pthread TSD optimizations for Mac OS X)])] +) +AC_ARG_ENABLE([apple-semaphore-optimizations], + [AS_HELP_STRING([--enable-apple-semaphore-optimizations], + [Use non-portable semaphore optimizations for Mac OS X.])] +) + +AS_IF([test "x$enable_apple_semaphore_optimizations" = "xyes"], + [AC_DEFINE(USE_APPLE_SEMAPHORE_OPTIMIZATIONS,, + [Define to use non-portablesemaphore optimizations for Mac OS X])] +) + AC_PROG_CC AC_PROG_INSTALL AC_PROG_LIBTOOL +AC_PATH_PROGS(MIG, mig) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) @@ -63,11 +108,9 @@ # Find libraries we will need # AC_SEARCH_LIBS(clock_gettime, rt) -AC_SEARCH_LIBS(pthread_create, pthread, [ - use_libpthread=true - ],[ - use_libpthread=false - ] +AC_SEARCH_LIBS(pthread_create, pthread, + [use_libpthread=true], + [use_libpthread=false] ) AM_CONDITIONAL(USE_LIBPTHREAD, $use_libpthread) @@ -75,23 +118,34 @@ # Checks for header files. # AC_HEADER_STDC -AC_CHECK_HEADERS([Availability.h pthread_np.h pthread_workqueue.h malloc/malloc.h]) +AC_CHECK_HEADERS([Availability.h pthread_np.h malloc/malloc.h]) # # We use the availability of mach.h to decide whether to compile in all sorts # of Machisms, including using Mach ports as event sources, etc. # -AC_CHECK_HEADER([mach/mach.h],[ - AC_DEFINE(HAVE_MACH,,Define if mach is present) -]) +AC_CHECK_HEADER([mach/mach.h], + [AC_DEFINE(HAVE_MACH,,Define if mach is present) + use_mig=true], + [use_mig=false] +) +AM_CONDITIONAL(USE_MIG, $use_mig) # +# We use the availability of pthread_workqueue.h to decide whether to compile +# in support for pthread work queues. +# +AC_CHECK_HEADER([pthread_workqueue.h], + [AC_DEFINE(HAVE_PTHREAD_WORKQUEUES,,Define if pthread work queues are present)] +) + +# # Find functions and declarations we care about. # AC_CHECK_DECLS([EVFILT_SESSION, NOTE_NONE, NOTE_REAP, NOTE_SIGNAL], [], [], [[#include <sys/event.h>]]) AC_CHECK_DECLS([VQ_UPDATE, VQ_VERYLOWDISK], [], [], [[#include <sys/mount.h>]]) -AC_CHECK_FUNCS([pthread_key_init_np mach_absolute_time pthread_workqueue_attr_init_np malloc_create_zone sem_init]) +AC_CHECK_FUNCS([pthread_key_init_np mach_absolute_time malloc_create_zone sem_init]) # # Generate Makefiles.

1 0

[23] trunk/configure.ac
by source_changes＠macosforge.org 14 Sep '09

14 Sep '09

Revision: 23 http://trac.macosforge.org/projects/libdispatch/changeset/23 Author: robert(a)fledge.watson.org Date: 2009-09-14 04:49:45 -0700 (Mon, 14 Sep 2009) Log Message: ----------- Check for pthread_workqueue.h. Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2009-09-14 11:26:18 UTC (rev 22) +++ trunk/configure.ac 2009-09-14 11:49:45 UTC (rev 23) @@ -75,7 +75,7 @@ # Checks for header files. # AC_HEADER_STDC -AC_CHECK_HEADERS([Availability.h pthread_np.h malloc/malloc.h]) +AC_CHECK_HEADERS([Availability.h pthread_np.h pthread_workqueue.h malloc/malloc.h]) # # We use the availability of mach.h to decide whether to compile in all sorts

1 0

[22] trunk/configure.ac
by source_changes＠macosforge.org 14 Sep '09

14 Sep '09

Revision: 22 http://trac.macosforge.org/projects/libdispatch/changeset/22 Author: robert(a)fledge.watson.org Date: 2009-09-14 04:26:18 -0700 (Mon, 14 Sep 2009) Log Message: ----------- Prefer more compact AC_CHECK_FUNCS and AC_CHECK_DECLS to test for various OS features. Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2009-09-14 11:02:23 UTC (rev 21) +++ trunk/configure.ac 2009-09-14 11:26:18 UTC (rev 22) @@ -88,39 +88,10 @@ # # Find functions and declarations we care about. # -AC_CHECK_DECL([EVFILT_SESSION],[ - AC_DEFINE(HAVE_EVFILT_SESSION,,Define if EVFILT_SESSION present) -]) -AC_CHECK_DECL([NOTE_NONE],[ - AC_DEFINE(HAVE_NOTE_NONE,,Define if NOTE_NONE present) -]) -AC_CHECK_DECL([NOTE_REAP],[ - AC_DEFINE(HAVE_NOTE_REAP,,Define if NOTE_REAP present) -]) -AC_CHECK_DECL([NOTE_SIGNAL],[ - AC_DEFINE(HAVE_NOTE_SIGNAL,,Define if NOTE_SIGNAL present) -]) -AC_CHECK_DECL([VQ_UPDATE],[ - AC_DEFINE(HAVE_VQ_UPDATE,,Define if VQ_UPDATE present) -]) -AC_CHECK_DECL([VQ_VERYLOWDISK],[ - AC_DEFINE(HAVE_VQ_VERYLOWDISKL,,Define if VQ_VERYLOWDISK present) -]) -AC_CHECK_FUNC([pthread_key_init_np],[ - AC_DEFINE(HAVE_PTHREAD_KEY_INIT_NP,,Define if can use preinitialized keys) -]) -AC_CHECK_FUNC([mach_absolute_time],[ - AC_DEFINE(HAVE_MACH_ABSOLUTE_TIME,,Define if mach_absolute_time present) -]) -AC_CHECK_FUNC([pthread_workqueue_attr_init_np],[ - AC_DEFINE(HAVE_PTHREAD_WORKQUEUE,,Define if pthread workqueues implemented) -]) -AC_CHECK_FUNC([malloc_create_zone],[ - AC_DEFINE(HAVE_MALLOC_ZONES,,Define if malloc zones implemented) -]) -AC_CHECK_FUNC([sem_init],[ - AC_DEFINE(HAVE_POSIX_SEM,,Define if POSIX semaphores implemented) -]) +AC_CHECK_DECLS([EVFILT_SESSION, NOTE_NONE, NOTE_REAP, NOTE_SIGNAL], [], [], + [[#include <sys/event.h>]]) +AC_CHECK_DECLS([VQ_UPDATE, VQ_VERYLOWDISK], [], [], [[#include <sys/mount.h>]]) +AC_CHECK_FUNCS([pthread_key_init_np mach_absolute_time pthread_workqueue_attr_init_np malloc_create_zone sem_init]) # # Generate Makefiles.

1 0

[21] trunk/configure.ac
by source_changes＠macosforge.org 14 Sep '09

14 Sep '09

Revision: 21 http://trac.macosforge.org/projects/libdispatch/changeset/21 Author: robert(a)fledge.watson.org Date: 2009-09-14 04:02:23 -0700 (Mon, 14 Sep 2009) Log Message: ----------- Different /bin/sh have varying tolerance for empty clauses in configure; modify configure.ac to prevent empty clauses from being generated. Reported by: Peter O'Gorman Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2009-09-13 17:08:49 UTC (rev 20) +++ trunk/configure.ac 2009-09-14 11:02:23 UTC (rev 21) @@ -18,8 +18,7 @@ ],[],[ use_legacy_api=false AC_DEFINE(DISPATCH_NO_LEGACY,,Define to compile out legacy API) - ] -) + ]) AM_CONDITIONAL(USE_LEGACY_API, $use_legacy_api) # @@ -32,8 +31,7 @@ [Don't tag libdispatch_init as a constructor]) ],[],[ AC_DEFINE(USE_LIBDISPATCH_INIT_CONSTRUCTOR,,Define to tag libdispatch_init as a constructor) - ] -) + ]) # # libdispatch has micro-optimized and deeply personal knowledge of the Mac OS @@ -46,16 +44,14 @@ [Use less portable pthread TSD optimizations for Mac OS X.]) ],[ AC_DEFINE(USE_APPLE_TSD_OPTIMIZATIONS,,Define to compile in tsd optimizations) - ],[] -) + ],[]) AC_ARG_WITH([apple-semaphore-optimizations], [AS_HELP_STRING([--with-apple-semaphore-optimizations], [Use less portable semaphore optimizations for Mac OS X.]) ],[ AC_DEFINE(USE_APPLE_SEMAPHORE_OPTIMIZATIONS,,Define to compile in semaphore optimizations) - ],[] -) + ],[]) AC_PROG_CC AC_PROG_INSTALL

1 0

[20] trunk/configure.ac
by source_changes＠macosforge.org 13 Sep '09

13 Sep '09

Revision: 20 http://trac.macosforge.org/projects/libdispatch/changeset/20 Author: robert(a)fledge.watson.org Date: 2009-09-13 10:08:49 -0700 (Sun, 13 Sep 2009) Log Message: ----------- Add --without-libdispatch-init-constructor in order to disable tagging of libdispatch_init as a constructor. On most systems, it is required, but for the Mac OS X libSystem, the init routine is run during process startup by libsyscall. While it's unlikely users will want to configure this with the autoconf build, the Mac OS X build will want to set this generated variable in the hard-coded config.h for Xcode. Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2009-09-13 12:25:58 UTC (rev 19) +++ trunk/configure.ac 2009-09-13 17:08:49 UTC (rev 20) @@ -23,6 +23,19 @@ AM_CONDITIONAL(USE_LEGACY_API, $use_legacy_api) # +# On Mac OS X Snow Leopard, libpispatch_init is automatically invoked during +# libsyscall process setup. On other systems, it is tagged as a library +# constructor to be run by automatically by the runtime linker. +# +AC_ARG_WITH([libdispatch-init-constructor], + [AS_HELP_STRING([--without-libdispatch-init-constructor], + [Don't tag libdispatch_init as a constructor]) + ],[],[ + AC_DEFINE(USE_LIBDISPATCH_INIT_CONSTRUCTOR,,Define to tag libdispatch_init as a constructor) + ] +) + +# # libdispatch has micro-optimized and deeply personal knowledge of the Mac OS # implementation details. Only enable this if explicitly requested, as it # will lead to data corruption if applied on systems violating its

1 0

[19] trunk/configure.ac
by source_changes＠macosforge.org 13 Sep '09

13 Sep '09

Revision: 19 http://trac.macosforge.org/projects/libdispatch/changeset/19 Author: robert(a)fledge.watson.org Date: 2009-09-13 05:25:58 -0700 (Sun, 13 Sep 2009) Log Message: ----------- Detect VQ_UPDATE and VQ_VERYLOWDISK with configure; these are not defined on FreeBSD. Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2009-09-13 12:08:13 UTC (rev 18) +++ trunk/configure.ac 2009-09-13 12:25:58 UTC (rev 19) @@ -91,6 +91,12 @@ AC_CHECK_DECL([NOTE_SIGNAL],[ AC_DEFINE(HAVE_NOTE_SIGNAL,,Define if NOTE_SIGNAL present) ]) +AC_CHECK_DECL([VQ_UPDATE],[ + AC_DEFINE(HAVE_VQ_UPDATE,,Define if VQ_UPDATE present) +]) +AC_CHECK_DECL([VQ_VERYLOWDISK],[ + AC_DEFINE(HAVE_VQ_VERYLOWDISKL,,Define if VQ_VERYLOWDISK present) +]) AC_CHECK_FUNC([pthread_key_init_np],[ AC_DEFINE(HAVE_PTHREAD_KEY_INIT_NP,,Define if can use preinitialized keys) ])

1 0

[18] trunk/configure.ac
by source_changes＠macosforge.org 13 Sep '09

13 Sep '09

Revision: 18 http://trac.macosforge.org/projects/libdispatch/changeset/18 Author: robert(a)fledge.watson.org Date: 2009-09-13 05:08:13 -0700 (Sun, 13 Sep 2009) Log Message: ----------- Check for non-portable kqueue extensions in configure: EVFILT_SESSION, NOTE_NONE, NOTE_REAP, NOTE_SIGNAL. Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2009-09-13 11:50:44 UTC (rev 17) +++ trunk/configure.ac 2009-09-13 12:08:13 UTC (rev 18) @@ -77,8 +77,20 @@ ]) # -# Find functions we care about. +# Find functions and declarations we care about. # +AC_CHECK_DECL([EVFILT_SESSION],[ + AC_DEFINE(HAVE_EVFILT_SESSION,,Define if EVFILT_SESSION present) +]) +AC_CHECK_DECL([NOTE_NONE],[ + AC_DEFINE(HAVE_NOTE_NONE,,Define if NOTE_NONE present) +]) +AC_CHECK_DECL([NOTE_REAP],[ + AC_DEFINE(HAVE_NOTE_REAP,,Define if NOTE_REAP present) +]) +AC_CHECK_DECL([NOTE_SIGNAL],[ + AC_DEFINE(HAVE_NOTE_SIGNAL,,Define if NOTE_SIGNAL present) +]) AC_CHECK_FUNC([pthread_key_init_np],[ AC_DEFINE(HAVE_PTHREAD_KEY_INIT_NP,,Define if can use preinitialized keys) ])

1 0

[17] trunk/configure.ac
by source_changes＠macosforge.org 13 Sep '09

13 Sep '09

Revision: 17 http://trac.macosforge.org/projects/libdispatch/changeset/17 Author: robert(a)fledge.watson.org Date: 2009-09-13 04:50:44 -0700 (Sun, 13 Sep 2009) Log Message: ----------- Use libdispatch(a)macosforge.org as the autoconf package contact information. Suggested by: Jordan Hubbard Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2009-09-12 23:27:31 UTC (rev 16) +++ trunk/configure.ac 2009-09-13 11:50:44 UTC (rev 17) @@ -3,8 +3,7 @@ # AC_PREREQ(2.59) -AC_INIT([libdispatch], [1.0], [libdispatch-dev(a)lists.macosforge.org] - [libdispatch]) +AC_INIT([libdispatch], [1.0], [libdispatch(a)macosforge.org] [libdispatch]) AC_REVISION([$$]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h])

1 0