November 2009 - libdispatch-changes

[141] trunk/src/private.h
by source_changes＠macosforge.org 06 Nov '09

06 Nov '09

Revision: 141 http://trac.macosforge.org/projects/libdispatch/changeset/141 Author: robert(a)fledge.watson.org Date: 2009-11-06 14:28:01 -0800 (Fri, 06 Nov 2009) Log Message: ----------- Test HAVE_SYS_CDEFS_H before including cdefs.h in private headers. Submitted by: Joakim Johansson <jocke(a)tbricks.com> Modified Paths: -------------- trunk/src/private.h Modified: trunk/src/private.h =================================================================== --- trunk/src/private.h 2009-11-05 16:51:30 UTC (rev 140) +++ trunk/src/private.h 2009-11-06 22:28:01 UTC (rev 141) @@ -33,7 +33,9 @@ #include <mach/message.h> #endif #include <unistd.h> +#if HAVE_SYS_CDEFS_H #include <sys/cdefs.h> +#endif #include <pthread.h> #ifndef __DISPATCH_BUILDING_DISPATCH__

1 0

[140] trunk/man/Makefile.am
by source_changes＠macosforge.org 05 Nov '09

05 Nov '09

Revision: 140 http://trac.macosforge.org/projects/libdispatch/changeset/140 Author: robert(a)fledge.watson.org Date: 2009-11-05 08:51:30 -0800 (Thu, 05 Nov 2009) Log Message: ----------- Install man page symlinks by function name. Modified Paths: -------------- trunk/man/Makefile.am Modified: trunk/man/Makefile.am =================================================================== --- trunk/man/Makefile.am 2009-11-05 15:15:18 UTC (rev 139) +++ trunk/man/Makefile.am 2009-11-05 16:51:30 UTC (rev 140) @@ -16,3 +16,91 @@ dispatch_semaphore_create.3 \ dispatch_source_create.3 \ dispatch_time.3 + +# +# Install man page symlinks. Is there a better way to do this in automake? +# +install-data-hook: + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_after.3 dispatch_after_f.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_apply.3 dispatch_apply_f.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_async.3 dispatch_sync.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_async.3 dispatch_async_f.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_async.3 dispatch_sync_f.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_benchmark.3 dispatch_benchmark_f.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_group_create.3 dispatch_group_enter.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_group_create.3 dispatch_group_leave.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_group_create.3 dispatch_group_wait.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_group_create.3 dispatch_group_notify.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_group_create.3 dispatch_group_notify_f.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_group_create.3 dispatch_group_async.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_group_create.3 dispatch_group_async_f.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_object.3 dispatch_retain.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_object.3 dispatch_release.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_object.3 dispatch_suspend.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_object.3 dispacth_resume.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_object.3 dispatch_get_context.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_object.3 dispatch_set_context.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_object.3 dispatch_set_finalizer_f.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_once.3 dispatch_once_f.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_queue_create.3 dispatch_queue_get_label.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_queue_create.3 dispatch_get_current_queue.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_queue_create.3 dispatch_get_global_queue.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_queue_create.3 dispatch_get_main_queue.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_queue_create.3 dispatch_main.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_queue_create.3 dispatch_set_target_queue.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_semaphore_create.3 dispatch_semaphore_signal.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_semaphore_create.3 dispatch_semaphore_wait.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_source_create.3 dispatch_source_set_event_handler.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_source_create.3 dispatch_source_set_event_handler_f.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_source_create.3 dispatch_source_set_cancel_handler.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_source_create.3 dispatch_source_set_cancel_handler_f.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_source_create.3 dispatch_source_cancel.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_source_create.3 dispatch_source_testcancel.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_source_create.3 dispatch_source_get_handle.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_source_create.3 dispatch_source_get_mask.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_source_create.3 dispatch_source_get_data.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_source_create.3 dispatch_source_merge_data.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_source_create.3 dispatch_source_set_timer.3 + cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ + dispatch_time.3 dispatch_walltime.3 +

1 0

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

05 Nov '09

