November 2009 - libdispatch-changes

[101] trunk/dispatch
by source_changes＠macosforge.org 03 Nov '09

03 Nov '09

Revision: 101 http://trac.macosforge.org/projects/libdispatch/changeset/101 Author: robert(a)fledge.watson.org Date: 2009-11-03 06:46:36 -0800 (Tue, 03 Nov 2009) Log Message: ----------- On __APPLE__, include TargetConditionals.h for public headers, and test TARGET_OS_MAC rather than HAVE_MACH. Submitted by: Kevin Van Vechten <kvv(a)apple.com> Modified Paths: -------------- trunk/dispatch/dispatch.h trunk/dispatch/source.h Modified: trunk/dispatch/dispatch.h =================================================================== --- trunk/dispatch/dispatch.h 2009-11-03 14:43:56 UTC (rev 100) +++ trunk/dispatch/dispatch.h 2009-11-03 14:46:36 UTC (rev 101) @@ -23,6 +23,7 @@ #ifdef __APPLE__ #include <Availability.h> +#include <TargetConditionals.h> #endif #include <sys/cdefs.h> #include <stddef.h> Modified: trunk/dispatch/source.h =================================================================== --- trunk/dispatch/source.h 2009-11-03 14:43:56 UTC (rev 100) +++ trunk/dispatch/source.h 2009-11-03 14:46:36 UTC (rev 101) @@ -26,7 +26,7 @@ #include <dispatch/base.h> // for HeaderDoc #endif -#ifdef HAVE_MACH +#if TARGET_OS_MAC #include <mach/port.h> #include <mach/message.h> #endif

1 0

[100] trunk/src
by source_changes＠macosforge.org 03 Nov '09

03 Nov '09

