February 2010 - libdispatch-changes

[188] trunk/src
by source_changes＠macosforge.org 18 Feb '10

18 Feb '10

Revision: 188 http://trac.macosforge.org/projects/libdispatch/changeset/188 Author: kvv(a)apple.com Date: 2010-02-18 00:12:34 -0800 (Thu, 18 Feb 2010) Log Message: ----------- test configure features with #if not #ifdef Modified Paths: -------------- trunk/src/shims/malloc_zone.h trunk/src/shims/time.h trunk/src/source_internal.h Modified: trunk/src/shims/malloc_zone.h =================================================================== --- trunk/src/shims/malloc_zone.h 2010-02-18 08:09:57 UTC (rev 187) +++ trunk/src/shims/malloc_zone.h 2010-02-18 08:12:34 UTC (rev 188) @@ -29,70 +29,62 @@ * Implement malloc zones as a simple wrapper around malloc(3) on systems * that don't support them. */ -#ifndef HAVE_MALLOC_CREATE_ZONE +#if !HAVE_MALLOC_CREATE_ZONE typedef void * malloc_zone_t; static inline malloc_zone_t * malloc_create_zone(size_t start_size, unsigned flags) { - - return ((void *)(-1)); + return ((malloc_zone_t *)(-1)); } static inline void malloc_destroy_zone(malloc_zone_t *zone) { - + /* No-op. */ } static inline malloc_zone_t * malloc_default_zone(void) { - - return ((void *)(-1)); + return ((malloc_zone_t *)(-1)); } static inline malloc_zone_t * malloc_zone_from_ptr(const void *ptr) { - - return ((void *)(-1)); + return ((malloc_zone_t *)(-1)); } static inline void * malloc_zone_malloc(malloc_zone_t *zone, size_t size) { - return (malloc(size)); } static inline void * malloc_zone_calloc(malloc_zone_t *zone, size_t num_items, size_t size) { - return (calloc(num_items, size)); } static inline void * malloc_zone_realloc(malloc_zone_t *zone, void *ptr, size_t size) { - return (realloc(ptr, size)); } static inline void malloc_zone_free(malloc_zone_t *zone, void *ptr) { - free(ptr); } static inline void malloc_set_zone_name(malloc_zone_t *zone, const char *name) { - /* No-op. */ } -#endif +#endif /* !HAVE_MALLOC_CREATE_ZONE */ #endif /* __DISPATCH_SHIMS_MALLOC_ZONE__ */ Modified: trunk/src/shims/time.h =================================================================== --- trunk/src/shims/time.h 2010-02-18 08:09:57 UTC (rev 187) +++ trunk/src/shims/time.h 2010-02-18 08:12:34 UTC (rev 188) @@ -50,7 +50,7 @@ _dispatch_host_time_data_s *const data = &_dispatch_host_time_data; dispatch_once_f(&data->pred, NULL, _dispatch_get_host_time_init); - return machtime * data->frac; + return (uint64_t)(machtime * data->frac); } static inline int64_t @@ -63,7 +63,7 @@ return nsec; } - long double big_tmp = nsec; + long double big_tmp = (long double)nsec; // Divide by tbi.numer/tbi.denom to convert nsec to Mach absolute time big_tmp /= data->frac; @@ -75,14 +75,16 @@ if (slowpath(big_tmp < INT64_MIN)) { return INT64_MIN; } - return big_tmp; + return (int64_t)big_tmp; } #endif static inline uint64_t _dispatch_absolute_time(void) { -#ifndef HAVE_MACH_ABSOLUTE_TIME +#if HAVE_MACH_ABSOLUTE_TIME + return mach_absolute_time(); +#else struct timespec ts; int ret; @@ -97,8 +99,6 @@ /* XXXRW: Some kind of overflow detection needed? */ return (ts.tv_sec * NSEC_PER_SEC + ts.tv_nsec); -#else - return mach_absolute_time(); #endif } Modified: trunk/src/source_internal.h =================================================================== --- trunk/src/source_internal.h 2010-02-18 08:09:57 UTC (rev 187) +++ trunk/src/source_internal.h 2010-02-18 08:12:34 UTC (rev 188) @@ -147,7 +147,7 @@ extern const struct dispatch_source_type_s _dispatch_source_type_vnode; extern const struct dispatch_source_type_s _dispatch_source_type_vfs; -#ifdef HAVE_MACH +#if HAVE_MACH extern const struct dispatch_source_type_s _dispatch_source_type_mach_send; extern const struct dispatch_source_type_s _dispatch_source_type_mach_recv; #endif