Revision: 139 http://trac.macosforge.org/projects/libdispatch/changeset/139 Author: robert(a)fledge.watson.org Date: 2009-11-05 07:15:18 -0800 (Thu, 05 Nov 2009) Log Message: ----------- Move 'nsec' definition into #if USE_MACH_SEM as it's no longer required with sem_timedwait(). Fix another instance of the sem_timedwait() return value checking bug. Modified Paths: -------------- trunk/src/semaphore.c Modified: trunk/src/semaphore.c =================================================================== --- trunk/src/semaphore.c 2009-11-05 10:34:37 UTC (rev 138) +++ trunk/src/semaphore.c 2009-11-05 15:15:18 UTC (rev 139) @@ -155,12 +155,12 @@ #if USE_MACH_SEM mach_timespec_t _timeout; kern_return_t kr; + uint64_t nsec; #endif #if USE_POSIX_SEM struct timespec _timeout; int ret; #endif - uint64_t nsec; long orig; again: @@ -440,12 +440,12 @@ #if USE_MACH_SEM mach_timespec_t _timeout; kern_return_t kr; + uint64_t nsec; #endif #if USE_POSIX_SEM struct timespec _timeout; int ret; #endif - uint64_t nsec; long orig; again: @@ -494,7 +494,8 @@ ret = slowpath(sem_timedwait(&dsema->dsema_sem, &_timeout)); } while (ret == -1 && errno == EINTR); - if (ret == 0 || errno != ETIMEDOUT) { + + if (!(ret == -1 && errno == ETIMEDOUT)) { DISPATCH_SEMAPHORE_VERIFY_RET(ret); break; }

1 0

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

05 Nov '09

Revision: 138 http://trac.macosforge.org/projects/libdispatch/changeset/138 Author: robert(a)fledge.watson.org Date: 2009-11-05 02:34:37 -0800 (Thu, 05 Nov 2009) Log Message: ----------- Build dispatch_priority2 variation on dispatch_priority. Modified Paths: -------------- trunk/testing/Makefile.am Modified: trunk/testing/Makefile.am =================================================================== --- trunk/testing/Makefile.am 2009-11-05 05:23:41 UTC (rev 137) +++ trunk/testing/Makefile.am 2009-11-05 10:34:37 UTC (rev 138) @@ -13,10 +13,13 @@ dispatch_cascade \ dispatch_debug \ dispatch_priority \ + dispatch_priority2 \ dispatch_starfish \ queue_finalizer dispatch_c99_CFLAGS=-std=c99 +dispatch_priority2_SOURCES=dispatch_priority.c +dispatch_priority2_CFLAGS=-DUSE_SET_TARGET_QUEUE=1 if HAVE_CBLOCKS CBLOCKS_TESTS= \

1 0

[137] trunk/dispatch
by source_changes＠macosforge.org 05 Nov '09

05 Nov '09