Revision: 100 http://trac.macosforge.org/projects/libdispatch/changeset/100 Author: robert(a)fledge.watson.org Date: 2009-11-03 06:43:56 -0800 (Tue, 03 Nov 2009) Log Message: ----------- Prefer #if to #ifdef for HAVE_ checks. Suggested by: Kevin Van Vechten <kvv(a)apple.com> Modified Paths: -------------- trunk/src/benchmark.c trunk/src/internal.h trunk/src/legacy.h trunk/src/os_shims.h trunk/src/private.h trunk/src/queue.c trunk/src/shims/mach.c trunk/src/shims/tsd.h trunk/src/source.c trunk/src/source_private.h Modified: trunk/src/benchmark.c =================================================================== --- trunk/src/benchmark.c 2009-11-03 14:40:23 UTC (rev 99) +++ trunk/src/benchmark.c 2009-11-03 14:43:56 UTC (rev 100) @@ -22,7 +22,7 @@ struct __dispatch_benchmark_data_s { -#ifdef HAVE_MACH_ABSOLUTE_TIME +#if HAVE_MACH_ABSOLUTE_TIME mach_timebase_info_data_t tbi; #endif uint64_t loop_cost; @@ -47,7 +47,7 @@ #else long double lcost; #endif -#ifdef HAVE_MACH_ABSOLUTE_TIME +#if HAVE_MACH_ABSOLUTE_TIME kern_return_t kr; kr = mach_timebase_info(&bdata->tbi); @@ -62,7 +62,7 @@ delta = _dispatch_absolute_time() - start; lcost = delta; -#ifdef HAVE_MACH_ABSOLUTE_TIME +#if HAVE_MACH_ABSOLUTE_TIME lcost *= bdata->tbi.numer; lcost /= bdata->tbi.denom; #endif @@ -110,7 +110,7 @@ delta = _dispatch_absolute_time() - start; conversion = delta; -#ifdef HAVE_MACH_ABSOLUTE_TIME +#if HAVE_MACH_ABSOLUTE_TIME conversion *= bdata.tbi.numer; big_denom = bdata.tbi.denom; #else Modified: trunk/src/internal.h =================================================================== --- trunk/src/internal.h 2009-11-03 14:40:23 UTC (rev 99) +++ trunk/src/internal.h 2009-11-03 14:43:56 UTC (rev 100) @@ -32,7 +32,7 @@ #define __DISPATCH_BUILDING_DISPATCH__ #define __DISPATCH_INDIRECT__ -#ifdef HAVE_AVAILABILITY_H +#if HAVE_AVAILABILITY_H #include <Availability.h> #endif @@ -64,13 +64,13 @@ #endif -#ifdef HAVE_LIBKERN_OSCROSSENDIAN_H +#if HAVE_LIBKERN_OSCROSSENDIAN_H #include <libkern/OSCrossEndian.h> #endif -#ifdef HAVE_LIBKERN_OSATOMIC_H +#if HAVE_LIBKERN_OSATOMIC_H #include <libkern/OSAtomic.h> #endif -#ifdef HAVE_MACH +#if HAVE_MACH #include <mach/boolean.h> #include <mach/clock_types.h> #include <mach/clock.h> @@ -86,7 +86,7 @@ #include <mach/host_info.h> #include <mach/notify.h> #endif /* HAVE_MACH */ -#ifdef HAVE_MALLOC_MALLOC_H +#if HAVE_MALLOC_MALLOC_H #include <malloc/malloc.h> #endif #include <sys/event.h> @@ -277,7 +277,7 @@ #if USE_APPLE_CRASHREPORTER_INFO -#ifdef HAVE_MACH +#if HAVE_MACH // MIG_REPLY_MISMATCH means either: // 1) A signal handler is NOT using async-safe API. See the sigaction(2) man page for more info. // 2) A hand crafted call to mach_msg*() screwed up. Use MIG. @@ -316,7 +316,7 @@ #else /* !USE_APPLE_CRASHREPORTER_INFO */ -#ifdef HAVE_MACH +#if HAVE_MACH #define DISPATCH_VERIFY_MIG(x) do { \ if ((x) == MIG_REPLY_MISMATCH) { \ _dispatch_hardware_crash(); \ Modified: trunk/src/legacy.h =================================================================== --- trunk/src/legacy.h 2009-11-03 14:40:23 UTC (rev 99) +++ trunk/src/legacy.h 2009-11-03 14:43:56 UTC (rev 100) @@ -37,7 +37,7 @@ #include <dispatch/base.h> // for HeaderDoc #endif -#ifdef HAVE_MACH +#if HAVE_MACH #include <mach/mach_types.h> #endif @@ -309,7 +309,7 @@ long dispatch_source_get_error(dispatch_source_t source, long* error); -#ifdef HAVE_MACH +#if HAVE_MACH // Use: dispatch_source_get_handle __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) DISPATCH_NONNULL_ALL DISPATCH_WARN_RESULT DISPATCH_NOTHROW @@ -423,7 +423,7 @@ dispatch_source_attr_t attr, void *context); -#ifdef HAVE_MACH +#if HAVE_MACH // Use: dispatch_source_create(DISPATCH_SOURCE_TYPE_MACH_RECV, ...) __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) DISPATCH_MALLOC DISPATCH_NONNULL4 DISPATCH_NONNULL5 DISPATCH_NOTHROW @@ -599,7 +599,7 @@ }; // Use: dispatch_source_create(DISPATCH_SOURCE_TYPE_MACH_RECV, ...) -#ifdef HAVE_MACH +#if HAVE_MACH #ifdef __BLOCKS__ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) DISPATCH_MALLOC DISPATCH_NOTHROW @@ -704,7 +704,7 @@ void *h_context, dispatch_source_handler_function_t handler); -#ifdef HAVE_MACH +#if HAVE_MACH /* * Raw Mach message support from MIG source. * Modified: trunk/src/os_shims.h =================================================================== --- trunk/src/os_shims.h 2009-11-03 14:40:23 UTC (rev 99) +++ trunk/src/os_shims.h 2009-11-03 14:43:56 UTC (rev 100) @@ -28,13 +28,13 @@ #define __DISPATCH_OS_SHIMS__ #include <pthread.h> -#ifdef HAVE_PTHREAD_MACHDEP_H +#if HAVE_PTHREAD_MACHDEP_H #include <pthread_machdep.h> #endif -#ifdef HAVE_PTHREAD_WORKQUEUES +#if HAVE_PTHREAD_WORKQUEUES #include <pthread_workqueue.h> #endif -#ifdef HAVE_PTHREAD_NP_H +#if HAVE_PTHREAD_NP_H #include <pthread_np.h> #endif Modified: trunk/src/private.h =================================================================== --- trunk/src/private.h 2009-11-03 14:40:23 UTC (rev 99) +++ trunk/src/private.h 2009-11-03 14:43:56 UTC (rev 100) @@ -27,7 +27,7 @@ #ifndef __DISPATCH_PRIVATE__ #define __DISPATCH_PRIVATE__ -#ifdef HAVE_MACH +#if HAVE_MACH #include <mach/boolean.h> #include <mach/mach.h> #include <mach/message.h> @@ -73,7 +73,7 @@ libdispatch_init(void); #endif -#ifdef HAVE_MACH +#if HAVE_MACH #define DISPATCH_COCOA_COMPAT 1 #if DISPATCH_COCOA_COMPAT @@ -109,7 +109,7 @@ DISPATCH_NOTHROW void dispatch_atfork_child(void); DISPATCH_NOTHROW void dispatch_init_pthread(pthread_t); -#ifdef HAVE_MACH +#if HAVE_MACH /* * Extract the context pointer from a mach message trailer. */ Modified: trunk/src/queue.c =================================================================== --- trunk/src/queue.c 2009-11-03 14:40:23 UTC (rev 99) +++ trunk/src/queue.c 2009-11-03 14:43:56 UTC (rev 100) @@ -19,7 +19,7 @@ */ #include "internal.h" -#ifdef HAVE_MACH +#if HAVE_MACH #include "protocol.h" #endif @@ -184,7 +184,7 @@ #define MAX_THREAD_COUNT 255 struct dispatch_root_queue_context_s { -#ifdef HAVE_PTHREAD_WORKQUEUES +#if HAVE_PTHREAD_WORKQUEUES pthread_workqueue_t dgq_kworkqueue; #endif uint32_t dgq_pending; @@ -894,13 +894,13 @@ dispatch_main(void) { -#ifdef HAVE_PTHREAD_MAIN_NP +#if HAVE_PTHREAD_MAIN_NP if (pthread_main_np()) { #endif _dispatch_program_is_probably_callback_driven = true; pthread_exit(NULL); DISPATCH_CRASH("pthread_exit() returned"); -#ifdef HAVE_PTHREAD_MAIN_NP +#if HAVE_PTHREAD_MAIN_NP } DISPATCH_CLIENT_CRASH("dispatch_main() must be called on the main thread"); #endif @@ -997,7 +997,7 @@ dispatch_assert(countof(_dispatch_thread_mediator) == DISPATCH_ROOT_QUEUE_COUNT); dispatch_assert(countof(_dispatch_root_queue_contexts) == DISPATCH_ROOT_QUEUE_COUNT); -#ifdef HAVE_PTHREAD_KEY_INIT_NP +#if HAVE_PTHREAD_KEY_INIT_NP _dispatch_thread_key_init_np(dispatch_queue_key, _dispatch_queue_cleanup); _dispatch_thread_key_init_np(dispatch_sema4_key, (void (*)(void *))dispatch_release); // use the extern release _dispatch_thread_key_init_np(dispatch_cache_key, _dispatch_cache_cleanup2); @@ -1083,7 +1083,7 @@ } #endif -#ifdef HAVE_PTHREAD_WORKQUEUES +#if HAVE_PTHREAD_WORKQUEUES static inline int _dispatch_rootq2wq_pri(long idx) { @@ -1109,7 +1109,7 @@ static void _dispatch_root_queues_init(void *context __attribute__((unused))) { -#ifdef HAVE_PTHREAD_WORKQUEUES +#if HAVE_PTHREAD_WORKQUEUES bool disable_wq = getenv("LIBDISPATCH_DISABLE_KWQ"); pthread_workqueue_attr_t pwq_attr; int r; @@ -1122,13 +1122,13 @@ #endif int i; -#ifdef HAVE_PTHREAD_WORKQUEUES +#if HAVE_PTHREAD_WORKQUEUES r = pthread_workqueue_attr_init_np(&pwq_attr); (void)dispatch_assume_zero(r); #endif for (i = 0; i < DISPATCH_ROOT_QUEUE_COUNT; i++) { -#ifdef HAVE_PTHREAD_WORKQUEUES +#if HAVE_PTHREAD_WORKQUEUES r = pthread_workqueue_attr_setqueuepriority_np(&pwq_attr, _dispatch_rootq2wq_pri(i)); (void)dispatch_assume_zero(r); r = pthread_workqueue_attr_setovercommit_np(&pwq_attr, i & 1); @@ -1158,14 +1158,14 @@ ret = sem_init(&_dispatch_thread_mediator[i].dsema_sem, 0, 0); (void)dispatch_assume_zero(ret); #endif -#ifdef HAVE_PTHREAD_WORKQUEUES +#if HAVE_PTHREAD_WORKQUEUES } else { dispatch_assume(_dispatch_root_queue_contexts[i].dgq_kworkqueue); } #endif } -#ifdef HAVE_PTHREAD_WORKQUEUES +#if HAVE_PTHREAD_WORKQUEUES r = pthread_workqueue_attr_destroy_np(&pwq_attr); (void)dispatch_assume_zero(r); #endif @@ -1176,7 +1176,7 @@ { static dispatch_once_t pred; struct dispatch_root_queue_context_s *qc = dq->do_ctxt; -#ifdef HAVE_PTHREAD_WORKQUEUES +#if HAVE_PTHREAD_WORKQUEUES pthread_workitem_handle_t wh; unsigned int gen_cnt; #endif @@ -1193,7 +1193,7 @@ dispatch_once_f(&pred, NULL, _dispatch_root_queues_init); -#ifdef HAVE_PTHREAD_WORKQUEUES +#if HAVE_PTHREAD_WORKQUEUES if (qc->dgq_kworkqueue) { if (dispatch_atomic_cmpxchg(&qc->dgq_pending, 0, 1)) { _dispatch_debug("requesting new worker thread"); Modified: trunk/src/shims/mach.c =================================================================== --- trunk/src/shims/mach.c 2009-11-03 14:40:23 UTC (rev 99) +++ trunk/src/shims/mach.c 2009-11-03 14:43:56 UTC (rev 100) @@ -20,7 +20,7 @@ #include "internal.h" -#ifdef HAVE_MACH +#if HAVE_MACH void * dispatch_mach_msg_get_context(mach_msg_header_t *msg) { Modified: trunk/src/shims/tsd.h =================================================================== --- trunk/src/shims/tsd.h 2009-11-03 14:40:23 UTC (rev 99) +++ trunk/src/shims/tsd.h 2009-11-03 14:43:56 UTC (rev 100) @@ -27,7 +27,7 @@ #ifndef __DISPATCH_SHIMS_TSD__ #define __DISPATCH_SHIMS_TSD__ -#ifdef HAVE_PTHREAD_KEY_INIT_NP +#if HAVE_PTHREAD_KEY_INIT_NP static const unsigned long dispatch_queue_key = __PTK_LIBDISPATCH_KEY0; static const unsigned long dispatch_sema4_key = __PTK_LIBDISPATCH_KEY1; static const unsigned long dispatch_cache_key = __PTK_LIBDISPATCH_KEY2; @@ -100,7 +100,7 @@ } #endif /* USE_APPLE_TSD_OPTIMIZATIONS */ -#ifdef HAVE_PTHREAD_KEY_INIT_NP +#if HAVE_PTHREAD_KEY_INIT_NP static inline void _dispatch_thread_key_init_np(unsigned long k, void (*d)(void *)) { Modified: trunk/src/source.c =================================================================== --- trunk/src/source.c 2009-11-03 14:40:23 UTC (rev 99) +++ trunk/src/source.c 2009-11-03 14:43:56 UTC (rev 100) @@ -19,7 +19,7 @@ */ #include "internal.h" -#ifdef HAVE_MACH +#if HAVE_MACH #include "protocol.h" #include "protocolServer.h" #endif @@ -113,7 +113,7 @@ static void _dispatch_kevent_merge(dispatch_source_t ds); static void _dispatch_kevent_release(dispatch_source_t ds); static void _dispatch_kevent_resume(dispatch_kevent_t dk, uint32_t new_flags, uint32_t del_flags); -#ifdef HAVE_MACH +#if HAVE_MACH static void _dispatch_kevent_machport_resume(dispatch_kevent_t dk, uint32_t new_flags, uint32_t del_flags); static void _dispatch_kevent_machport_enable(dispatch_kevent_t dk); static void _dispatch_kevent_machport_disable(dispatch_kevent_t dk); @@ -122,7 +122,7 @@ #endif static void _dispatch_timer_list_update(dispatch_source_t ds); -#ifdef HAVE_MACH +#if HAVE_MACH static void _dispatch_mach_notify_source_init(void *context __attribute__((unused))); #endif @@ -139,7 +139,7 @@ _evfilt2(EVFILT_PROC); _evfilt2(EVFILT_SIGNAL); _evfilt2(EVFILT_TIMER); -#ifdef HAVE_MACH +#if HAVE_MACH _evfilt2(EVFILT_MACHPORT); #endif _evfilt2(EVFILT_FS); @@ -165,7 +165,7 @@ _dispatch_kevent_hash(uintptr_t ident, short filter) { uintptr_t value; -#ifdef HAVE_MACH +#if HAVE_MACH value = (filter == EVFILT_MACHPORT ? MACH_PORT_INDEX(ident) : ident); #else value = ident; @@ -347,7 +347,7 @@ case DISPATCH_EVFILT_CUSTOM_OR: // these types not registered with kevent return; -#ifdef HAVE_MACH +#if HAVE_MACH case EVFILT_MACHPORT: _dispatch_kevent_machport_resume(dk, new_flags, del_flags); break; @@ -613,7 +613,7 @@ dispatch_debug_kevents(ke, 1, __func__); -#ifdef HAVE_MACH +#if HAVE_MACH if (ke->filter == EVFILT_MACHPORT) { return _dispatch_drain_mach_messages(ke); } @@ -640,7 +640,7 @@ case DISPATCH_EVFILT_CUSTOM_OR: // these sources live on statically allocated lists return; -#ifdef HAVE_MACH +#if HAVE_MACH case EVFILT_MACHPORT: _dispatch_kevent_machport_resume(dk, 0, dk->dk_kevent.fflags); break; @@ -1037,7 +1037,7 @@ , }; -#ifdef HAVE_MACH +#if HAVE_MACH static void dispatch_source_type_mach_send_init(dispatch_source_t ds, dispatch_source_type_t type, uintptr_t handle, unsigned long mask, dispatch_queue_t q) @@ -1638,7 +1638,7 @@ } #endif /* DISPATCH_NO_LEGACY */ -#ifdef HAVE_MACH +#if HAVE_MACH static dispatch_source_t _dispatch_mach_notify_source; static mach_port_t _dispatch_port_set; static mach_port_t _dispatch_event_port; Modified: trunk/src/source_private.h =================================================================== --- trunk/src/source_private.h 2009-11-03 14:40:23 UTC (rev 99) +++ trunk/src/source_private.h 2009-11-03 14:43:56 UTC (rev 100) @@ -111,7 +111,7 @@ __BEGIN_DECLS -#ifdef HAVE_MACH +#if HAVE_MACH /*! * @typedef dispatch_mig_callback_t *

