November 2009 - libdispatch-changes

[131] trunk
by source_changes＠macosforge.org 04 Nov '09

04 Nov '09

Revision: 131 http://trac.macosforge.org/projects/libdispatch/changeset/131 Author: robert(a)fledge.watson.org Date: 2009-11-04 13:15:54 -0800 (Wed, 04 Nov 2009) Log Message: ----------- Fixes for POSIX semaphores: POSIX semaphores take an absolute, CLOCK_REALTIME-based timespec as their timeout argument, not a relative timestamp. When using POSIX semaphores, we now keep all absolute timestamps in CLOCK_REALTIME, and for now, are unable to use POSIX semaphores while using Mach timekeeping. Add a missing DISPATCH_SEMAPHORE_VERIFY_RET() when calling sem_post(). #error out if we try to use POSIX semaphores with mach_absolute_time() for now. Modified Paths: -------------- trunk/configure.ac trunk/src/internal.h trunk/src/semaphore.c trunk/src/shims/time.h trunk/src/time.c Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2009-11-04 20:31:55 UTC (rev 130) +++ trunk/configure.ac 2009-11-04 21:15:54 UTC (rev 131) @@ -177,8 +177,7 @@ # # Find functions and declarations we care about. # -AC_CHECK_DECLS([CLOCK_UPTIME, CLOCK_MONOTONIC], [], [], - [[#include <time.h>]]) +AC_CHECK_DECLS([CLOCK_REALTIME], [], [], [[#include <time.h>]]) AC_CHECK_DECLS([EVFILT_SESSION, NOTE_NONE, NOTE_REAP, NOTE_SIGNAL], [], [], [[#include <sys/event.h>]]) AC_CHECK_DECLS([FD_COPY], [], [], [[#include <sys/select.h>]]) Modified: trunk/src/internal.h =================================================================== --- trunk/src/internal.h 2009-11-04 20:31:55 UTC (rev 130) +++ trunk/src/internal.h 2009-11-04 21:15:54 UTC (rev 131) @@ -254,6 +254,9 @@ bool _dispatch_source_testcancel(dispatch_source_t); uint64_t _dispatch_timeout(dispatch_time_t when); +#if USE_POSIX_SEM +struct timespec _dispatch_timeout_ts(dispatch_time_t when); +#endif __private_extern__ bool _dispatch_safe_fork; Modified: trunk/src/semaphore.c =================================================================== --- trunk/src/semaphore.c 2009-11-04 20:31:55 UTC (rev 130) +++ trunk/src/semaphore.c 2009-11-04 21:15:54 UTC (rev 131) @@ -203,11 +203,7 @@ #endif #if USE_POSIX_SEM do { - nsec = _dispatch_timeout(timeout); - _timeout.tv_sec = (typeof(_timeout.tv_sec)) - (nsec / NSEC_PER_SEC); - _timeout.tv_nsec = (typeof(_timeout.tv_nsec)) - (nsec % NSEC_PER_SEC); + _timeout = _dispatch_timeout_ts(timeout); ret = slowpath(sem_timedwait(&dsema->dsema_sem, &_timeout)); } while (ret == -1 && errno == EINTR); @@ -339,6 +335,7 @@ #endif #if USE_POSIX_SEM ret = sem_post(&dsema->dsema_sem); + DISPATCH_SEMAPHORE_VERIFY_RET(ret); #endif _dispatch_release(dsema); @@ -493,11 +490,7 @@ #endif #if USE_POSIX_SEM do { - nsec = _dispatch_timeout(timeout); - _timeout.tv_sec = (typeof(_timeout.tv_sec)) - (nsec / NSEC_PER_SEC); - _timeout.tv_nsec = (typeof(_timeout.tv_nsec)) - (nsec % NSEC_PER_SEC); + _timeout = _dispatch_timeout_ts(timeout); ret = slowpath(sem_timedwait(&dsema->dsema_sem, &_timeout)); } while (ret == -1 && errno == EINTR); Modified: trunk/src/shims/time.h =================================================================== --- trunk/src/shims/time.h 2009-11-04 20:31:55 UTC (rev 130) +++ trunk/src/shims/time.h 2009-11-04 21:15:54 UTC (rev 131) @@ -43,13 +43,7 @@ struct timespec ts; int ret; -#if HAVE_DECL_CLOCK_UPTIME - ret = clock_gettime(CLOCK_UPTIME, &ts); -#elif HAVE_DECL_CLOCK_MONOTONIC - ret = clock_gettime(CLOCK_MONOTONIC, &ts); -#else -#error "clock_gettime: no supported absolute time clock" -#endif + ret = clock_gettime(CLOCK_REALTIME, &ts); (void)dispatch_assume_zero(ret); /* XXXRW: Some kind of overflow detection needed? */ Modified: trunk/src/time.c =================================================================== --- trunk/src/time.c 2009-11-04 20:31:55 UTC (rev 130) +++ trunk/src/time.c 2009-11-04 21:15:54 UTC (rev 131) @@ -182,3 +182,46 @@ now = _dispatch_absolute_time(); return now >= when ? 0 : _dispatch_time_mach2nano(when - now); } + +#if USE_POSIX_SEM +#ifdef HAVE_MACH_ABSOLUTE_TIME +#error "Cannot currently use USE_POSIX_SEM and HAVE_MACH_ABSOLUTE_TIME together" +#endif +/* + * Unlike Mach semaphores, POSIX semaphores take an absolute, real time as an + * argument to sem_timedwait(). This routine converts from dispatch_time_t + * but assumes the caller has already handled the possibility of + * DISPATCH_TIME_FOREVER. + * + * XXXRW: Does not currently with with mach_absolute_time()/ + */ +struct timespec +_dispatch_timeout_ts(dispatch_time_t when) +{ + struct timespec ts; + int ret; + + if (when == 0) { + when = _dispatch_absolute_time(); + ts.tv_sec = when / NSEC_PER_SEC; + ts.tv_nsec = when % NSEC_PER_SEC; + return (ts); + } + if ((int64_t)when < 0) { + when = -(int64_t)when + _dispatch_absolute_time(); + ts.tv_sec = when / NSEC_PER_SEC; + ts.tv_nsec = when % NSEC_PER_SEC; + return (ts); + } + + /* + * XXXRW: This code assumes that dispatch_time_t absolute times are + * with respect to CLOCK_REALTIME. If we want to support + * USE_POSIX_SEM with mach_absolute_time(), a conversion is required + * here. + */ + ts.tv_sec = when / NSEC_PER_SEC; + ts.tv_nsec = when % NSEC_PER_SEC; + return (ts); +} +#endif