1 0

[187] trunk/src
by source_changes＠macosforge.org 18 Feb '10

18 Feb '10

Revision: 187 http://trac.macosforge.org/projects/libdispatch/changeset/187 Author: kvv(a)apple.com Date: 2010-02-18 00:09:57 -0800 (Thu, 18 Feb 2010) Log Message: ----------- protect transparent union use with __GNUC__ Modified Paths: -------------- trunk/src/internal.h trunk/src/object.c trunk/src/object_internal.h Modified: trunk/src/internal.h =================================================================== --- trunk/src/internal.h 2010-02-18 05:49:14 UTC (rev 186) +++ trunk/src/internal.h 2010-02-18 08:09:57 UTC (rev 187) @@ -137,8 +137,13 @@ #define NSEC_PER_USEC 1000ull /* I wish we had __builtin_expect_range() */ +#if __GNUC__ #define fastpath(x) ((typeof(x))__builtin_expect((long)(x), ~0l)) #define slowpath(x) ((typeof(x))__builtin_expect((long)(x), 0l)) +#else +#define fastpath(x) (x) +#define slowpath(x) (x) +#endif void _dispatch_bug(size_t line, long val) __attribute__((__noinline__)); void _dispatch_abort(size_t line, long val) __attribute__((__noinline__,__noreturn__)); @@ -215,8 +220,12 @@ } \ } while (0) +#if __GNUC__ +#define DO_CAST(x) ((struct dispatch_object_s *)(x)._do) +#else +#define DO_CAST(x) ((struct dispatch_object_s *)(x)) +#endif - #ifdef __BLOCKS__ dispatch_block_t _dispatch_Block_copy(dispatch_block_t block); void _dispatch_call_block_and_release(void *block); Modified: trunk/src/object.c =================================================================== --- trunk/src/object.c 2010-02-18 05:49:14 UTC (rev 186) +++ trunk/src/object.c 2010-02-18 08:09:57 UTC (rev 187) @@ -20,15 +20,14 @@ #include "internal.h" - void -dispatch_debug(dispatch_object_t dou, const char *msg, ...) +dispatch_debug(dispatch_object_t obj, const char *msg, ...) { va_list ap; va_start(ap, msg); - dispatch_debugv(dou._do, msg, ap); + dispatch_debugv(obj, msg, ap); va_end(ap); } @@ -39,8 +38,10 @@ char buf[4096]; size_t offs; - if (dou._do && dou._do->do_vtable->do_debug) { - offs = dx_debug(dou._do, buf, sizeof(buf)); + struct dispatch_object_s *obj = DO_CAST(dou); + + if (obj && obj->do_vtable->do_debug) { + offs = dx_debug(obj, buf, sizeof(buf)); } else { offs = snprintf(buf, sizeof(buf), "NULL vtable slot"); } @@ -53,10 +54,12 @@ void dispatch_retain(dispatch_object_t dou) { - if (dou._do->do_xref_cnt == DISPATCH_OBJECT_GLOBAL_REFCNT) { + struct dispatch_object_s *obj = DO_CAST(dou); + + if (obj->do_xref_cnt == DISPATCH_OBJECT_GLOBAL_REFCNT) { return; // global object } - if ((dispatch_atomic_inc(&dou._do->do_xref_cnt) - 1) == 0) { + if ((dispatch_atomic_inc(&obj->do_xref_cnt) - 1) == 0) { DISPATCH_CLIENT_CRASH("Resurrection of an object"); } } @@ -64,10 +67,12 @@ void _dispatch_retain(dispatch_object_t dou) { - if (dou._do->do_ref_cnt == DISPATCH_OBJECT_GLOBAL_REFCNT) { + struct dispatch_object_s *obj = DO_CAST(dou); + + if (obj->do_ref_cnt == DISPATCH_OBJECT_GLOBAL_REFCNT) { return; // global object } - if ((dispatch_atomic_inc(&dou._do->do_ref_cnt) - 1) == 0) { + if ((dispatch_atomic_inc(&obj->do_ref_cnt) - 1) == 0) { DISPATCH_CLIENT_CRASH("Resurrection of an object"); } } @@ -75,26 +80,28 @@ void dispatch_release(dispatch_object_t dou) { - typeof(dou._do->do_xref_cnt) oldval; + struct dispatch_object_s *obj = DO_CAST(dou); - if (dou._do->do_xref_cnt == DISPATCH_OBJECT_GLOBAL_REFCNT) { + unsigned int oldval; + + if (obj->do_xref_cnt == DISPATCH_OBJECT_GLOBAL_REFCNT) { return; } - oldval = dispatch_atomic_dec(&dou._do->do_xref_cnt) + 1; + oldval = dispatch_atomic_dec(&obj->do_xref_cnt) + 1; if (fastpath(oldval > 1)) { return; } if (oldval == 1) { - if (dou._do->do_vtable == (void*)&_dispatch_source_kevent_vtable) { - return _dispatch_source_xref_release(dou._ds); + if ((uintptr_t)obj->do_vtable == (uintptr_t)&_dispatch_source_kevent_vtable) { + return _dispatch_source_xref_release((dispatch_source_t)obj); } - if (slowpath(DISPATCH_OBJECT_SUSPENDED(dou._do))) { + if (slowpath(DISPATCH_OBJECT_SUSPENDED(obj))) { // Arguments for and against this assert are within 6705399 DISPATCH_CLIENT_CRASH("Release of a suspended object"); } - return _dispatch_release(dou._do); + return _dispatch_release(obj); } DISPATCH_CLIENT_CRASH("Over-release of an object"); } @@ -102,14 +109,16 @@ void _dispatch_dispose(dispatch_object_t dou) { - dispatch_queue_t tq = dou._do->do_targetq; - dispatch_function_t func = dou._do->do_finalizer; - void *ctxt = dou._do->do_ctxt; + struct dispatch_object_s *obj = DO_CAST(dou); - dou._do->do_vtable = (void *)0x200; + dispatch_queue_t tq = obj->do_targetq; + dispatch_function_t func = obj->do_finalizer; + void *ctxt = obj->do_ctxt; - free(dou._do); + obj->do_vtable = (struct dispatch_object_vtable_s *)0x200; + free(obj); + if (func && ctxt) { dispatch_async_f(tq, ctxt, func); } @@ -119,26 +128,28 @@ void _dispatch_release(dispatch_object_t dou) { - typeof(dou._do->do_ref_cnt) oldval; + struct dispatch_object_s *obj = DO_CAST(dou); - if (dou._do->do_ref_cnt == DISPATCH_OBJECT_GLOBAL_REFCNT) { + unsigned int oldval; + + if (obj->do_ref_cnt == DISPATCH_OBJECT_GLOBAL_REFCNT) { return; // global object } - oldval = dispatch_atomic_dec(&dou._do->do_ref_cnt) + 1; + oldval = dispatch_atomic_dec(&obj->do_ref_cnt) + 1; if (fastpath(oldval > 1)) { return; } if (oldval == 1) { - if (dou._do->do_next != DISPATCH_OBJECT_LISTLESS) { + if (obj->do_next != DISPATCH_OBJECT_LISTLESS) { DISPATCH_CRASH("release while enqueued"); } - if (dou._do->do_xref_cnt) { + if (obj->do_xref_cnt) { DISPATCH_CRASH("release while external references exist"); } - return dx_dispose(dou._do); + return dx_dispose(obj); } DISPATCH_CRASH("over-release"); } @@ -146,42 +157,61 @@ void * dispatch_get_context(dispatch_object_t dou) { - return dou._do->do_ctxt; + struct dispatch_object_s *obj = DO_CAST(dou); + + return obj->do_ctxt; } void dispatch_set_context(dispatch_object_t dou, void *context) { - if (dou._do->do_ref_cnt != DISPATCH_OBJECT_GLOBAL_REFCNT) { - dou._do->do_ctxt = context; + struct dispatch_object_s *obj = DO_CAST(dou); + + if (obj->do_ref_cnt != DISPATCH_OBJECT_GLOBAL_REFCNT) { + obj->do_ctxt = context; } } void dispatch_set_finalizer_f(dispatch_object_t dou, dispatch_function_t finalizer) { - dou._do->do_finalizer = finalizer; + struct dispatch_object_s *obj = DO_CAST(dou); + + obj->do_finalizer = finalizer; } void dispatch_suspend(dispatch_object_t dou) { - if (slowpath(dou._do->do_ref_cnt == DISPATCH_OBJECT_GLOBAL_REFCNT)) { + struct dispatch_object_s *obj = DO_CAST(dou); + + if (slowpath(obj->do_ref_cnt == DISPATCH_OBJECT_GLOBAL_REFCNT)) { return; } - dispatch_atomic_add(&dou._do->do_suspend_cnt, DISPATCH_OBJECT_SUSPEND_INTERVAL); + (void)dispatch_atomic_add(&obj->do_suspend_cnt, DISPATCH_OBJECT_SUSPEND_INTERVAL); } void dispatch_resume(dispatch_object_t dou) { - if (slowpath(dou._do->do_ref_cnt == DISPATCH_OBJECT_GLOBAL_REFCNT)) { + struct dispatch_object_s *obj = DO_CAST(dou); + + // Global objects cannot be suspended or resumed. This also has the + // side effect of saturating the suspend count of an object and + // guarding against resuming due to overflow. + if (slowpath(obj->do_ref_cnt == DISPATCH_OBJECT_GLOBAL_REFCNT)) { return; } - switch (dispatch_atomic_sub(&dou._do->do_suspend_cnt, DISPATCH_OBJECT_SUSPEND_INTERVAL) + DISPATCH_OBJECT_SUSPEND_INTERVAL) { + + // Switch on the previous value of the suspend count. If the previous + // value was a single suspend interval, the object should be resumed. + // If the previous value was less than the suspend interval, the object + // has been over-resumed. + switch (dispatch_atomic_sub(&obj->do_suspend_cnt, DISPATCH_OBJECT_SUSPEND_INTERVAL) + DISPATCH_OBJECT_SUSPEND_INTERVAL) { case DISPATCH_OBJECT_SUSPEND_INTERVAL: - _dispatch_wakeup(dou._do); + _dispatch_wakeup(obj); break; + case DISPATCH_OBJECT_SUSPEND_LOCK: case 0: DISPATCH_CLIENT_CRASH("Over-resume of an object"); break; @@ -193,6 +223,8 @@ size_t dispatch_object_debug_attr(dispatch_object_t dou, char* buf, size_t bufsiz) { + struct dispatch_object_s *obj = DO_CAST(dou); + return snprintf(buf, bufsiz, "refcnt = 0x%x, suspend_cnt = 0x%x, ", - dou._do->do_ref_cnt, dou._do->do_suspend_cnt); + obj->do_ref_cnt, obj->do_suspend_cnt); } Modified: trunk/src/object_internal.h =================================================================== --- trunk/src/object_internal.h 2010-02-18 05:49:14 UTC (rev 186) +++ trunk/src/object_internal.h 2010-02-18 08:09:57 UTC (rev 187) @@ -72,7 +72,7 @@ unsigned int do_suspend_cnt; \ struct dispatch_queue_s *do_targetq; \ void *do_ctxt; \ - void *do_finalizer + dispatch_function_t do_finalizer #define DISPATCH_OBJECT_GLOBAL_REFCNT (~0u) #define DISPATCH_OBJECT_SUSPEND_LOCK 1u // "word and bit" must be a power of two to be safely subtracted