1 0

[99] trunk/src
by source_changes＠macosforge.org 03 Nov '09

03 Nov '09

Revision: 99 http://trac.macosforge.org/projects/libdispatch/changeset/99 Author: robert(a)fledge.watson.org Date: 2009-11-03 06:40:23 -0800 (Tue, 03 Nov 2009) Log Message: ----------- When testing USE_, prefer #if to #ifdef. Suggested by: Kevin Van Vechten <kvv(a)apple.com> Modified Paths: -------------- trunk/src/internal.h trunk/src/os_shims.h trunk/src/private.h Modified: trunk/src/internal.h =================================================================== --- trunk/src/internal.h 2009-11-03 14:35:21 UTC (rev 98) +++ trunk/src/internal.h 2009-11-03 14:40:23 UTC (rev 99) @@ -275,7 +275,7 @@ #include "semaphore_internal.h" #include "source_internal.h" -#ifdef USE_APPLE_CRASHREPORTER_INFO +#if USE_APPLE_CRASHREPORTER_INFO #ifdef HAVE_MACH // MIG_REPLY_MISMATCH means either: Modified: trunk/src/os_shims.h =================================================================== --- trunk/src/os_shims.h 2009-11-03 14:35:21 UTC (rev 98) +++ trunk/src/os_shims.h 2009-11-03 14:40:23 UTC (rev 99) @@ -38,7 +38,7 @@ #include <pthread_np.h> #endif -#ifdef USE_APPLE_CRASHREPORTER_INFO +#if USE_APPLE_CRASHREPORTER_INFO __private_extern__ const char *__crashreporter_info__; #endif Modified: trunk/src/private.h =================================================================== --- trunk/src/private.h 2009-11-03 14:35:21 UTC (rev 98) +++ trunk/src/private.h 2009-11-03 14:40:23 UTC (rev 99) @@ -67,7 +67,7 @@ DISPATCH_NOTHROW void -#ifdef USE_LIBDISPATCH_INIT_CONSTRUCTOR +#if USE_LIBDISPATCH_INIT_CONSTRUCTOR libdispatch_init(void) __attribute__ ((constructor)); #else libdispatch_init(void);