Revision: 137 http://trac.macosforge.org/projects/libdispatch/changeset/137 Author: kvv(a)apple.com Date: 2009-11-04 21:23:41 -0800 (Wed, 04 Nov 2009) Log Message: ----------- Use DISPATCH_EXPORT to set default symbol visibility. Modified Paths: -------------- trunk/dispatch/base.h trunk/dispatch/benchmark.h trunk/dispatch/group.h trunk/dispatch/object.h trunk/dispatch/once.h trunk/dispatch/queue.h trunk/dispatch/semaphore.h trunk/dispatch/source.h trunk/dispatch/time.h Modified: trunk/dispatch/base.h =================================================================== --- trunk/dispatch/base.h 2009-11-04 23:11:04 UTC (rev 136) +++ trunk/dispatch/base.h 2009-11-05 05:23:41 UTC (rev 137) @@ -110,4 +110,10 @@ #define DISPATCH_MALLOC #endif +#if __GNUC__ +#define DISPATCH_EXPORT extern __attribute__((visibility("default"))) +#else +#define DISPATCH_EXPORT extern #endif + +#endif Modified: trunk/dispatch/benchmark.h =================================================================== --- trunk/dispatch/benchmark.h 2009-11-04 23:11:04 UTC (rev 136) +++ trunk/dispatch/benchmark.h 2009-11-05 05:23:41 UTC (rev 137) @@ -68,13 +68,13 @@ */ #ifdef __BLOCKS__ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NONNULL2 DISPATCH_NOTHROW +DISPATCH_EXPORT DISPATCH_NONNULL2 DISPATCH_NOTHROW uint64_t dispatch_benchmark(size_t count, void (^block)(void)); #endif __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NONNULL3 DISPATCH_NOTHROW +DISPATCH_EXPORT DISPATCH_NONNULL3 DISPATCH_NOTHROW uint64_t dispatch_benchmark_f(size_t count, void *ctxt, void (*func)(void *)); Modified: trunk/dispatch/group.h =================================================================== --- trunk/dispatch/group.h 2009-11-04 23:11:04 UTC (rev 136) +++ trunk/dispatch/group.h 2009-11-05 05:23:41 UTC (rev 137) @@ -50,7 +50,7 @@ * The newly created group, or NULL on failure. */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_WARN_RESULT +DISPATCH_EXPORT DISPATCH_WARN_RESULT dispatch_group_t dispatch_group_create(void); @@ -79,7 +79,7 @@ */ #ifdef __BLOCKS__ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NONNULL_ALL +DISPATCH_EXPORT DISPATCH_NONNULL_ALL void dispatch_group_async(dispatch_group_t group, dispatch_queue_t queue, @@ -113,7 +113,7 @@ * dispatch_group_async_f(). */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NONNULL1 DISPATCH_NONNULL2 DISPATCH_NONNULL4 +DISPATCH_EXPORT DISPATCH_NONNULL1 DISPATCH_NONNULL2 DISPATCH_NONNULL4 void dispatch_group_async_f(dispatch_group_t group, dispatch_queue_t queue, @@ -156,7 +156,7 @@ * within the specified timeout) or non-zero on error (i.e. timed out). */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NONNULL_ALL +DISPATCH_EXPORT DISPATCH_NONNULL_ALL long dispatch_group_wait(dispatch_group_t group, dispatch_time_t timeout); @@ -192,7 +192,7 @@ */ #ifdef __BLOCKS__ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NONNULL_ALL +DISPATCH_EXPORT DISPATCH_NONNULL_ALL void dispatch_group_notify(dispatch_group_t group, dispatch_queue_t queue, @@ -222,7 +222,7 @@ * dispatch_group_notify_f(). */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NONNULL1 DISPATCH_NONNULL2 DISPATCH_NONNULL4 +DISPATCH_EXPORT DISPATCH_NONNULL1 DISPATCH_NONNULL2 DISPATCH_NONNULL4 void dispatch_group_notify_f(dispatch_group_t group, dispatch_queue_t queue, @@ -245,7 +245,7 @@ * The result of passing NULL in this parameter is undefined. */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NOTHROW DISPATCH_NONNULL_ALL +DISPATCH_EXPORT DISPATCH_NOTHROW DISPATCH_NONNULL_ALL void dispatch_group_enter(dispatch_group_t group); @@ -264,7 +264,7 @@ * The result of passing NULL in this parameter is undefined. */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NOTHROW DISPATCH_NONNULL_ALL +DISPATCH_EXPORT DISPATCH_NOTHROW DISPATCH_NONNULL_ALL void dispatch_group_leave(dispatch_group_t group); Modified: trunk/dispatch/object.h =================================================================== --- trunk/dispatch/object.h 2009-11-04 23:11:04 UTC (rev 136) +++ trunk/dispatch/object.h 2009-11-05 05:23:41 UTC (rev 137) @@ -41,12 +41,12 @@ * The message to log above and beyond the introspection. */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NONNULL2 DISPATCH_NOTHROW __attribute__((__format__(printf,2,3))) +DISPATCH_EXPORT DISPATCH_NONNULL2 DISPATCH_NOTHROW __attribute__((__format__(printf,2,3))) void dispatch_debug(dispatch_object_t object, const char *message, ...); __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NONNULL2 DISPATCH_NOTHROW __attribute__((__format__(printf,2,0))) +DISPATCH_EXPORT DISPATCH_NONNULL2 DISPATCH_NOTHROW __attribute__((__format__(printf,2,0))) void dispatch_debugv(dispatch_object_t object, const char *message, va_list ap); @@ -65,7 +65,7 @@ * The result of passing NULL in this parameter is undefined. */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NONNULL_ALL DISPATCH_NOTHROW +DISPATCH_EXPORT DISPATCH_NONNULL_ALL DISPATCH_NOTHROW void dispatch_retain(dispatch_object_t object); @@ -86,7 +86,7 @@ * The result of passing NULL in this parameter is undefined. */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NONNULL_ALL DISPATCH_NOTHROW +DISPATCH_EXPORT DISPATCH_NONNULL_ALL DISPATCH_NOTHROW void dispatch_release(dispatch_object_t object); @@ -103,7 +103,7 @@ * The context of the object; may be NULL. */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NONNULL_ALL DISPATCH_PURE DISPATCH_WARN_RESULT DISPATCH_NOTHROW +DISPATCH_EXPORT DISPATCH_NONNULL_ALL DISPATCH_PURE DISPATCH_WARN_RESULT DISPATCH_NOTHROW void * dispatch_get_context(dispatch_object_t object); @@ -121,7 +121,7 @@ * */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NOTHROW //DISPATCH_NONNULL1 +DISPATCH_EXPORT DISPATCH_NOTHROW //DISPATCH_NONNULL1 void dispatch_set_context(dispatch_object_t object, void *context); @@ -147,7 +147,7 @@ * context of the dispatch object at the time the finalizer call is made. */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NOTHROW //DISPATCH_NONNULL1 +DISPATCH_EXPORT DISPATCH_NOTHROW //DISPATCH_NONNULL1 void dispatch_set_finalizer_f(dispatch_object_t object, dispatch_function_t finalizer); @@ -171,7 +171,7 @@ * The result of passing NULL in this parameter is undefined. */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NONNULL_ALL DISPATCH_NOTHROW +DISPATCH_EXPORT DISPATCH_NONNULL_ALL DISPATCH_NOTHROW void dispatch_suspend(dispatch_object_t object); @@ -186,7 +186,7 @@ * The result of passing NULL in this parameter is undefined. */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NONNULL_ALL DISPATCH_NOTHROW +DISPATCH_EXPORT DISPATCH_NONNULL_ALL DISPATCH_NOTHROW void dispatch_resume(dispatch_object_t object); Modified: trunk/dispatch/once.h =================================================================== --- trunk/dispatch/once.h 2009-11-04 23:11:04 UTC (rev 136) +++ trunk/dispatch/once.h 2009-11-05 05:23:41 UTC (rev 137) @@ -56,7 +56,7 @@ */ #ifdef __BLOCKS__ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NONNULL_ALL DISPATCH_NOTHROW +DISPATCH_EXPORT DISPATCH_NONNULL_ALL DISPATCH_NOTHROW void dispatch_once(dispatch_once_t *predicate, dispatch_block_t block); #ifdef __GNUC__ @@ -65,7 +65,7 @@ #endif __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NONNULL1 DISPATCH_NONNULL3 DISPATCH_NOTHROW +DISPATCH_EXPORT DISPATCH_NONNULL1 DISPATCH_NONNULL3 DISPATCH_NOTHROW void dispatch_once_f(dispatch_once_t *predicate, void *context, void (*function)(void *)); #ifdef __GNUC__ Modified: trunk/dispatch/queue.h =================================================================== --- trunk/dispatch/queue.h 2009-11-04 23:11:04 UTC (rev 136) +++ trunk/dispatch/queue.h 2009-11-05 05:23:41 UTC (rev 137) @@ -143,7 +143,7 @@ */ #ifdef __BLOCKS__ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NONNULL_ALL DISPATCH_NOTHROW +DISPATCH_EXPORT DISPATCH_NONNULL_ALL DISPATCH_NOTHROW void dispatch_async(dispatch_queue_t queue, dispatch_block_t block); #endif @@ -173,7 +173,7 @@ * The result of passing NULL in this parameter is undefined. */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NONNULL1 DISPATCH_NONNULL3 DISPATCH_NOTHROW +DISPATCH_EXPORT DISPATCH_NONNULL1 DISPATCH_NONNULL3 DISPATCH_NOTHROW void dispatch_async_f(dispatch_queue_t queue, void *context, @@ -211,7 +211,7 @@ */ #ifdef __BLOCKS__ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NONNULL_ALL DISPATCH_NOTHROW +DISPATCH_EXPORT DISPATCH_NONNULL_ALL DISPATCH_NOTHROW void dispatch_sync(dispatch_queue_t queue, dispatch_block_t block); #endif @@ -239,7 +239,7 @@ * The result of passing NULL in this parameter is undefined. */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NONNULL1 DISPATCH_NONNULL3 DISPATCH_NOTHROW +DISPATCH_EXPORT DISPATCH_NONNULL1 DISPATCH_NONNULL3 DISPATCH_NOTHROW void dispatch_sync_f(dispatch_queue_t queue, void *context, @@ -272,7 +272,7 @@ */ #ifdef __BLOCKS__ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NONNULL_ALL DISPATCH_NOTHROW +DISPATCH_EXPORT DISPATCH_NONNULL_ALL DISPATCH_NOTHROW void dispatch_apply(size_t iterations, dispatch_queue_t queue, void (^block)(size_t)); #endif @@ -304,7 +304,7 @@ * The result of passing NULL in this parameter is undefined. */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NONNULL2 DISPATCH_NONNULL4 DISPATCH_NOTHROW +DISPATCH_EXPORT DISPATCH_NONNULL2 DISPATCH_NONNULL4 DISPATCH_NOTHROW void dispatch_apply_f(size_t iterations, dispatch_queue_t queue, void *context, @@ -326,7 +326,7 @@ * Returns the current queue. */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_PURE DISPATCH_WARN_RESULT DISPATCH_NOTHROW +DISPATCH_EXPORT DISPATCH_PURE DISPATCH_WARN_RESULT DISPATCH_NOTHROW dispatch_queue_t dispatch_get_current_queue(void); @@ -397,7 +397,7 @@ * Returns the requested global queue. */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_PURE DISPATCH_WARN_RESULT DISPATCH_NOTHROW +DISPATCH_EXPORT DISPATCH_PURE DISPATCH_WARN_RESULT DISPATCH_NOTHROW dispatch_queue_t dispatch_get_global_queue(long priority, unsigned long flags); @@ -426,7 +426,7 @@ * The newly created dispatch queue. */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_MALLOC DISPATCH_WARN_RESULT DISPATCH_NOTHROW +DISPATCH_EXPORT DISPATCH_MALLOC DISPATCH_WARN_RESULT DISPATCH_NOTHROW dispatch_queue_t dispatch_queue_create(const char *label, dispatch_queue_attr_t attr); @@ -444,7 +444,7 @@ * The label of the queue. The result may be NULL. */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NONNULL_ALL DISPATCH_PURE DISPATCH_WARN_RESULT DISPATCH_NOTHROW +DISPATCH_EXPORT DISPATCH_NONNULL_ALL DISPATCH_PURE DISPATCH_WARN_RESULT DISPATCH_NOTHROW const char * dispatch_queue_get_label(dispatch_queue_t queue); @@ -477,7 +477,7 @@ * The result of passing NULL in this parameter is undefined. */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NONNULL_ALL DISPATCH_NOTHROW +DISPATCH_EXPORT DISPATCH_NONNULL_ALL DISPATCH_NOTHROW void dispatch_set_target_queue(dispatch_object_t object, dispatch_queue_t queue); @@ -495,7 +495,7 @@ * main thread do not need to call dispatch_main(). */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NOTHROW DISPATCH_NORETURN +DISPATCH_EXPORT DISPATCH_NOTHROW DISPATCH_NORETURN void dispatch_main(void); @@ -523,7 +523,7 @@ */ #ifdef __BLOCKS__ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NONNULL2 DISPATCH_NONNULL3 DISPATCH_NOTHROW +DISPATCH_EXPORT DISPATCH_NONNULL2 DISPATCH_NONNULL3 DISPATCH_NOTHROW void dispatch_after(dispatch_time_t when, dispatch_queue_t queue, @@ -556,7 +556,7 @@ * The result of passing NULL in this parameter is undefined. */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NONNULL2 DISPATCH_NONNULL4 DISPATCH_NOTHROW +DISPATCH_EXPORT DISPATCH_NONNULL2 DISPATCH_NONNULL4 DISPATCH_NOTHROW void dispatch_after_f(dispatch_time_t when, dispatch_queue_t queue, Modified: trunk/dispatch/semaphore.h =================================================================== --- trunk/dispatch/semaphore.h 2009-11-04 23:11:04 UTC (rev 136) +++ trunk/dispatch/semaphore.h 2009-11-05 05:23:41 UTC (rev 137) @@ -56,7 +56,7 @@ * The newly created semaphore, or NULL on failure. */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_MALLOC DISPATCH_NOTHROW +DISPATCH_EXPORT DISPATCH_MALLOC DISPATCH_NOTHROW dispatch_semaphore_t dispatch_semaphore_create(long value); @@ -81,7 +81,7 @@ * Returns zero on success, or non-zero if the timeout occurred. */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NONNULL_ALL DISPATCH_NOTHROW +DISPATCH_EXPORT DISPATCH_NONNULL_ALL DISPATCH_NOTHROW long dispatch_semaphore_wait(dispatch_semaphore_t dsema, dispatch_time_t timeout); @@ -103,7 +103,7 @@ * returned. */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NONNULL_ALL DISPATCH_NOTHROW +DISPATCH_EXPORT DISPATCH_NONNULL_ALL DISPATCH_NOTHROW long dispatch_semaphore_signal(dispatch_semaphore_t dsema); Modified: trunk/dispatch/source.h =================================================================== --- trunk/dispatch/source.h 2009-11-04 23:11:04 UTC (rev 136) +++ trunk/dispatch/source.h 2009-11-05 05:23:41 UTC (rev 137) @@ -272,7 +272,7 @@ * The dispatch queue to which the event handler block will be submited. */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_MALLOC DISPATCH_NOTHROW +DISPATCH_EXPORT DISPATCH_MALLOC DISPATCH_NOTHROW dispatch_source_t dispatch_source_create(dispatch_source_type_t type, uintptr_t handle, @@ -294,7 +294,7 @@ */ #ifdef __BLOCKS__ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NONNULL1 DISPATCH_NOTHROW +DISPATCH_EXPORT DISPATCH_NONNULL1 DISPATCH_NOTHROW void dispatch_source_set_event_handler(dispatch_source_t source, dispatch_block_t handler); @@ -317,7 +317,7 @@ * The result of passing NULL in this parameter is undefined. */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NONNULL1 DISPATCH_NOTHROW +DISPATCH_EXPORT DISPATCH_NONNULL1 DISPATCH_NOTHROW void dispatch_source_set_event_handler_f(dispatch_source_t source, dispatch_function_t handler); @@ -351,7 +351,7 @@ */ #ifdef __BLOCKS__ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NONNULL1 DISPATCH_NOTHROW +DISPATCH_EXPORT DISPATCH_NONNULL1 DISPATCH_NOTHROW void dispatch_source_set_cancel_handler(dispatch_source_t source, dispatch_block_t cancel_handler); @@ -376,7 +376,7 @@ * context of the dispatch source at the time the handler call is made. */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NONNULL1 DISPATCH_NOTHROW +DISPATCH_EXPORT DISPATCH_NONNULL1 DISPATCH_NOTHROW void dispatch_source_set_cancel_handler_f(dispatch_source_t source, dispatch_function_t cancel_handler); @@ -404,7 +404,7 @@ * The result of passing NULL in this parameter is undefined. */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NONNULL_ALL DISPATCH_NOTHROW +DISPATCH_EXPORT DISPATCH_NONNULL_ALL DISPATCH_NOTHROW void dispatch_source_cancel(dispatch_source_t source); @@ -422,7 +422,7 @@ * Non-zero if canceled and zero if not canceled. */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NONNULL_ALL DISPATCH_NOTHROW +DISPATCH_EXPORT DISPATCH_NONNULL_ALL DISPATCH_NOTHROW long dispatch_source_testcancel(dispatch_source_t source); @@ -451,7 +451,7 @@ * DISPATCH_SOURCE_TYPE_WRITE: file descriptor (int) */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NONNULL_ALL DISPATCH_WARN_RESULT DISPATCH_PURE DISPATCH_NOTHROW +DISPATCH_EXPORT DISPATCH_NONNULL_ALL DISPATCH_WARN_RESULT DISPATCH_PURE DISPATCH_NOTHROW uintptr_t dispatch_source_get_handle(dispatch_source_t source); @@ -480,7 +480,7 @@ * DISPATCH_SOURCE_TYPE_WRITE: n/a */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NONNULL_ALL DISPATCH_WARN_RESULT DISPATCH_PURE DISPATCH_NOTHROW +DISPATCH_EXPORT DISPATCH_NONNULL_ALL DISPATCH_WARN_RESULT DISPATCH_PURE DISPATCH_NOTHROW unsigned long dispatch_source_get_mask(dispatch_source_t source); @@ -516,7 +516,7 @@ * DISPATCH_SOURCE_TYPE_WRITE: estimated buffer space available */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NONNULL_ALL DISPATCH_WARN_RESULT DISPATCH_PURE DISPATCH_NOTHROW +DISPATCH_EXPORT DISPATCH_NONNULL_ALL DISPATCH_WARN_RESULT DISPATCH_PURE DISPATCH_NOTHROW unsigned long dispatch_source_get_data(dispatch_source_t source); @@ -537,7 +537,7 @@ * and will not result in the submission of the event handler block. */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NONNULL_ALL DISPATCH_NOTHROW +DISPATCH_EXPORT DISPATCH_NONNULL_ALL DISPATCH_NOTHROW void dispatch_source_merge_data(dispatch_source_t source, unsigned long value); @@ -573,7 +573,7 @@ * all timers even when a leeway value of zero is specified. */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NONNULL_ALL DISPATCH_NOTHROW +DISPATCH_EXPORT DISPATCH_NONNULL_ALL DISPATCH_NOTHROW void dispatch_source_set_timer(dispatch_source_t source, dispatch_time_t start, Modified: trunk/dispatch/time.h =================================================================== --- trunk/dispatch/time.h 2009-11-04 23:11:04 UTC (rev 136) +++ trunk/dispatch/time.h 2009-11-05 05:23:41 UTC (rev 137) @@ -80,7 +80,7 @@ * A new dispatch_time_t. */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NOTHROW +DISPATCH_EXPORT DISPATCH_NOTHROW dispatch_time_t dispatch_time(dispatch_time_t when, int64_t delta); @@ -104,7 +104,7 @@ * A new dispatch_time_t. */ __OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA) -DISPATCH_NOTHROW +DISPATCH_EXPORT DISPATCH_NOTHROW dispatch_time_t dispatch_walltime(const struct timespec *when, int64_t delta);

