November 2009 - libdispatch-changes

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

03 Nov '09

Revision: 111 http://trac.macosforge.org/projects/libdispatch/changeset/111 Author: robert(a)fledge.watson.org Date: 2009-11-03 09:47:11 -0800 (Tue, 03 Nov 2009) Log Message: ----------- Use portable _dispatch_absolute_time() instead of mach_absolute_time() in dispatch_starfish; connect to portable testing build. Modified Paths: -------------- trunk/testing/Makefile.am trunk/testing/dispatch_starfish.c Modified: trunk/testing/Makefile.am =================================================================== --- trunk/testing/Makefile.am 2009-11-03 17:01:05 UTC (rev 110) +++ trunk/testing/Makefile.am 2009-11-03 17:47:11 UTC (rev 111) @@ -27,6 +27,7 @@ dispatch_cascade \ dispatch_debug \ dispatch_priority \ + dispatch_starfish \ queue_finalizer TESTS+=$(BLOCKS_TESTS) @@ -38,7 +39,6 @@ BROKEN_TESTS= \ dispatch_cffd \ dispatch_proc \ - dispatch_starfish \ dispatch_timer_set_time BROKEN_TOOLS= \ Modified: trunk/testing/dispatch_starfish.c =================================================================== --- trunk/testing/dispatch_starfish.c 2009-11-03 17:01:05 UTC (rev 110) +++ trunk/testing/dispatch_starfish.c 2009-11-03 17:47:11 UTC (rev 111) @@ -18,13 +18,14 @@ * @APPLE_APACHE_LICENSE_HEADER_END@ */ -#include <mach/mach.h> -#include <mach/mach_time.h> #include <dispatch/dispatch.h> +#include "src/internal.h" #include <stdio.h> #include <stdlib.h> #include <assert.h> +#if HAVE_TARGETCONDITIONALS_H #include <TargetConditionals.h> +#endif #include "dispatch_test.h" @@ -40,7 +41,6 @@ static size_t lap_count_down = LAPS; static size_t count_down; static uint64_t start; -static mach_timebase_info_data_t tbi; static void do_test(void); @@ -55,10 +55,8 @@ return; } - delta = mach_absolute_time() - start; - delta *= tbi.numer; - delta /= tbi.denom; - math = delta; + delta = _dispatch_absolute_time() - start; + math = delta = _dispatch_convert_mach2nano(delta); math /= COUNT * COUNT * 2ul + COUNT * 2ul; printf("lap: %ld\n", lap_count_down); @@ -125,15 +123,11 @@ do_test(void) { size_t i; - kern_return_t kr; count_down = COUNT; - kr = mach_timebase_info(&tbi); - assert(kr == 0); + start = _dispatch_absolute_time(); - start = mach_absolute_time(); - for (i = 0; i < COUNT; i++) { char buf[1000]; snprintf(buf, sizeof(buf), "com.example.starfish-node#%ld", i);

1 0

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

03 Nov '09

Revision: 110 http://trac.macosforge.org/projects/libdispatch/changeset/110 Author: robert(a)fledge.watson.org Date: 2009-11-03 09:01:05 -0800 (Tue, 03 Nov 2009) Log Message: ----------- Access internal headers with "" rather than <> includes. Modified Paths: -------------- trunk/testing/dispatch_priority.c Modified: trunk/testing/dispatch_priority.c =================================================================== --- trunk/testing/dispatch_priority.c 2009-11-03 16:49:10 UTC (rev 109) +++ trunk/testing/dispatch_priority.c 2009-11-03 17:01:05 UTC (rev 110) @@ -21,7 +21,7 @@ #include <stdio.h> #include <dispatch/dispatch.h> #define __DISPATCH_INDIRECT__ -#include <src/queue_private.h> +#include "src/queue_private.h" #include <unistd.h> #include <stdlib.h> #include <assert.h>

1 0

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

03 Nov '09