1 0

[98] trunk/src
by source_changes＠macosforge.org 03 Nov '09

03 Nov '09

Revision: 98 http://trac.macosforge.org/projects/libdispatch/changeset/98 Author: robert(a)fledge.watson.org Date: 2009-11-03 06:35:21 -0800 (Tue, 03 Nov 2009) Log Message: ----------- Complete implementation of DISPATCH_NO_LEGACY so that legacy.h can be excluded from non-legacy builds. Submitted by: Daniel A. Steffen <dsteffen(a)apple.com> Modified Paths: -------------- trunk/src/internal.h trunk/src/legacy.c trunk/src/queue.c trunk/src/shims/mach.c trunk/src/source.c trunk/src/source_internal.h Modified: trunk/src/internal.h =================================================================== --- trunk/src/internal.h 2009-11-03 14:33:06 UTC (rev 97) +++ trunk/src/internal.h 2009-11-03 14:35:21 UTC (rev 98) @@ -52,7 +52,10 @@ #include "queue_private.h" #include "source_private.h" #include "private.h" + +#ifndef DISPATCH_NO_LEGACY #include "legacy.h" +#endif /* More #includes at EOF (dependent on the contents of internal.h) ... */ /* The "_debug" library build */ Modified: trunk/src/legacy.c =================================================================== --- trunk/src/legacy.c 2009-11-03 14:33:06 UTC (rev 97) +++ trunk/src/legacy.c 2009-11-03 14:35:21 UTC (rev 98) @@ -19,6 +19,8 @@ */ #include "internal.h" + +#ifndef DISPATCH_NO_LEGACY #include "legacy.h" /* @@ -83,8 +85,6 @@ } #endif /* __BLOCKS__ */ -#ifndef DISPATCH_NO_LEGACY - sigset_t dispatch_event_get_signals(dispatch_event_t de) { Modified: trunk/src/queue.c =================================================================== --- trunk/src/queue.c 2009-11-03 14:33:06 UTC (rev 97) +++ trunk/src/queue.c 2009-11-03 14:35:21 UTC (rev 98) @@ -130,6 +130,7 @@ struct dispatch_queue_attr_s { DISPATCH_STRUCT_HEADER(dispatch_queue_attr_s, dispatch_queue_attr_vtable_s); +#ifndef DISPATCH_NO_LEGACY // Public: int qa_priority; void* finalizer_ctxt; @@ -137,6 +138,7 @@ // Private: unsigned long qa_flags; +#endif }; static int _dispatch_pthread_sigmask(int how, sigset_t *set, sigset_t *oset); @@ -951,6 +953,7 @@ #endif } +#ifndef DISPATCH_NO_LEGACY dispatch_queue_t dispatch_get_concurrent_queue(long pri) { @@ -961,6 +964,7 @@ } return _dispatch_get_root_queue(pri, false); } +#endif static void _dispatch_queue_cleanup(void *ctxt) Modified: trunk/src/shims/mach.c =================================================================== --- trunk/src/shims/mach.c 2009-11-03 14:33:06 UTC (rev 97) +++ trunk/src/shims/mach.c 2009-11-03 14:35:21 UTC (rev 98) @@ -35,6 +35,7 @@ return context; } +#ifndef DISPATCH_NO_LEGACY /* * Raw Mach message support */ @@ -64,4 +65,5 @@ return TRUE; } +#endif #endif /* HAVE_MACH */ Modified: trunk/src/source.c =================================================================== --- trunk/src/source.c 2009-11-03 14:33:06 UTC (rev 97) +++ trunk/src/source.c 2009-11-03 14:35:21 UTC (rev 98) @@ -27,6 +27,22 @@ #include "kevent_internal.h" +#ifdef DISPATCH_NO_LEGACY +enum { + DISPATCH_TIMER_WALL_CLOCK = 0x4, +}; +enum { + DISPATCH_TIMER_INTERVAL = 0x0, + DISPATCH_TIMER_ONESHOT = 0x1, + DISPATCH_TIMER_ABSOLUTE = 0x3, +}; +enum { + DISPATCH_MACHPORT_DEAD = 0x1, + DISPATCH_MACHPORT_RECV = 0x2, + DISPATCH_MACHPORT_DELETED = 0x4, +}; +#endif + #define DISPATCH_EVFILT_TIMER (-EVFILT_SYSCOUNT - 1) #define DISPATCH_EVFILT_CUSTOM_ADD (-EVFILT_SYSCOUNT - 2) #define DISPATCH_EVFILT_CUSTOM_OR (-EVFILT_SYSCOUNT - 3) @@ -739,7 +755,11 @@ } if (dispatch_assume(prev)) { if (ds->ds_handler_func) { - ds->ds_handler_func(ds->ds_handler_ctxt, ds); +#ifndef DISPATCH_NO_LEGACY + ((dispatch_source_handler_function_t)ds->ds_handler_func)(ds->ds_handler_ctxt, ds); +#else + ds->ds_handler_func(ds->ds_handler_ctxt); +#endif } } } @@ -1275,7 +1295,7 @@ ds->ds_is_legacy = true; - ds->ds_handler_func = handler; + ds->ds_handler_func = (dispatch_function_t)handler; ds->ds_handler_ctxt = context; if (attr && attr != DISPATCH_SOURCE_CREATE_SUSPENDED) { @@ -1303,7 +1323,7 @@ } // all legacy sources get a cancellation event on the normal event handler. - dispatch_source_handler_function_t func = ds->ds_handler_func; + dispatch_function_t func = ds->ds_handler_func; dispatch_source_handler_t block = ds->ds_handler_ctxt; void *ctxt = ds->ds_handler_ctxt; bool handler_is_block = ds->ds_handler_is_block; @@ -1315,7 +1335,7 @@ }); } else { ds->ds_cancel_handler = _dispatch_Block_copy(^{ - func(ctxt, ds); + ((dispatch_source_handler_function_t)func)(ctxt, ds); }); } #endif Modified: trunk/src/source_internal.h =================================================================== --- trunk/src/source_internal.h 2009-11-03 14:33:06 UTC (rev 97) +++ trunk/src/source_internal.h 2009-11-03 14:35:21 UTC (rev 98) @@ -67,7 +67,7 @@ char dq_label[8]; dispatch_kevent_t ds_dkev; - dispatch_source_handler_function_t ds_handler_func; + dispatch_function_t ds_handler_func; void *ds_handler_ctxt; void *ds_cancel_handler;