1 0

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

04 Nov '09

Revision: 136 http://trac.macosforge.org/projects/libdispatch/changeset/136 Author: robert(a)fledge.watson.org Date: 2009-11-04 15:11:04 -0800 (Wed, 04 Nov 2009) Log Message: ----------- Refactor time mathematics in _dispatch_timeout_ts() to avoid overflowing timespec.tv_nsec. Modified Paths: -------------- trunk/src/time.c Modified: trunk/src/time.c =================================================================== --- trunk/src/time.c 2009-11-04 23:10:32 UTC (rev 135) +++ trunk/src/time.c 2009-11-04 23:11:04 UTC (rev 136) @@ -194,7 +194,7 @@ _dispatch_timeout_ts(dispatch_time_t when) { struct timespec ts_realtime; - uint64_t abstime; + uint64_t abstime, realtime; int ret; if (when == 0) { @@ -220,8 +220,10 @@ abstime = _dispatch_absolute_time(); ret = clock_gettime(CLOCK_REALTIME, &ts_realtime); (void)dispatch_assume_zero(ret); - ts_realtime.tv_sec += (when - abstime) / NSEC_PER_SEC; - ts_realtime.tv_nsec += (when - abstime) % NSEC_PER_SEC; + realtime = ts_realtime.tv_sec * NSEC_PER_SEC + ts_realtime.tv_nsec + + (when - abstime); + ts_realtime.tv_sec = realtime / NSEC_PER_SEC; + ts_realtime.tv_nsec = realtime % NSEC_PER_SEC; return (ts_realtime); } #endif