1 0

[130] trunk/src/shims
by source_changes＠macosforge.org 04 Nov '09

04 Nov '09

Revision: 130 http://trac.macosforge.org/projects/libdispatch/changeset/130 Author: robert(a)fledge.watson.org Date: 2009-11-04 12:31:55 -0800 (Wed, 04 Nov 2009) Log Message: ----------- Remove duplicated header content that resulted from a misapplied patch, clean up header guards. Modified Paths: -------------- trunk/src/shims/perfmon.h trunk/src/shims/time.c trunk/src/shims/time.h trunk/src/shims/tsd.h Modified: trunk/src/shims/perfmon.h =================================================================== --- trunk/src/shims/perfmon.h 2009-11-04 19:28:06 UTC (rev 129) +++ trunk/src/shims/perfmon.h 2009-11-04 20:31:55 UTC (rev 130) @@ -87,94 +87,4 @@ #define _dispatch_workitem_dec() #endif // DISPATCH_PERF_MON -#endif -/* - * Copyright (c) 2008-2009 Apple Inc. All rights reserved. - * - * @APPLE_APACHE_LICENSE_HEADER_START@ - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @APPLE_APACHE_LICENSE_HEADER_END@ - */ - -/* - * IMPORTANT: This header file describes INTERNAL interfaces to libdispatch - * which are subject to change in future releases of Mac OS X. Any applications - * relying on these interfaces WILL break. - */ - -#ifndef __DISPATCH_SHIMS_PERFMON__ -#define __DISPATCH_SHIMS_PERFMON__ - -#if DISPATCH_PERF_MON - -#if defined (USE_APPLE_TSD_OPTIMIZATIONS) && defined(SIMULATE_5491082) && (defined(__i386__) || defined(__x86_64__)) -#ifdef __LP64__ -#define _dispatch_workitem_inc() asm("incq %%gs:%0" : "+m" \ - (*(void **)(dispatch_bcounter_key * sizeof(void *) + _PTHREAD_TSD_OFFSET)) :: "cc") -#define _dispatch_workitem_dec() asm("decq %%gs:%0" : "+m" \ - (*(void **)(dispatch_bcounter_key * sizeof(void *) + _PTHREAD_TSD_OFFSET)) :: "cc") -#else -#define _dispatch_workitem_inc() asm("incl %%gs:%0" : "+m" \ - (*(void **)(dispatch_bcounter_key * sizeof(void *) + _PTHREAD_TSD_OFFSET)) :: "cc") -#define _dispatch_workitem_dec() asm("decl %%gs:%0" : "+m" \ - (*(void **)(dispatch_bcounter_key * sizeof(void *) + _PTHREAD_TSD_OFFSET)) :: "cc") -#endif -#else /* !USE_APPLE_TSD_OPTIMIZATIONS */ -static inline void -_dispatch_workitem_inc(void) -{ - unsigned long cnt = (unsigned long)_dispatch_thread_getspecific(dispatch_bcounter_key); - _dispatch_thread_setspecific(dispatch_bcounter_key, (void *)++cnt); -} -static inline void -_dispatch_workitem_dec(void) -{ - unsigned long cnt = (unsigned long)_dispatch_thread_getspecific(dispatch_bcounter_key); - _dispatch_thread_setspecific(dispatch_bcounter_key, (void *)--cnt); -} -#endif /* USE_APPLE_TSD_OPTIMIZATIONS */ - -// C99 doesn't define flsll() or ffsll() -#ifdef __LP64__ -#define flsll(x) flsl(x) -#else -static inline unsigned int -flsll(uint64_t val) -{ - union { - struct { -#ifdef __BIG_ENDIAN__ - unsigned int hi, low; -#else - unsigned int low, hi; -#endif - } words; - uint64_t word; - } _bucket = { - .word = val, - }; - if (_bucket.words.hi) { - return fls(_bucket.words.hi) + 32; - } - return fls(_bucket.words.low); -} -#endif - -#else -#define _dispatch_workitem_inc() -#define _dispatch_workitem_dec() -#endif // DISPATCH_PERF_MON - -#endif +#endif /* __DISPATCH_SHIMS_PERFMON__ */ Modified: trunk/src/shims/time.c =================================================================== --- trunk/src/shims/time.c 2009-11-04 19:28:06 UTC (rev 129) +++ trunk/src/shims/time.c 2009-11-04 20:31:55 UTC (rev 130) @@ -65,4 +65,3 @@ return tmp; } #endif - Modified: trunk/src/shims/time.h =================================================================== --- trunk/src/shims/time.h 2009-11-04 19:28:06 UTC (rev 129) +++ trunk/src/shims/time.h 2009-11-04 20:31:55 UTC (rev 130) @@ -59,57 +59,4 @@ #endif } -#endif -/* - * Copyright (c) 2008-2009 Apple Inc. All rights reserved. - * - * @APPLE_APACHE_LICENSE_HEADER_START@ - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * @APPLE_APACHE_LICENSE_HEADER_END@ - */ - -/* - * IMPORTANT: This header file describes INTERNAL interfaces to libdispatch - * which are subject to change in future releases of Mac OS X. Any applications - * relying on these interfaces WILL break. - */ - -#ifndef __DISPATCH_SHIMS_TIME__ -#define __DISPATCH_SHIMS_TIME__ - -static inline uint64_t -_dispatch_absolute_time(void) -{ -#ifndef HAVE_MACH_ABSOLUTE_TIME - struct timespec ts; - int ret; - -#if HAVE_DECL_CLOCK_UPTIME - ret = clock_gettime(CLOCK_UPTIME, &ts); -#elif HAVE_DECL_CLOCK_MONOTONIC - ret = clock_gettime(CLOCK_MONOTONIC, &ts); -#else -#error "clock_gettime: no supported absolute time clock" -#endif - dispatch_assume_zero(ret); - - /* XXXRW: Some kind of overflow detection needed? */ - return (ts.tv_sec * NSEC_PER_SEC + ts.tv_nsec); -#else - return mach_absolute_time(); -#endif -} - -#endif +#endif /* __DISPATCH_SHIMS_TIME__ */ Modified: trunk/src/shims/tsd.h =================================================================== --- trunk/src/shims/tsd.h 2009-11-04 19:28:06 UTC (rev 129) +++ trunk/src/shims/tsd.h 2009-11-04 20:31:55 UTC (rev 130) @@ -117,4 +117,4 @@ #define _dispatch_thread_self pthread_self -#endif +#endif /* __DISPATCH_SHIMS_TSD__ */