1 0

[186] trunk/dispatch
by source_changes＠macosforge.org 18 Feb '10

18 Feb '10

Revision: 186 http://trac.macosforge.org/projects/libdispatch/changeset/186 Author: kvv(a)apple.com Date: 2010-02-17 21:49:14 -0800 (Wed, 17 Feb 2010) Log Message: ----------- define DISPATCH_FORMAT attribute guard define NSEC_PER_MSEC macro add DISPATCH_EXPORT to globals Modified Paths: -------------- trunk/dispatch/base.h trunk/dispatch/dispatch.h trunk/dispatch/object.h trunk/dispatch/queue.h trunk/dispatch/source.h trunk/dispatch/time.h Modified: trunk/dispatch/base.h =================================================================== --- trunk/dispatch/base.h 2010-02-18 05:44:47 UTC (rev 185) +++ trunk/dispatch/base.h 2010-02-18 05:49:14 UTC (rev 186) @@ -79,6 +79,7 @@ #define DISPATCH_PURE __attribute__((__pure__)) #define DISPATCH_WARN_RESULT __attribute__((__warn_unused_result__)) #define DISPATCH_MALLOC __attribute__((__malloc__)) +#define DISPATCH_FORMAT(...) __attribute__((__format__(__VA_ARGS__))) #else /*! @parseOnly */ #define DISPATCH_NORETURN @@ -108,6 +109,8 @@ #define DISPATCH_WARN_RESULT /*! @parseOnly */ #define DISPATCH_MALLOC +/*! @parseOnly */ +#define DISPATCH_FORMAT(...) #endif #if __GNUC__ Modified: trunk/dispatch/dispatch.h =================================================================== --- trunk/dispatch/dispatch.h 2010-02-18 05:44:47 UTC (rev 185) +++ trunk/dispatch/dispatch.h 2010-02-18 05:49:14 UTC (rev 186) @@ -25,15 +25,21 @@ #include <Availability.h> #include <TargetConditionals.h> #endif +#if HAVE_SYS_CDEFS_H +#include <sys/cdefs.h> +#endif #include <stddef.h> #include <stdint.h> #include <stdbool.h> #include <stdarg.h> +#if HAVE_UNISTD_H +#include <unistd.h> +#endif #if defined(__cplusplus) #define __DISPATCH_BEGIN_DECLS extern "C" { #define __DISPATCH_END_DECLS } -#else +#else #define __DISPATCH_BEGIN_DECLS #define __DISPATCH_END_DECLS #endif Modified: trunk/dispatch/object.h =================================================================== --- trunk/dispatch/object.h 2010-02-18 05:44:47 UTC (rev 185) +++ trunk/dispatch/object.h 2010-02-18 05:49:14 UTC (rev 186) @@ -41,12 +41,12 @@ * The message to log above and beyond the introspection. */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_EXPORT DISPATCH_NONNULL2 DISPATCH_NOTHROW __attribute__((__format__(printf,2,3))) +DISPATCH_EXPORT DISPATCH_NONNULL2 DISPATCH_NOTHROW DISPATCH_FORMAT(printf,2,3) void dispatch_debug(dispatch_object_t object, const char *message, ...); __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_EXPORT DISPATCH_NONNULL2 DISPATCH_NOTHROW __attribute__((__format__(printf,2,0))) +DISPATCH_EXPORT DISPATCH_NONNULL2 DISPATCH_NOTHROW DISPATCH_FORMAT(printf,2,0) void dispatch_debugv(dispatch_object_t object, const char *message, va_list ap); Modified: trunk/dispatch/queue.h =================================================================== --- trunk/dispatch/queue.h 2010-02-18 05:44:47 UTC (rev 185) +++ trunk/dispatch/queue.h 2010-02-18 05:49:14 UTC (rev 186) @@ -346,7 +346,7 @@ * the main thread before main() is called. */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -extern struct dispatch_queue_s _dispatch_main_q; +DISPATCH_EXPORT struct dispatch_queue_s _dispatch_main_q; #define dispatch_get_main_queue() (&_dispatch_main_q) /*! Modified: trunk/dispatch/source.h =================================================================== --- trunk/dispatch/source.h 2010-02-18 05:44:47 UTC (rev 185) +++ trunk/dispatch/source.h 2010-02-18 05:49:14 UTC (rev 186) @@ -73,7 +73,8 @@ */ #define DISPATCH_SOURCE_TYPE_DATA_ADD (&_dispatch_source_type_data_add) __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -extern const struct dispatch_source_type_s _dispatch_source_type_data_add; +DISPATCH_EXPORT +const struct dispatch_source_type_s _dispatch_source_type_data_add; /*! * @const DISPATCH_SOURCE_TYPE_DATA_OR @@ -85,7 +86,8 @@ */ #define DISPATCH_SOURCE_TYPE_DATA_OR (&_dispatch_source_type_data_or) __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -extern const struct dispatch_source_type_s _dispatch_source_type_data_or; +DISPATCH_EXPORT +const struct dispatch_source_type_s _dispatch_source_type_data_or; /*! * @const DISPATCH_SOURCE_TYPE_MACH_SEND @@ -96,7 +98,8 @@ */ #define DISPATCH_SOURCE_TYPE_MACH_SEND (&_dispatch_source_type_mach_send) __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -extern const struct dispatch_source_type_s _dispatch_source_type_mach_send; +DISPATCH_EXPORT +const struct dispatch_source_type_s _dispatch_source_type_mach_send; /*! * @const DISPATCH_SOURCE_TYPE_MACH_RECV @@ -106,7 +109,8 @@ */ #define DISPATCH_SOURCE_TYPE_MACH_RECV (&_dispatch_source_type_mach_recv) __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -extern const struct dispatch_source_type_s _dispatch_source_type_mach_recv; +DISPATCH_EXPORT +const struct dispatch_source_type_s _dispatch_source_type_mach_recv; /*! * @const DISPATCH_SOURCE_TYPE_PROC @@ -117,7 +121,8 @@ */ #define DISPATCH_SOURCE_TYPE_PROC (&_dispatch_source_type_proc) __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -extern const struct dispatch_source_type_s _dispatch_source_type_proc; +DISPATCH_EXPORT +const struct dispatch_source_type_s _dispatch_source_type_proc; /*! * @const DISPATCH_SOURCE_TYPE_READ @@ -128,7 +133,8 @@ */ #define DISPATCH_SOURCE_TYPE_READ (&_dispatch_source_type_read) __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -extern const struct dispatch_source_type_s _dispatch_source_type_read; +DISPATCH_EXPORT +const struct dispatch_source_type_s _dispatch_source_type_read; /*! * @const DISPATCH_SOURCE_TYPE_SIGNAL @@ -138,7 +144,8 @@ */ #define DISPATCH_SOURCE_TYPE_SIGNAL (&_dispatch_source_type_signal) __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -extern const struct dispatch_source_type_s _dispatch_source_type_signal; +DISPATCH_EXPORT +const struct dispatch_source_type_s _dispatch_source_type_signal; /*! * @const DISPATCH_SOURCE_TYPE_TIMER @@ -149,7 +156,8 @@ */ #define DISPATCH_SOURCE_TYPE_TIMER (&_dispatch_source_type_timer) __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -extern const struct dispatch_source_type_s _dispatch_source_type_timer; +DISPATCH_EXPORT +const struct dispatch_source_type_s _dispatch_source_type_timer; /*! * @const DISPATCH_SOURCE_TYPE_VNODE @@ -160,7 +168,8 @@ */ #define DISPATCH_SOURCE_TYPE_VNODE (&_dispatch_source_type_vnode) __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -extern const struct dispatch_source_type_s _dispatch_source_type_vnode; +DISPATCH_EXPORT +const struct dispatch_source_type_s _dispatch_source_type_vnode; /*! * @const DISPATCH_SOURCE_TYPE_WRITE @@ -171,7 +180,8 @@ */ #define DISPATCH_SOURCE_TYPE_WRITE (&_dispatch_source_type_write) __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -extern const struct dispatch_source_type_s _dispatch_source_type_write; +DISPATCH_EXPORT +const struct dispatch_source_type_s _dispatch_source_type_write; /*! * @enum dispatch_source_mach_send_flags_t Modified: trunk/dispatch/time.h =================================================================== --- trunk/dispatch/time.h 2010-02-18 05:44:47 UTC (rev 185) +++ trunk/dispatch/time.h 2010-02-18 05:49:14 UTC (rev 186) @@ -42,7 +42,11 @@ #ifdef NSEC_PER_USEC #undef NSEC_PER_USEC #endif +#ifdef NSEC_PER_MSEC +#undef NSEC_PER_MSEC +#endif #define NSEC_PER_SEC 1000000000ull +#define NSEC_PER_MSEC 1000000ull #define USEC_PER_SEC 1000000ull #define NSEC_PER_USEC 1000ull