Revision: 109 http://trac.macosforge.org/projects/libdispatch/changeset/109 Author: robert(a)fledge.watson.org Date: 2009-11-03 08:49:10 -0800 (Tue, 03 Nov 2009) Log Message: ----------- Add include of queue_private.h so that dispatch_readsync is portable. Modified Paths: -------------- trunk/testing/Makefile.am trunk/testing/dispatch_readsync.c Modified: trunk/testing/Makefile.am =================================================================== --- trunk/testing/Makefile.am 2009-11-03 16:36:18 UTC (rev 108) +++ trunk/testing/Makefile.am 2009-11-03 16:49:10 UTC (rev 109) @@ -15,6 +15,7 @@ dispatch_group \ dispatch_pingpong \ dispatch_read \ + dispatch_readsync \ dispatch_sema \ dispatch_timer_bit31 \ dispatch_timer_bit63 @@ -37,7 +38,6 @@ BROKEN_TESTS= \ dispatch_cffd \ dispatch_proc \ - dispatch_readsync \ dispatch_starfish \ dispatch_timer_set_time Modified: trunk/testing/dispatch_readsync.c =================================================================== --- trunk/testing/dispatch_readsync.c 2009-11-03 16:36:18 UTC (rev 108) +++ trunk/testing/dispatch_readsync.c 2009-11-03 16:49:10 UTC (rev 109) @@ -19,6 +19,8 @@ */ #include <dispatch/dispatch.h> +#define __DISPATCH_INDIRECT__ +#include "src/queue_private.h" #include <pthread.h> #include <stdio.h> #include <stdint.h>

1 0

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

03 Nov '09

Revision: 108 http://trac.macosforge.org/projects/libdispatch/changeset/108 Author: robert(a)fledge.watson.org Date: 2009-11-03 08:36:18 -0800 (Tue, 03 Nov 2009) Log Message: ----------- Remove non-portable header use and mark dispatch_drift as available on blocks-aware systems. Modified Paths: -------------- trunk/testing/Makefile.am trunk/testing/dispatch_drift.c Modified: trunk/testing/Makefile.am =================================================================== --- trunk/testing/Makefile.am 2009-11-03 16:18:18 UTC (rev 107) +++ trunk/testing/Makefile.am 2009-11-03 16:36:18 UTC (rev 108) @@ -11,6 +11,7 @@ BLOCKS_TESTS= \ dispatch_after \ dispatch_apply \ + dispatch_drift \ dispatch_group \ dispatch_pingpong \ dispatch_read \ @@ -35,7 +36,6 @@ # BROKEN_TESTS= \ dispatch_cffd \ - dispatch_drift \ dispatch_proc \ dispatch_readsync \ dispatch_starfish \ Modified: trunk/testing/dispatch_drift.c =================================================================== --- trunk/testing/dispatch_drift.c 2009-11-03 16:18:18 UTC (rev 107) +++ trunk/testing/dispatch_drift.c 2009-11-03 16:36:18 UTC (rev 108) @@ -19,7 +19,6 @@ */ #include <dispatch/dispatch.h> -#include <mach/mach_time.h> #include <sys/time.h> #include <math.h> #include <unistd.h>

1 0

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

03 Nov '09