1 0

[129] trunk/src/source.c
by source_changes＠macosforge.org 04 Nov '09

04 Nov '09

Revision: 129 http://trac.macosforge.org/projects/libdispatch/changeset/129 Author: dsteffen(a)apple.com Date: 2009-11-04 11:28:06 -0800 (Wed, 04 Nov 2009) Log Message: ----------- remove usage of legacy dispatch API from non-legacy code Modified Paths: -------------- trunk/src/source.c Modified: trunk/src/source.c =================================================================== --- trunk/src/source.c 2009-11-04 18:37:02 UTC (rev 128) +++ trunk/src/source.c 2009-11-04 19:28:06 UTC (rev 129) @@ -1839,20 +1839,26 @@ #endif /* DISPATCH_NO_LEGACY */ static void -_dispatch_mach_notify_source_init(void *context __attribute__((unused))) +_dispatch_mach_notify_source2(void *context) { - size_t maxsz = sizeof(union __RequestUnion___dispatch_send_libdispatch_internal_protocol_subsystem); + dispatch_source_t ds = context; + const size_t maxsz = MAX( + sizeof(union __RequestUnion___dispatch_send_libdispatch_internal_protocol_subsystem), + sizeof(union __ReplyUnion___dispatch_libdispatch_internal_protocol_subsystem)); - if (sizeof(union __ReplyUnion___dispatch_libdispatch_internal_protocol_subsystem) > maxsz) { - maxsz = sizeof(union __ReplyUnion___dispatch_libdispatch_internal_protocol_subsystem); - } + dispatch_mig_server(ds, maxsz, libdispatch_internal_protocol_server); +} +static void +_dispatch_mach_notify_source_init(void *context __attribute__((unused))) +{ _dispatch_get_port_set(); - _dispatch_mach_notify_source = dispatch_source_mig_create(_dispatch_event_port, - maxsz, NULL, &_dispatch_mgr_q, libdispatch_internal_protocol_server); - + _dispatch_mach_notify_source = dispatch_source_create(DISPATCH_SOURCE_TYPE_MACH_RECV, _dispatch_event_port, 0, &_dispatch_mgr_q); dispatch_assert(_dispatch_mach_notify_source); + dispatch_set_context(_dispatch_mach_notify_source, _dispatch_mach_notify_source); + dispatch_source_set_event_handler_f(_dispatch_mach_notify_source, _dispatch_mach_notify_source2); + dispatch_resume(_dispatch_mach_notify_source); } kern_return_t

1 0

[128] trunk/src/semaphore.c
by source_changes＠macosforge.org 04 Nov '09