1 0

[185] trunk/src
by source_changes＠macosforge.org 18 Feb '10

18 Feb '10

Revision: 185 http://trac.macosforge.org/projects/libdispatch/changeset/185 Author: kvv(a)apple.com Date: 2010-02-17 21:44:47 -0800 (Wed, 17 Feb 2010) Log Message: ----------- fix linkage for pthread keys Modified Paths: -------------- trunk/src/Makefile.am trunk/src/shims/tsd.h Added Paths: ----------- trunk/src/shims/tsd.c Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2010-02-18 05:25:17 UTC (rev 184) +++ trunk/src/Makefile.am 2010-02-18 05:44:47 UTC (rev 185) @@ -19,7 +19,8 @@ libshims_la_SOURCES= \ shims/mach.c \ - shims/time.c + shims/time.c \ + shims/tsd.c libdispatch_la_CFLAGS=-Wall INCLUDES=-I$(top_builddir) -I$(top_srcdir) \ Added: trunk/src/shims/tsd.c =================================================================== --- trunk/src/shims/tsd.c (rev 0) +++ trunk/src/shims/tsd.c 2010-02-18 05:44:47 UTC (rev 185) @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2010 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@ + */ + +#include "internal.h" + +#if !HAVE_PTHREAD_KEY_INIT_NP +pthread_key_t dispatch_queue_key; +pthread_key_t dispatch_sema4_key; +pthread_key_t dispatch_cache_key; +pthread_key_t dispatch_bcounter_key; +#endif Modified: trunk/src/shims/tsd.h =================================================================== --- trunk/src/shims/tsd.h 2010-02-18 05:25:17 UTC (rev 184) +++ trunk/src/shims/tsd.h 2010-02-18 05:44:47 UTC (rev 185) @@ -35,13 +35,13 @@ //__PTK_LIBDISPATCH_KEY4 //__PTK_LIBDISPATCH_KEY5 #else -pthread_key_t dispatch_queue_key; -pthread_key_t dispatch_sema4_key; -pthread_key_t dispatch_cache_key; -pthread_key_t dispatch_bcounter_key; +extern pthread_key_t dispatch_queue_key; +extern pthread_key_t dispatch_sema4_key; +extern pthread_key_t dispatch_cache_key; +extern pthread_key_t dispatch_bcounter_key; #endif -#ifdef USE_APPLE_TSD_OPTIMIZATIONS +#if USE_APPLE_TSD_OPTIMIZATIONS #define SIMULATE_5491082 1 #ifndef _PTHREAD_TSD_OFFSET #define _PTHREAD_TSD_OFFSET 0