Revision: 107 http://trac.macosforge.org/projects/libdispatch/changeset/107 Author: robert(a)fledge.watson.org Date: 2009-11-03 08:18:18 -0800 (Tue, 03 Nov 2009) Log Message: ----------- Use dispatch_atomic_inc() instead of Mac OS X atomic operations for dispatch_apply so that it is portable. Modified Paths: -------------- trunk/testing/Makefile.am trunk/testing/dispatch_apply.c Modified: trunk/testing/Makefile.am =================================================================== --- trunk/testing/Makefile.am 2009-11-03 15:35:44 UTC (rev 106) +++ trunk/testing/Makefile.am 2009-11-03 16:18:18 UTC (rev 107) @@ -10,6 +10,7 @@ if HAVE_BLOCKS BLOCKS_TESTS= \ dispatch_after \ + dispatch_apply \ dispatch_group \ dispatch_pingpong \ dispatch_read \ @@ -33,7 +34,6 @@ # features they depend on, or port them as required. # BROKEN_TESTS= \ - dispatch_apply \ dispatch_cffd \ dispatch_drift \ dispatch_proc \ Modified: trunk/testing/dispatch_apply.c =================================================================== --- trunk/testing/dispatch_apply.c 2009-11-03 15:35:44 UTC (rev 106) +++ trunk/testing/dispatch_apply.c 2009-11-03 16:18:18 UTC (rev 107) @@ -19,11 +19,11 @@ */ #include <dispatch/dispatch.h> +#include "src/hw_shims.h" #include <stdio.h> #include <unistd.h> #include <stdlib.h> #include <assert.h> -#include <libkern/OSAtomic.h> #include "dispatch_test.h" @@ -39,7 +39,7 @@ test_ptr_notnull("dispatch_get_concurrent_queue", queue); dispatch_apply(final, queue, ^(size_t i __attribute__((unused))) { - OSAtomicIncrement32(&count); + dispatch_atomic_inc(&count); }); test_long("count", count, final);

1 0

[106] trunk
by source_changes＠macosforge.org 03 Nov '09

03 Nov '09

Revision: 106 http://trac.macosforge.org/projects/libdispatch/changeset/106 Author: robert(a)fledge.watson.org Date: 2009-11-03 07:35:44 -0800 (Tue, 03 Nov 2009) Log Message: ----------- Only build blocks-based tests when we have a blocks-aware compiler. Modified Paths: -------------- trunk/m4/blocks.m4 trunk/testing/Makefile.am Modified: trunk/m4/blocks.m4 =================================================================== --- trunk/m4/blocks.m4 2009-11-03 15:07:39 UTC (rev 105) +++ trunk/m4/blocks.m4 2009-11-03 15:35:44 UTC (rev 106) @@ -54,8 +54,11 @@ ]) ]) CFLAGS="$saveCFLAGS" + have_cblocks=true ], [ CBLOCKS_FLAGS="" + have_cblocks=false ]) +AM_CONDITIONAL(HAVE_BLOCKS, $have_cblocks) AC_SUBST([CBLOCKS_FLAGS]) ]) Modified: trunk/testing/Makefile.am =================================================================== --- trunk/testing/Makefile.am 2009-11-03 15:07:39 UTC (rev 105) +++ trunk/testing/Makefile.am 2009-11-03 15:35:44 UTC (rev 106) @@ -7,21 +7,27 @@ libtest_la_SOURCES= \ dispatch_test.c +if HAVE_BLOCKS +BLOCKS_TESTS= \ + dispatch_after \ + dispatch_group \ + dispatch_pingpong \ + dispatch_read \ + dispatch_sema \ + dispatch_timer_bit31 \ + dispatch_timer_bit63 +endif + TESTS= \ - dispatch_after \ dispatch_api \ dispatch_c99 \ dispatch_cascade \ dispatch_debug \ - dispatch_group \ - dispatch_pingpong \ dispatch_priority \ - dispatch_read \ - dispatch_sema \ - dispatch_timer_bit31 \ - dispatch_timer_bit63 \ queue_finalizer +TESTS+=$(BLOCKS_TESTS) + # # XXX: By broken, we mean non-portable. We should instead test for the OS # features they depend on, or port them as required.

1 0

[105] trunk/src/internal.h
by source_changes＠macosforge.org 03 Nov '09

03 Nov '09