04 Nov '09

Revision: 128 http://trac.macosforge.org/projects/libdispatch/changeset/128 Author: robert(a)fledge.watson.org Date: 2009-11-04 10:37:02 -0800 (Wed, 04 Nov 2009) Log Message: ----------- Directly test value of USE_APPLE_SEMAPHORE_OPTIMIZATIONS rather than testing whether it's defined. Modified Paths: -------------- trunk/src/semaphore.c Modified: trunk/src/semaphore.c =================================================================== --- trunk/src/semaphore.c 2009-11-04 16:04:51 UTC (rev 127) +++ trunk/src/semaphore.c 2009-11-04 18:37:02 UTC (rev 128) @@ -256,7 +256,7 @@ dispatch_group_enter(dispatch_group_t dg) { dispatch_semaphore_t dsema = (dispatch_semaphore_t)dg; -#if defined(USE_APPLE_SEMAPHORE_OPTIMIZATIONS) && defined(__OPTIMIZE__) && defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__)) && !defined(__llvm__) +#if USE_APPLE_SEMAPHORE_OPTIMIZATIONS && defined(__OPTIMIZE__) && defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__)) && !defined(__llvm__) // This assumes: // 1) Way too much about the optimizer of GCC. // 2) There will never be more than LONG_MAX threads. @@ -284,7 +284,7 @@ long dispatch_semaphore_wait(dispatch_semaphore_t dsema, dispatch_time_t timeout) { -#if defined(USE_APPLE_SEMAPHORE_OPTIMIZATIONS) && defined(__OPTIMIZE__) && defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__)) && !defined(__llvm__) +#if USE_APPLE_SEMAPHORE_OPTIMIZATIONS && defined(__OPTIMIZE__) && defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__)) && !defined(__llvm__) // This assumes: // 1) Way too much about the optimizer of GCC. // 2) There will never be more than LONG_MAX threads. @@ -362,7 +362,7 @@ long dispatch_semaphore_signal(dispatch_semaphore_t dsema) { -#if defined(USE_APPLE_SEMAPHORE_OPTIMIZATIONS) && defined(__OPTIMIZE__) && defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__)) && !defined(__llvm__) +#if USE_APPLE_SEMAPHORE_OPTIMIZATIONS && defined(__OPTIMIZE__) && defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__)) && !defined(__llvm__) // overflow detection // this assumes way too much about the optimizer of GCC asm(

1 0

[127] trunk
by source_changes＠macosforge.org 04 Nov '09

04 Nov '09