1 0

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

04 Nov '09

Revision: 135 http://trac.macosforge.org/projects/libdispatch/changeset/135 Author: robert(a)fledge.watson.org Date: 2009-11-04 15:10:32 -0800 (Wed, 04 Nov 2009) Log Message: ----------- Properly catch sem_timedwait() returning a failure with an errno != ETIMEDOUT. Modified Paths: -------------- trunk/src/semaphore.c Modified: trunk/src/semaphore.c =================================================================== --- trunk/src/semaphore.c 2009-11-04 22:55:16 UTC (rev 134) +++ trunk/src/semaphore.c 2009-11-04 23:10:32 UTC (rev 135) @@ -208,7 +208,7 @@ &_timeout)); } while (ret == -1 && errno == EINTR); - if (ret == -1 && errno != ETIMEDOUT) { + if (!(ret == -1 && errno == ETIMEDOUT)) { DISPATCH_SEMAPHORE_VERIFY_RET(ret); break; }

1 0

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

04 Nov '09

Revision: 134 http://trac.macosforge.org/projects/libdispatch/changeset/134 Author: robert(a)fledge.watson.org Date: 2009-11-04 14:55:16 -0800 (Wed, 04 Nov 2009) Log Message: ----------- Remove another debugging printf that snuck in. Modified Paths: -------------- trunk/src/time.c Modified: trunk/src/time.c =================================================================== --- trunk/src/time.c 2009-11-04 22:46:21 UTC (rev 133) +++ trunk/src/time.c 2009-11-04 22:55:16 UTC (rev 134) @@ -220,7 +220,6 @@ abstime = _dispatch_absolute_time(); ret = clock_gettime(CLOCK_REALTIME, &ts_realtime); (void)dispatch_assume_zero(ret); - printf("now is %d.%lu\n", ts_realtime.tv_sec, ts_realtime.tv_nsec); ts_realtime.tv_sec += (when - abstime) / NSEC_PER_SEC; ts_realtime.tv_nsec += (when - abstime) % NSEC_PER_SEC; return (ts_realtime);