1 0

[184] trunk/man
by source_changes＠macosforge.org 18 Feb '10

18 Feb '10

Revision: 184 http://trac.macosforge.org/projects/libdispatch/changeset/184 Author: kvv(a)apple.com Date: 2010-02-17 21:25:17 -0800 (Wed, 17 Feb 2010) Log Message: ----------- man page clarifications and typo fixes Modified Paths: -------------- trunk/man/dispatch_object.3 trunk/man/dispatch_queue_create.3 trunk/man/dispatch_source_create.3 Modified: trunk/man/dispatch_object.3 =================================================================== --- trunk/man/dispatch_object.3 2010-01-27 17:32:37 UTC (rev 183) +++ trunk/man/dispatch_object.3 2010-02-18 05:25:17 UTC (rev 184) @@ -79,15 +79,17 @@ a suspended state is undefined. .Sh CONTEXT POINTERS Dispatch queues and sources support supplemental context pointers. The value of -the context point may be retrieved and updated with +the context pointer may be retrieved and updated with .Fn dispatch_get_context and .Fn dispatch_set_context respectively. The .Fn dispatch_set_finalizer_f -specifies an optional per-object finalizer function to that is invoked -asynchronously when the last reference to the object is released. This gives the +specifies an optional per-object finalizer function that is invoked +asynchronously if the context pointer is not NULL when the last +reference to the object is released. +This gives the application an opportunity to free the context data associated with the object. .Pp The result of getting or setting the context of an object that is not a Modified: trunk/man/dispatch_queue_create.3 =================================================================== --- trunk/man/dispatch_queue_create.3 2010-01-27 17:32:37 UTC (rev 183) +++ trunk/man/dispatch_queue_create.3 2010-02-18 05:25:17 UTC (rev 184) @@ -200,6 +200,9 @@ .Fn dispatch_main . Blocks submitted to the main queue will be executed as part of the "common modes" of the application's main NSRunLoop or CFRunLoop. +However, blocks submitted to the main queue in applications using +.Fn dispatch_main +are not guaranteed to execute on the main thread. .Pp The dispatch framework is a pure C level API. As a result, it does not catch exceptions generated by higher level languages such as Objective-C or C++. Modified: trunk/man/dispatch_source_create.3 =================================================================== --- trunk/man/dispatch_source_create.3 2010-01-27 17:32:37 UTC (rev 183) +++ trunk/man/dispatch_source_create.3 2010-02-18 05:25:17 UTC (rev 184) @@ -175,7 +175,7 @@ need not be reentrant safe, as it is not resubmitted to the target .Fa queue until any prior invocation for that dispatch source has completed. -When the hander is set, the dispatch source will perform a +When the handler is set, the dispatch source will perform a .Fn Block_copy on the .Fa handler @@ -221,11 +221,11 @@ The data will be merged with the source's pending data via an atomic add or logic OR (based on the source's type), and the event handler block will be submitted to the source's target queue. The -.Fa mask -and .Fa data -are application defined. These sources have no +is application defined. These sources have no .Fa handle +or +.Fa mask and zero should be used. .Pp .Vt DISPATCH_SOURCE_TYPE_MACH_SEND

1 0