Revision: 127 http://trac.macosforge.org/projects/libdispatch/changeset/127 Author: robert(a)fledge.watson.org Date: 2009-11-04 08:04:51 -0800 (Wed, 04 Nov 2009) Log Message: ----------- Separately detect C++ blocks support from C blocks support, and compile the dispatch_plusplus regression test only if C++ supports blocks. Modified Paths: -------------- trunk/configure.ac trunk/m4/blocks.m4 trunk/testing/Makefile.am Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2009-11-04 12:00:04 UTC (rev 126) +++ trunk/configure.ac 2009-11-04 16:04:51 UTC (rev 127) @@ -111,6 +111,7 @@ ) AC_PROG_CC +AC_PROG_CXX AC_PROG_INSTALL AC_PROG_LIBTOOL AC_PATH_PROGS(MIG, mig) Modified: trunk/m4/blocks.m4 =================================================================== --- trunk/m4/blocks.m4 2009-11-04 12:00:04 UTC (rev 126) +++ trunk/m4/blocks.m4 2009-11-04 16:04:51 UTC (rev 127) @@ -1,5 +1,16 @@ AC_DEFUN([DISPATCH_C_BLOCKS], [ # +# Allow configure to be passed a path to the directory where it should look +# for the Blocks runtime library, if any. +# +AC_ARG_WITH([blocks-runtime], + [AS_HELP_STRING([--with-blocks-runtime], + [Specify path to the blocks runtime])], + [blocks_runtime=${withval} + LIBS="$LIBS -L$blocks_runtime"] +) + +# # Detect compiler support for Blocks; perhaps someday -fblocks won't be # required, in which case we'll need to change this. # @@ -15,17 +26,6 @@ ]) ]) -# -# Allow configure to be passed a path to the directory where it should look -# for the Blocks runtime library, if any. -# -AC_ARG_WITH([blocks-runtime], - [AS_HELP_STRING([--with-blocks-runtime], - [Specify path to the blocks runtime])], - [blocks_runtime=${withval} - LIBS="$LIBS -L$blocks_runtime"] -) - AS_IF([test "x$dispatch_cv_cblocks" != "xno"], [ CBLOCKS_FLAGS="$dispatch_cv_cblocks" @@ -59,6 +59,54 @@ CBLOCKS_FLAGS="" have_cblocks=false ]) -AM_CONDITIONAL(HAVE_BLOCKS, $have_cblocks) +AM_CONDITIONAL(HAVE_CBLOCKS, $have_cblocks) AC_SUBST([CBLOCKS_FLAGS]) + +# +# Because a different C++ compiler may be specified than C compiler, we have +# to do it again for C++. +# +AC_LANG_PUSH([C++]) +AC_CACHE_CHECK([for C++ Blocks support], [dispatch_cv_cxxblocks], [ + saveCXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -fblocks" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[(void)^{int i; i = 0; }();])], [ + CXXFLAGS="$saveCXXFLAGS" + dispatch_cv_cxxblocks="-fblocks" + ], [ + CXXFLAGS="$saveCXXFLAGS" + dispatch_cv_cxxblocks="no" + ]) ]) + +AS_IF([test "x$dispatch_cv_cxxblocks" != "xno"], [ + CXXBLOCKS_FLAGS="$dispatch_cv_cxxblocks" + + saveCXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -fblocks" + AC_MSG_CHECKING([whether additional libraries are required for the Blocks runtime]) + AC_TRY_LINK([], [ + ^{ int j; j=0; }(); + ], [ + AC_MSG_RESULT([no]); + ], [ + saveLIBS="$LIBS" + LIBS="$LIBS -lBlocksRuntime" + AC_TRY_LINK([], [ + ^{ int k; k=0; }(); + ], [ + AC_MSG_RESULT([-lBlocksRuntime]) + ], [ + AC_MSG_ERROR([can't find Blocks runtime]) + ]) + ]) + CXXFLAGS="$saveCXXFLAGS" + have_cxxblocks=true +], [ + CXXBLOCKS_FLAGS="" + have_cxxblocks=false +]) +AC_LANG_POP([C++]) +AM_CONDITIONAL(HAVE_CXXBLOCKS, $have_cxxblocks) +AC_SUBST([CXXBLOCKS_FLAGS]) +]) Modified: trunk/testing/Makefile.am =================================================================== --- trunk/testing/Makefile.am 2009-11-04 12:00:04 UTC (rev 126) +++ trunk/testing/Makefile.am 2009-11-04 16:04:51 UTC (rev 127) @@ -18,8 +18,8 @@ dispatch_c99_CFLAGS=-std=c99 -if HAVE_BLOCKS -BLOCKS_TESTS= \ +if HAVE_CBLOCKS +CBLOCKS_TESTS= \ dispatch_after \ dispatch_apply \ dispatch_drift \ @@ -31,8 +31,15 @@ dispatch_timer_bit31 \ dispatch_timer_bit63 endif -TESTS+=$(BLOCKS_TESTS) +TESTS+=$(CBLOCKS_TESTS) +if HAVE_CXXBLOCKS +CXXBLOCKS_TESTS= \ + dispatch_plusplus +dispatch_plusplus_SOURCES=dispatch_plusplus.cpp +endif +TESTS+=$(CXXBLOCKS_TESTS) + if HAVE_CORESERVICES CORESERVICES_TESTS= \ dispatch_cffd @@ -70,4 +77,5 @@ INCLUDES=-I$(top_builddir) -I$(top_srcdir) LDADD=libtest.la ../src/libdispatch.la CFLAGS=-Wall $(MARCH_FLAGS) $(CBLOCKS_FLAGS) +CXXFLAGS=-Wall $(MARCH_FLAGS) $(CXXBLOCKS_FLAGS)

1 0

[126] trunk/testing/Makefile.am
by source_changes＠macosforge.org 04 Nov '09

04 Nov '09

Revision: 126 http://trac.macosforge.org/projects/libdispatch/changeset/126 Author: robert(a)fledge.watson.org Date: 2009-11-04 04:00:04 -0800 (Wed, 04 Nov 2009) Log Message: ----------- Drop -Werror from testing tree to be consistent with elsewhere. Modified Paths: -------------- trunk/testing/Makefile.am Modified: trunk/testing/Makefile.am =================================================================== --- trunk/testing/Makefile.am 2009-11-04 11:32:27 UTC (rev 125) +++ trunk/testing/Makefile.am 2009-11-04 12:00:04 UTC (rev 126) @@ -69,5 +69,5 @@ INCLUDES=-I$(top_builddir) -I$(top_srcdir) LDADD=libtest.la ../src/libdispatch.la -CFLAGS=-Werror -Wall $(MARCH_FLAGS) $(CBLOCKS_FLAGS) +CFLAGS=-Wall $(MARCH_FLAGS) $(CBLOCKS_FLAGS)

1 0

[125] trunk/dispatch/base.h
by source_changes＠macosforge.org 04 Nov '09

04 Nov '09

Revision: 125 http://trac.macosforge.org/projects/libdispatch/changeset/125 Author: robert(a)fledge.watson.org Date: 2009-11-04 03:32:27 -0800 (Wed, 04 Nov 2009) Log Message: ----------- Remove ';'s from the end of macros to avoid std99 -pedantic complaints. Modified Paths: -------------- trunk/dispatch/base.h Modified: trunk/dispatch/base.h =================================================================== --- trunk/dispatch/base.h 2009-11-04 11:30:52 UTC (rev 124) +++ trunk/dispatch/base.h 2009-11-04 11:32:27 UTC (rev 125) @@ -53,10 +53,10 @@ typedef void (*dispatch_function_t)(void *); #ifdef __cplusplus -#define DISPATCH_DECL(name) typedef struct name##_s : public dispatch_object_s {} *name##_t; +#define DISPATCH_DECL(name) typedef struct name##_s : public dispatch_object_s {} *name##_t #else /*! @parseOnly */ -#define DISPATCH_DECL(name) typedef struct name##_s *name##_t; +#define DISPATCH_DECL(name) typedef struct name##_s *name##_t #endif #ifdef __GNUC__