Revision: 105 http://trac.macosforge.org/projects/libdispatch/changeset/105 Author: robert(a)fledge.watson.org Date: 2009-11-03 07:07:39 -0800 (Tue, 03 Nov 2009) Log Message: ----------- Due to the way Xcode does include paths, #include "" rather than #include <> for libdispatch-local headers. Submitted by: Daniel A. Steffen <dsteffen(a)apple.com> Modified Paths: -------------- trunk/src/internal.h Modified: trunk/src/internal.h =================================================================== --- trunk/src/internal.h 2009-11-03 14:52:35 UTC (rev 104) +++ trunk/src/internal.h 2009-11-03 15:07:39 UTC (rev 105) @@ -32,16 +32,16 @@ #define __DISPATCH_BUILDING_DISPATCH__ #define __DISPATCH_INDIRECT__ -#include <dispatch/dispatch.h> -#include <dispatch/base.h> -#include <dispatch/time.h> -#include <dispatch/queue.h> -#include <dispatch/object.h> -#include <dispatch/source.h> -#include <dispatch/group.h> -#include <dispatch/semaphore.h> -#include <dispatch/once.h> -#include <dispatch/benchmark.h> +#include "dispatch/dispatch.h" +#include "dispatch/base.h" +#include "dispatch/time.h" +#include "dispatch/queue.h" +#include "dispatch/object.h" +#include "dispatch/source.h" +#include "dispatch/group.h" +#include "dispatch/semaphore.h" +#include "dispatch/once.h" +#include "dispatch/benchmark.h" /* private.h uses #include_next and must be included last to avoid picking * up installed headers. */

1 0

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

03 Nov '09

Revision: 104 http://trac.macosforge.org/projects/libdispatch/changeset/104 Author: robert(a)fledge.watson.org Date: 2009-11-03 06:52:35 -0800 (Tue, 03 Nov 2009) Log Message: ----------- Regenerate config.h for Xcode. Modified Paths: -------------- trunk/config/config.h Modified: trunk/config/config.h =================================================================== --- trunk/config/config.h 2009-11-03 14:51:08 UTC (rev 103) +++ trunk/config/config.h 2009-11-03 14:52:35 UTC (rev 104) @@ -4,9 +4,6 @@ /* Define to compile out legacy API */ /* #undef DISPATCH_NO_LEGACY */ -/* Define to 1 if you have the <Availability.h> header file. */ -#define HAVE_AVAILABILITY_H 1 - /* Define to 1 if you have the declaration of `CLOCK_MONOTONIC', and to 0 if you don't. */ #define HAVE_DECL_CLOCK_MONOTONIC 0

1 0

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

03 Nov '09

Revision: 103 http://trac.macosforge.org/projects/libdispatch/changeset/103 Author: robert(a)fledge.watson.org Date: 2009-11-03 06:51:08 -0800 (Tue, 03 Nov 2009) Log Message: ----------- Remove test for Availability.h, it is now included by public headers based on __APPLE__, but never by internal build bits. Suggested by: Kevin Van Vechten <kvv(a)apple.com> Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2009-11-03 14:48:40 UTC (rev 102) +++ trunk/configure.ac 2009-11-03 14:51:08 UTC (rev 103) @@ -137,7 +137,7 @@ # Checks for header files. # AC_HEADER_STDC -AC_CHECK_HEADERS([Availability.h TargetConditionals.h pthread_machdep.h pthread_np.h malloc/malloc.h libkern/OSCrossEndian.h libkern/OSAtomic.h]) +AC_CHECK_HEADERS([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

[102] trunk/src/internal.h
by source_changes＠macosforge.org 03 Nov '09

03 Nov '09

Revision: 102 http://trac.macosforge.org/projects/libdispatch/changeset/102 Author: robert(a)fledge.watson.org Date: 2009-11-03 06:48:40 -0800 (Tue, 03 Nov 2009) Log Message: ----------- Don't need to include Availability.h in internal.h as the public headers will already include it. Submitted by: Kevin Van Vechten <kvv(a)apple.com> Modified Paths: -------------- trunk/src/internal.h Modified: trunk/src/internal.h =================================================================== --- trunk/src/internal.h 2009-11-03 14:46:36 UTC (rev 101) +++ trunk/src/internal.h 2009-11-03 14:48:40 UTC (rev 102) @@ -32,10 +32,6 @@ #define __DISPATCH_BUILDING_DISPATCH__ #define __DISPATCH_INDIRECT__ -#if HAVE_AVAILABILITY_H -#include <Availability.h> -#endif - #include <dispatch/dispatch.h> #include <dispatch/base.h> #include <dispatch/time.h>

1 0