1 0

[97] trunk/config/config.h
by source_changes＠macosforge.org 03 Nov '09

03 Nov '09

Revision: 97 http://trac.macosforge.org/projects/libdispatch/changeset/97 Author: robert(a)fledge.watson.org Date: 2009-11-03 06:33:06 -0800 (Tue, 03 Nov 2009) Log Message: ----------- Regenerate config.h for Xcode build. Modified Paths: -------------- trunk/config/config.h Modified: trunk/config/config.h =================================================================== --- trunk/config/config.h 2009-11-03 14:30:37 UTC (rev 96) +++ trunk/config/config.h 2009-11-03 14:33:06 UTC (rev 97) @@ -116,6 +116,9 @@ /* Define to 1 if you have the <sys/types.h> header file. */ #define HAVE_SYS_TYPES_H 1 +/* Define to 1 if you have the <TargetConditionals.h> header file. */ +#define HAVE_TARGETCONDITIONALS_H 1 + /* Define to 1 if you have the <unistd.h> header file. */ #define HAVE_UNISTD_H 1

1 0

[96] trunk/configure.ac
by source_changes＠macosforge.org 03 Nov '09

03 Nov '09

Revision: 96 http://trac.macosforge.org/projects/libdispatch/changeset/96 Author: robert(a)fledge.watson.org Date: 2009-11-03 06:30:37 -0800 (Tue, 03 Nov 2009) Log Message: ----------- Add configure check for TargetConditionals.h. Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2009-11-03 14:21:13 UTC (rev 95) +++ trunk/configure.ac 2009-11-03 14:30:37 UTC (rev 96) @@ -137,7 +137,7 @@ # Checks for header files. # AC_HEADER_STDC -AC_CHECK_HEADERS([Availability.h pthread_machdep.h pthread_np.h malloc/malloc.h libkern/OSCrossEndian.h libkern/OSAtomic.h]) +AC_CHECK_HEADERS([Availability.h TargetConditionals.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