1 0

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

04 Nov '09

Revision: 133 http://trac.macosforge.org/projects/libdispatch/changeset/133 Author: robert(a)fledge.watson.org Date: 2009-11-04 14:46:21 -0800 (Wed, 04 Nov 2009) Log Message: ----------- Remove debugging printf that snuck into the last commit. Modified Paths: -------------- trunk/src/time.c Modified: trunk/src/time.c =================================================================== --- trunk/src/time.c 2009-11-04 22:44:23 UTC (rev 132) +++ trunk/src/time.c 2009-11-04 22:46:21 UTC (rev 133) @@ -197,8 +197,6 @@ uint64_t abstime; int ret; - printf("_dispatch_timeout_ts: req %ld\n", (int64_t)when); - if (when == 0) { ret = clock_gettime(CLOCK_REALTIME, &ts_realtime); (void)dispatch_assume_zero(ret);

1 0

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

04 Nov '09

Revision: 132 http://trac.macosforge.org/projects/libdispatch/changeset/132 Author: robert(a)fledge.watson.org Date: 2009-11-04 14:44:23 -0800 (Wed, 04 Nov 2009) Log Message: ----------- Rework conversion of timeouts to sem_timedwait() arguments further: reintroduce tests for CLOCK_UPTIME/CLOCK_MONOTONIC, and restore using them for absolute times on non-Mac OS X systems; instead perform a more mature but more costly conversion when calculating a timeout. Perhaps we should cache the delta between our absolute clock and the realtime clock to avoid a clock read each time we calculate a timeout. This should re-eliminate the restriction that POSIX semaphores can't be used on systems where we use mach_absolute_time(). Modified Paths: -------------- trunk/configure.ac trunk/src/shims/time.h trunk/src/time.c Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2009-11-04 21:15:54 UTC (rev 131) +++ trunk/configure.ac 2009-11-04 22:44:23 UTC (rev 132) @@ -177,7 +177,8 @@ # # Find functions and declarations we care about. # -AC_CHECK_DECLS([CLOCK_REALTIME], [], [], [[#include <time.h>]]) +AC_CHECK_DECLS([CLOCK_UPTIME, CLOCK_MONOTONIC, 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/shims/time.h =================================================================== --- trunk/src/shims/time.h 2009-11-04 21:15:54 UTC (rev 131) +++ trunk/src/shims/time.h 2009-11-04 22:44:23 UTC (rev 132) @@ -43,7 +43,13 @@ struct timespec ts; int ret; - ret = clock_gettime(CLOCK_REALTIME, &ts); +#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 (void)dispatch_assume_zero(ret); /* XXXRW: Some kind of overflow detection needed? */ Modified: trunk/src/time.c =================================================================== --- trunk/src/time.c 2009-11-04 21:15:54 UTC (rev 131) +++ trunk/src/time.c 2009-11-04 22:44:23 UTC (rev 132) @@ -184,44 +184,47 @@ } #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; + struct timespec ts_realtime; + uint64_t abstime; int ret; + printf("_dispatch_timeout_ts: req %ld\n", (int64_t)when); + if (when == 0) { - when = _dispatch_absolute_time(); - ts.tv_sec = when / NSEC_PER_SEC; - ts.tv_nsec = when % NSEC_PER_SEC; - return (ts); + ret = clock_gettime(CLOCK_REALTIME, &ts_realtime); + (void)dispatch_assume_zero(ret); + return (ts_realtime); } 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); + ret = clock_gettime(CLOCK_REALTIME, &ts_realtime); + (void)dispatch_assume_zero(ret); + when = -(int64_t)when + ts_realtime.tv_sec * NSEC_PER_SEC + + ts_realtime.tv_nsec; + ts_realtime.tv_sec = when / NSEC_PER_SEC; + ts_realtime.tv_nsec = when % NSEC_PER_SEC; + return (ts_realtime); } /* - * 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. + * Rebase 'when': (when - abstime) + realtime. + * + * XXXRW: Should we cache this delta to avoid system calls? */ - ts.tv_sec = when / NSEC_PER_SEC; - ts.tv_nsec = when % NSEC_PER_SEC; - return (ts); + abstime = _dispatch_absolute_time(); + ret = clock_gettime(CLOCK_REALTIME, &ts_realtime); + (void)dispatch_assume_zero(ret); + printf("now is %d.%lu\n", ts_realtime.tv_sec, ts_realtime.tv_nsec); + ts_realtime.tv_sec += (when - abstime) / NSEC_PER_SEC; + ts_realtime.tv_nsec += (when - abstime) % NSEC_PER_SEC; + return (ts_realtime); } #endif

1 0