1 0

[124] trunk/testing/dispatch_timer_set_time.c
by source_changes＠macosforge.org 04 Nov '09

04 Nov '09

Revision: 124 http://trac.macosforge.org/projects/libdispatch/changeset/124 Author: robert(a)fledge.watson.org Date: 2009-11-04 03:30:52 -0800 (Wed, 04 Nov 2009) Log Message: ----------- Use src/internal.h in dispatch_timer_set_time to clean up include problems. Modified Paths: -------------- trunk/testing/dispatch_timer_set_time.c Modified: trunk/testing/dispatch_timer_set_time.c =================================================================== --- trunk/testing/dispatch_timer_set_time.c 2009-11-04 11:30:21 UTC (rev 123) +++ trunk/testing/dispatch_timer_set_time.c 2009-11-04 11:30:52 UTC (rev 124) @@ -4,12 +4,9 @@ #include <assert.h> #include <stdio.h> #include <string.h> -#include <sys/time.h> -#include <dispatch/dispatch.h> - #define __DISPATCH_INDIRECT__ -#include "src/legacy.h" +#include "src/internal.h" #include "dispatch_test.h"

1 0

[123] trunk/testing/Makefile.darwin
by source_changes＠macosforge.org 04 Nov '09

04 Nov '09

Revision: 123 http://trac.macosforge.org/projects/libdispatch/changeset/123 Author: robert(a)fledge.watson.org Date: 2009-11-04 03:30:21 -0800 (Wed, 04 Nov 2009) Log Message: ----------- Teach old-style Darwin Makefile how to find config/config.h. Modified Paths: -------------- trunk/testing/Makefile.darwin Modified: trunk/testing/Makefile.darwin =================================================================== --- trunk/testing/Makefile.darwin 2009-11-04 11:26:54 UTC (rev 122) +++ trunk/testing/Makefile.darwin 2009-11-04 11:30:21 UTC (rev 123) @@ -46,7 +46,7 @@ SRCS = dispatch_test.c OBJS = $(SRCS:%.c=%.o) ARCHS=i386 x86_64 ppc -CFLAGS = -Werror -Wall -Wextra -Wshadow -mdynamic-no-pic -Os -g $(patsubst %, -arch %,$(ARCHS)) -DDISPATCH_NO_LEGACY +CFLAGS = -Werror -Wall -Wextra -Wshadow -mdynamic-no-pic -Os -g $(patsubst %, -arch %,$(ARCHS)) -DDISPATCH_NO_LEGACY -I.. CPPFLAGS = $(CFLAGS) LDFLAGS = $(patsubst %, -arch %,$(ARCHS)) LDLIBS = -lstdc++

1 0

[122] trunk/testing
by source_changes＠macosforge.org 04 Nov '09

04 Nov '09