[95] trunk/testing
by source_changes＠macosforge.org 03 Nov '09

03 Nov '09

Revision: 95 http://trac.macosforge.org/projects/libdispatch/changeset/95 Author: robert(a)fledge.watson.org Date: 2009-11-03 06:21:13 -0800 (Tue, 03 Nov 2009) Log Message: ----------- Minor tweaks to easily ported tests: fix header inclusion. Modified Paths: -------------- trunk/testing/dispatch_after.c trunk/testing/dispatch_group.c trunk/testing/dispatch_priority.c Modified: trunk/testing/dispatch_after.c =================================================================== --- trunk/testing/dispatch_after.c 2009-11-03 14:19:53 UTC (rev 94) +++ trunk/testing/dispatch_after.c 2009-11-03 14:21:13 UTC (rev 95) @@ -23,7 +23,9 @@ #include <unistd.h> #include <stdlib.h> #include <assert.h> +#if HAVE_LIBKERN_OSATOMIC_H #include <libkern/OSAtomic.h> +#endif #include "dispatch_test.h" #include <Block.h> Modified: trunk/testing/dispatch_group.c =================================================================== --- trunk/testing/dispatch_group.c 2009-11-03 14:19:53 UTC (rev 94) +++ trunk/testing/dispatch_group.c 2009-11-03 14:21:13 UTC (rev 95) @@ -24,7 +24,9 @@ #include <stdio.h> #include <stdlib.h> #include <assert.h> +#if HAVE_LIBKERN_OSATOMIC_H #include <libkern/OSAtomic.h> +#endif #include "dispatch_test.h" Modified: trunk/testing/dispatch_priority.c =================================================================== --- trunk/testing/dispatch_priority.c 2009-11-03 14:19:53 UTC (rev 94) +++ trunk/testing/dispatch_priority.c 2009-11-03 14:21:13 UTC (rev 95) @@ -20,11 +20,14 @@ #include <stdio.h> #include <dispatch/dispatch.h> -#include <dispatch/queue_private.h> +#define __DISPATCH_INDIRECT__ +#include <src/queue_private.h> #include <unistd.h> #include <stdlib.h> #include <assert.h> +#if HAVE_TARGETCONDITIONALS_H #include <TargetConditionals.h> +#endif #include "dispatch_test.h"

