Revision: 100 http://trac.macosforge.org/projects/libdispatch/changeset/100 Author: robert@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@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 *