Revision: 122 http://trac.macosforge.org/projects/libdispatch/changeset/122 Author: robert(a)fledge.watson.org Date: 2009-11-04 03:26:54 -0800 (Wed, 04 Nov 2009) Log Message: ----------- Include config.h in regression tests and reporting tools so that we can implement configuration-specific functions. Modified Paths: -------------- trunk/testing/dispatch_after.c trunk/testing/dispatch_api.c trunk/testing/dispatch_apply.c trunk/testing/dispatch_c99.c trunk/testing/dispatch_cascade.c trunk/testing/dispatch_cffd.c trunk/testing/dispatch_debug.c trunk/testing/dispatch_drift.c trunk/testing/dispatch_group.c trunk/testing/dispatch_pingpong.c trunk/testing/dispatch_priority.c trunk/testing/dispatch_proc.c trunk/testing/dispatch_read.c trunk/testing/dispatch_readsync.c trunk/testing/dispatch_sema.c trunk/testing/dispatch_starfish.c trunk/testing/dispatch_test.c trunk/testing/dispatch_timer_bit31.c trunk/testing/dispatch_timer_bit63.c trunk/testing/dispatch_timer_set_time.c trunk/testing/fd_stress.c trunk/testing/harness.c trunk/testing/queue_finalizer.c trunk/testing/summarize.c Modified: trunk/testing/dispatch_after.c =================================================================== --- trunk/testing/dispatch_after.c 2009-11-04 10:45:49 UTC (rev 121) +++ trunk/testing/dispatch_after.c 2009-11-04 11:26:54 UTC (rev 122) @@ -18,6 +18,8 @@ * @APPLE_APACHE_LICENSE_HEADER_END@ */ +#include "config/config.h" + #include <dispatch/dispatch.h> #include <stdio.h> #include <unistd.h> Modified: trunk/testing/dispatch_api.c =================================================================== --- trunk/testing/dispatch_api.c 2009-11-04 10:45:49 UTC (rev 121) +++ trunk/testing/dispatch_api.c 2009-11-04 11:26:54 UTC (rev 122) @@ -18,6 +18,8 @@ * @APPLE_APACHE_LICENSE_HEADER_END@ */ +#include "config/config.h" + #include <stdlib.h> #include <dispatch/dispatch.h> Modified: trunk/testing/dispatch_apply.c =================================================================== --- trunk/testing/dispatch_apply.c 2009-11-04 10:45:49 UTC (rev 121) +++ trunk/testing/dispatch_apply.c 2009-11-04 11:26:54 UTC (rev 122) @@ -18,8 +18,11 @@ * @APPLE_APACHE_LICENSE_HEADER_END@ */ +#include "config/config.h" + #include <dispatch/dispatch.h> #include "src/hw_shims.h" + #include <stdio.h> #include <unistd.h> #include <stdlib.h> Modified: trunk/testing/dispatch_c99.c =================================================================== --- trunk/testing/dispatch_c99.c 2009-11-04 10:45:49 UTC (rev 121) +++ trunk/testing/dispatch_c99.c 2009-11-04 11:26:54 UTC (rev 122) @@ -18,6 +18,8 @@ * @APPLE_APACHE_LICENSE_HEADER_END@ */ +#include "config/config.h" + #include <dispatch/dispatch.h> #include <stdlib.h> Modified: trunk/testing/dispatch_cascade.c =================================================================== --- trunk/testing/dispatch_cascade.c 2009-11-04 10:45:49 UTC (rev 121) +++ trunk/testing/dispatch_cascade.c 2009-11-04 11:26:54 UTC (rev 122) @@ -18,6 +18,8 @@ * @APPLE_APACHE_LICENSE_HEADER_END@ */ +#include "config/config.h" + #include <stdio.h> #include <dispatch/dispatch.h> #include <unistd.h> Modified: trunk/testing/dispatch_cffd.c =================================================================== --- trunk/testing/dispatch_cffd.c 2009-11-04 10:45:49 UTC (rev 121) +++ trunk/testing/dispatch_cffd.c 2009-11-04 11:26:54 UTC (rev 122) @@ -18,6 +18,8 @@ * @APPLE_APACHE_LICENSE_HEADER_END@ */ +#include "config/config.h" + #include <dispatch/dispatch.h> #include <stdio.h> Modified: trunk/testing/dispatch_debug.c =================================================================== --- trunk/testing/dispatch_debug.c 2009-11-04 10:45:49 UTC (rev 121) +++ trunk/testing/dispatch_debug.c 2009-11-04 11:26:54 UTC (rev 122) @@ -18,6 +18,8 @@ * @APPLE_APACHE_LICENSE_HEADER_END@ */ +#include "config/config.h" + #include <assert.h> #include <stdio.h> #include <string.h> Modified: trunk/testing/dispatch_drift.c =================================================================== --- trunk/testing/dispatch_drift.c 2009-11-04 10:45:49 UTC (rev 121) +++ trunk/testing/dispatch_drift.c 2009-11-04 11:26:54 UTC (rev 122) @@ -18,6 +18,8 @@ * @APPLE_APACHE_LICENSE_HEADER_END@ */ +#include "config/config.h" + #include <dispatch/dispatch.h> #include <sys/time.h> #include <math.h> Modified: trunk/testing/dispatch_group.c =================================================================== --- trunk/testing/dispatch_group.c 2009-11-04 10:45:49 UTC (rev 121) +++ trunk/testing/dispatch_group.c 2009-11-04 11:26:54 UTC (rev 122) @@ -18,6 +18,8 @@ * @APPLE_APACHE_LICENSE_HEADER_END@ */ +#include "config/config.h" + #include <dispatch/dispatch.h> #include <unistd.h> #include <stdarg.h> Modified: trunk/testing/dispatch_pingpong.c =================================================================== --- trunk/testing/dispatch_pingpong.c 2009-11-04 10:45:49 UTC (rev 121) +++ trunk/testing/dispatch_pingpong.c 2009-11-04 11:26:54 UTC (rev 122) @@ -18,6 +18,8 @@ * @APPLE_APACHE_LICENSE_HEADER_END@ */ +#include "config/config.h" + #include <dispatch/dispatch.h> #include <stdio.h> Modified: trunk/testing/dispatch_priority.c =================================================================== --- trunk/testing/dispatch_priority.c 2009-11-04 10:45:49 UTC (rev 121) +++ trunk/testing/dispatch_priority.c 2009-11-04 11:26:54 UTC (rev 122) @@ -18,6 +18,8 @@ * @APPLE_APACHE_LICENSE_HEADER_END@ */ +#include "config/config.h" + #include <stdio.h> #include <dispatch/dispatch.h> #define __DISPATCH_INDIRECT__ Modified: trunk/testing/dispatch_proc.c =================================================================== --- trunk/testing/dispatch_proc.c 2009-11-04 10:45:49 UTC (rev 121) +++ trunk/testing/dispatch_proc.c 2009-11-04 11:26:54 UTC (rev 122) @@ -18,6 +18,8 @@ * @APPLE_APACHE_LICENSE_HEADER_END@ */ +#include "config/config.h" + #include <dispatch/dispatch.h> #include <stdio.h> #include <unistd.h> Modified: trunk/testing/dispatch_read.c =================================================================== --- trunk/testing/dispatch_read.c 2009-11-04 10:45:49 UTC (rev 121) +++ trunk/testing/dispatch_read.c 2009-11-04 11:26:54 UTC (rev 122) @@ -18,6 +18,8 @@ * @APPLE_APACHE_LICENSE_HEADER_END@ */ +#include "config/config.h" + #include <sys/stat.h> #include <assert.h> #include <fcntl.h> Modified: trunk/testing/dispatch_readsync.c =================================================================== --- trunk/testing/dispatch_readsync.c 2009-11-04 10:45:49 UTC (rev 121) +++ trunk/testing/dispatch_readsync.c 2009-11-04 11:26:54 UTC (rev 122) @@ -18,6 +18,8 @@ * @APPLE_APACHE_LICENSE_HEADER_END@ */ +#include "config/config.h" + #include <dispatch/dispatch.h> #define __DISPATCH_INDIRECT__ #include "src/queue_private.h" Modified: trunk/testing/dispatch_sema.c =================================================================== --- trunk/testing/dispatch_sema.c 2009-11-04 10:45:49 UTC (rev 121) +++ trunk/testing/dispatch_sema.c 2009-11-04 11:26:54 UTC (rev 122) @@ -18,6 +18,8 @@ * @APPLE_APACHE_LICENSE_HEADER_END@ */ +#include "config/config.h" + #include <dispatch/dispatch.h> #include <pthread.h> #include <stdio.h> Modified: trunk/testing/dispatch_starfish.c =================================================================== --- trunk/testing/dispatch_starfish.c 2009-11-04 10:45:49 UTC (rev 121) +++ trunk/testing/dispatch_starfish.c 2009-11-04 11:26:54 UTC (rev 122) @@ -18,6 +18,8 @@ * @APPLE_APACHE_LICENSE_HEADER_END@ */ +#include "config/config.h" + #include <dispatch/dispatch.h> #include "src/internal.h" #include <stdio.h> Modified: trunk/testing/dispatch_test.c =================================================================== --- trunk/testing/dispatch_test.c 2009-11-04 10:45:49 UTC (rev 121) +++ trunk/testing/dispatch_test.c 2009-11-04 11:26:54 UTC (rev 122) @@ -1,3 +1,5 @@ +#include "config/config.h" + #include <sys/types.h> #include <sys/wait.h> Modified: trunk/testing/dispatch_timer_bit31.c =================================================================== --- trunk/testing/dispatch_timer_bit31.c 2009-11-04 10:45:49 UTC (rev 121) +++ trunk/testing/dispatch_timer_bit31.c 2009-11-04 11:26:54 UTC (rev 122) @@ -18,6 +18,8 @@ * @APPLE_APACHE_LICENSE_HEADER_END@ */ +#include "config/config.h" + #include <assert.h> #include <stdio.h> #include <string.h> Modified: trunk/testing/dispatch_timer_bit63.c =================================================================== --- trunk/testing/dispatch_timer_bit63.c 2009-11-04 10:45:49 UTC (rev 121) +++ trunk/testing/dispatch_timer_bit63.c 2009-11-04 11:26:54 UTC (rev 122) @@ -18,6 +18,8 @@ * @APPLE_APACHE_LICENSE_HEADER_END@ */ +#include "config/config.h" + #include <assert.h> #include <stdio.h> #include <string.h> Modified: trunk/testing/dispatch_timer_set_time.c =================================================================== --- trunk/testing/dispatch_timer_set_time.c 2009-11-04 10:45:49 UTC (rev 121) +++ trunk/testing/dispatch_timer_set_time.c 2009-11-04 11:26:54 UTC (rev 122) @@ -1,3 +1,5 @@ +#include "config/config.h" + #include <sys/time.h> #include <assert.h> #include <stdio.h> Modified: trunk/testing/fd_stress.c =================================================================== --- trunk/testing/fd_stress.c 2009-11-04 10:45:49 UTC (rev 121) +++ trunk/testing/fd_stress.c 2009-11-04 11:26:54 UTC (rev 122) @@ -24,6 +24,8 @@ * Stress test for dispatch read and write sources. */ +#include "config/config.h" + #include <dispatch/dispatch.h> #include <assert.h> Modified: trunk/testing/harness.c =================================================================== --- trunk/testing/harness.c 2009-11-04 10:45:49 UTC (rev 121) +++ trunk/testing/harness.c 2009-11-04 11:26:54 UTC (rev 122) @@ -18,6 +18,8 @@ * @APPLE_APACHE_LICENSE_HEADER_END@ */ +#include "config/config.h" + #include <dispatch/dispatch.h> #include <assert.h> #include <spawn.h> Modified: trunk/testing/queue_finalizer.c =================================================================== --- trunk/testing/queue_finalizer.c 2009-11-04 10:45:49 UTC (rev 121) +++ trunk/testing/queue_finalizer.c 2009-11-04 11:26:54 UTC (rev 122) @@ -18,6 +18,8 @@ * @APPLE_APACHE_LICENSE_HEADER_END@ */ +#include "config/config.h" + #include <dispatch/dispatch.h> #include <unistd.h> Modified: trunk/testing/summarize.c =================================================================== --- trunk/testing/summarize.c 2009-11-04 10:45:49 UTC (rev 121) +++ trunk/testing/summarize.c 2009-11-04 11:26:54 UTC (rev 122) @@ -18,6 +18,8 @@ * @APPLE_APACHE_LICENSE_HEADER_END@ */ +#include "config/config.h" + #include <stdio.h> #include <stdlib.h> #include <string.h>

1 0