1 0

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

03 Nov '09

Revision: 94 http://trac.macosforge.org/projects/libdispatch/changeset/94 Author: robert(a)fledge.watson.org Date: 2009-11-03 06:19:53 -0800 (Tue, 03 Nov 2009) Log Message: ----------- Fix up Makefile.am for testing tools, keep quickly-ported tests in the build list, and mark others for future porting/conditional builds. Modified Paths: -------------- trunk/testing/Makefile.am Modified: trunk/testing/Makefile.am =================================================================== --- trunk/testing/Makefile.am 2009-11-03 13:40:39 UTC (rev 93) +++ trunk/testing/Makefile.am 2009-11-03 14:19:53 UTC (rev 94) @@ -10,34 +10,43 @@ TESTS= \ dispatch_after \ dispatch_api \ - dispatch_apply \ dispatch_c99 \ dispatch_cascade \ - dispatch_cffd \ dispatch_debug \ - dispatch_drift \ dispatch_group \ dispatch_pingpong \ dispatch_priority \ - dispatch_proc \ dispatch_read \ - dispatch_readsync \ dispatch_sema \ - dispatch_starfish \ dispatch_timer_bit31 \ dispatch_timer_bit63 \ - dispatch_timer_set_time \ - queue_finalizer \ + queue_finalizer + +# +# XXX: By broken, we mean non-portable. We should instead test for the OS +# features they depend on, or port them as required. +# +BROKEN_TESTS= \ + dispatch_apply \ + dispatch_cffd \ + dispatch_drift \ + dispatch_proc \ + dispatch_readsync \ + dispatch_starfish \ + dispatch_timer_set_time + +BROKEN_TOOLS= \ + harness \ nsoperation noinst_PROGRAMS=$(TESTS) TOOLS= \ - harness \ - summary + summarize noinst_PROGRAMS+=$(TOOLS) +INCLUDES=-I$(top_builddir) -I$(top_srcdir) LDADD=libtest.la ../src/libdispatch.la CFLAGS=-Werror -Wall -DDISPATCH_NO_LEGACY $(MARCH_FLAGS) $(CBLOCKS_FLAGS)

1 0

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

03 Nov '09

Revision: 93 http://trac.macosforge.org/projects/libdispatch/changeset/93 Author: robert(a)fledge.watson.org Date: 2009-11-03 05:40:39 -0800 (Tue, 03 Nov 2009) Log Message: ----------- Basic automake build bits for the testing subtree. Modified Paths: -------------- trunk/testing/Makefile.am Modified: trunk/testing/Makefile.am =================================================================== --- trunk/testing/Makefile.am 2009-11-03 13:33:05 UTC (rev 92) +++ trunk/testing/Makefile.am 2009-11-03 13:40:39 UTC (rev 93) @@ -0,0 +1,43 @@ +# +# +# + +noinst_LTLIBRARIES=libtest.la + +libtest_la_SOURCES= \ + dispatch_test.c + +TESTS= \ + dispatch_after \ + dispatch_api \ + dispatch_apply \ + dispatch_c99 \ + dispatch_cascade \ + dispatch_cffd \ + dispatch_debug \ + dispatch_drift \ + dispatch_group \ + dispatch_pingpong \ + dispatch_priority \ + dispatch_proc \ + dispatch_read \ + dispatch_readsync \ + dispatch_sema \ + dispatch_starfish \ + dispatch_timer_bit31 \ + dispatch_timer_bit63 \ + dispatch_timer_set_time \ + queue_finalizer \ + nsoperation + +noinst_PROGRAMS=$(TESTS) + +TOOLS= \ + harness \ + summary + +noinst_PROGRAMS+=$(TOOLS) + +LDADD=libtest.la ../src/libdispatch.la +CFLAGS=-Werror -Wall -DDISPATCH_NO_LEGACY $(MARCH_FLAGS) $(CBLOCKS_FLAGS) +

1 0

[92] trunk/testing/dispatch_test.c
by source_changes＠macosforge.org 03 Nov '09

03 Nov '09

Revision: 92 http://trac.macosforge.org/projects/libdispatch/changeset/92 Author: robert(a)fledge.watson.org Date: 2009-11-03 05:33:05 -0800 (Tue, 03 Nov 2009) Log Message: ----------- waitpid(2) requires includes of sys/types.h and sys/wait.h on some platforms. Modified Paths: -------------- trunk/testing/dispatch_test.c Modified: trunk/testing/dispatch_test.c =================================================================== --- trunk/testing/dispatch_test.c 2009-11-02 23:27:56 UTC (rev 91) +++ trunk/testing/dispatch_test.c 2009-11-03 13:33:05 UTC (rev 92) @@ -1,3 +1,6 @@ +#include <sys/types.h> +#include <sys/wait.h> + #include <stdarg.h> #include <stdio.h> #include <stdlib.h>

1 0