November 2009 - libdispatch-changes

[121] trunk/testing
by source_changes＠macosforge.org 04 Nov '09

04 Nov '09

Revision: 121 http://trac.macosforge.org/projects/libdispatch/changeset/121 Author: robert(a)fledge.watson.org Date: 2009-11-04 02:45:49 -0800 (Wed, 04 Nov 2009) Log Message: ----------- Condition building dispatch_timer_set_time on USE_LEGACY_API; we will rely on config.h in the testing code to detect system features. Modified Paths: -------------- trunk/testing/Makefile.am trunk/testing/dispatch_timer_set_time.c Modified: trunk/testing/Makefile.am =================================================================== --- trunk/testing/Makefile.am 2009-11-04 09:55:21 UTC (rev 120) +++ trunk/testing/Makefile.am 2009-11-04 10:45:49 UTC (rev 121) @@ -46,13 +46,16 @@ endif TESTS+=$(POSIX_SPAWN_START_SUSPENDED_TESTS) +if USE_LEGACY_API +LEGACY_TESTS= \ + dispatch_timer_set_time +endif +TESTS+=$(LEGACY_TESTS) + # # 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_timer_set_time - BROKEN_TOOLS= \ harness \ nsoperation @@ -66,5 +69,5 @@ INCLUDES=-I$(top_builddir) -I$(top_srcdir) LDADD=libtest.la ../src/libdispatch.la -CFLAGS=-Werror -Wall -DDISPATCH_NO_LEGACY $(MARCH_FLAGS) $(CBLOCKS_FLAGS) +CFLAGS=-Werror -Wall $(MARCH_FLAGS) $(CBLOCKS_FLAGS) Modified: trunk/testing/dispatch_timer_set_time.c =================================================================== --- trunk/testing/dispatch_timer_set_time.c 2009-11-04 09:55:21 UTC (rev 120) +++ trunk/testing/dispatch_timer_set_time.c 2009-11-04 10:45:49 UTC (rev 121) @@ -6,6 +6,9 @@ #include <dispatch/dispatch.h> +#define __DISPATCH_INDIRECT__ +#include "src/legacy.h" + #include "dispatch_test.h" int main(void)

1 0

[120] trunk/config/config.h
by source_changes＠macosforge.org 04 Nov '09

04 Nov '09

Revision: 120 http://trac.macosforge.org/projects/libdispatch/changeset/120 Author: robert(a)fledge.watson.org Date: 2009-11-04 01:55:21 -0800 (Wed, 04 Nov 2009) Log Message: ----------- Regenerate Xcode config.h following HAVE_DECL_POSIX_SPAWN_START_SUSPENDED and HAVE_LEAKS. Modified Paths: -------------- trunk/config/config.h Modified: trunk/config/config.h =================================================================== --- trunk/config/config.h 2009-11-04 09:51:37 UTC (rev 119) +++ trunk/config/config.h 2009-11-04 09:55:21 UTC (rev 120) @@ -32,6 +32,10 @@ don't. */ #define HAVE_DECL_NOTE_SIGNAL 1 +/* Define to 1 if you have the declaration of `POSIX_SPAWN_START_SUSPENDED', + and to 0 if you don't. */ +#define HAVE_DECL_POSIX_SPAWN_START_SUSPENDED 1 + /* Define to 1 if you have the declaration of `SIGEMT', and to 0 if you don't. */ #define HAVE_DECL_SIGEMT 1 @@ -50,6 +54,9 @@ /* Define to 1 if you have the <inttypes.h> header file. */ #define HAVE_INTTYPES_H 1 +/* Define if Apple leaks program is present */ +#define HAVE_LEAKS 1 + /* Define to 1 if you have the <libkern/OSAtomic.h> header file. */ #define HAVE_LIBKERN_OSATOMIC_H 1

1 0

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

04 Nov '09

Revision: 119 http://trac.macosforge.org/projects/libdispatch/changeset/119 Author: robert(a)fledge.watson.org Date: 2009-11-04 01:51:37 -0800 (Wed, 04 Nov 2009) Log Message: ----------- Build dispatch_c99 with -std=c99, but not -pedantic as found in Makefile.darwin as that appears non-portable currently. Modified Paths: -------------- trunk/testing/Makefile.am Modified: trunk/testing/Makefile.am =================================================================== --- trunk/testing/Makefile.am 2009-11-04 09:12:26 UTC (rev 118) +++ trunk/testing/Makefile.am 2009-11-04 09:51:37 UTC (rev 119) @@ -16,6 +16,8 @@ dispatch_starfish \ queue_finalizer +dispatch_c99_CFLAGS=-std=c99 + if HAVE_BLOCKS BLOCKS_TESTS= \ dispatch_after \

1 0

[118] trunk/configure.ac
by source_changes＠macosforge.org 04 Nov '09

04 Nov '09

Revision: 118 http://trac.macosforge.org/projects/libdispatch/changeset/118 Author: robert(a)fledge.watson.org Date: 2009-11-04 01:12:26 -0800 (Wed, 04 Nov 2009) Log Message: ----------- Use AC_PATH_PROG() for leaks detection rather than AC_CHECK_TARGET_TOOLS(), as that apparently didn't do what I thought it did. Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2009-11-04 00:39:30 UTC (rev 117) +++ trunk/configure.ac 2009-11-04 09:12:26 UTC (rev 118) @@ -115,7 +115,7 @@ AC_PROG_LIBTOOL AC_PATH_PROGS(MIG, mig) -AC_CHECK_TARGET_TOOLS(LEAKS, leaks) +AC_PATH_PROG(LEAKS, leaks) AS_IF([test "x$LEAKS" != "x"], [AC_DEFINE(HAVE_LEAKS, 1, [Define if Apple leaks program is present])] )

1 0

[117] trunk/testing/dispatch_starfish.c
by source_changes＠macosforge.org 04 Nov '09

04 Nov '09

Revision: 117 http://trac.macosforge.org/projects/libdispatch/changeset/117 Author: robert(a)fledge.watson.org Date: 2009-11-03 16:39:30 -0800 (Tue, 03 Nov 2009) Log Message: ----------- Use alternative format string for uint64_t to make printable on 32-bit. Modified Paths: -------------- trunk/testing/dispatch_starfish.c Modified: trunk/testing/dispatch_starfish.c =================================================================== --- trunk/testing/dispatch_starfish.c 2009-11-04 00:38:43 UTC (rev 116) +++ trunk/testing/dispatch_starfish.c 2009-11-04 00:39:30 UTC (rev 117) @@ -61,7 +61,7 @@ printf("lap: %ld\n", lap_count_down); printf("count: %lu\n", COUNT); - printf("delta: %llu ns\n", delta); + printf("delta: %ju ns\n", (uintmax_t)delta); printf("math: %Lf ns / lap\n", math); for (i = 0; i < COUNT; i++) {

1 0

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

04 Nov '09

Revision: 116 http://trac.macosforge.org/projects/libdispatch/changeset/116 Author: robert(a)fledge.watson.org Date: 2009-11-03 16:38:43 -0800 (Tue, 03 Nov 2009) Log Message: ----------- Test for Apple's "leaks" program; only use it in regression tests if present. Modified Paths: -------------- trunk/configure.ac trunk/testing/dispatch_test.c Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2009-11-03 23:12:32 UTC (rev 115) +++ trunk/configure.ac 2009-11-04 00:38:43 UTC (rev 116) @@ -115,6 +115,11 @@ AC_PROG_LIBTOOL AC_PATH_PROGS(MIG, mig) +AC_CHECK_TARGET_TOOLS(LEAKS, leaks) +AS_IF([test "x$LEAKS" != "x"], + [AC_DEFINE(HAVE_LEAKS, 1, [Define if Apple leaks program is present])] +) + AM_INIT_AUTOMAKE([foreign]) DISPATCH_C_ATOMIC_BUILTINS Modified: trunk/testing/dispatch_test.c =================================================================== --- trunk/testing/dispatch_test.c 2009-11-03 23:12:32 UTC (rev 115) +++ trunk/testing/dispatch_test.c 2009-11-04 00:38:43 UTC (rev 116) @@ -123,14 +123,17 @@ void test_stop_after_delay(void *delay) { +#if HAVE_LEAKS int res; pid_t pid; char pidstr[10]; +#endif if (delay != NULL) { sleep((int)(intptr_t)delay); } +#if HAVE_LEAKS if (getenv("NOLEAKS")) _exit(EXIT_SUCCESS); /* leaks doesn't work against debug variant malloc */ @@ -146,6 +149,6 @@ } else { perror(args[0]); } - +#endif _exit(EXIT_SUCCESS); }

1 0

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

03 Nov '09

Revision: 115 http://trac.macosforge.org/projects/libdispatch/changeset/115 Author: robert(a)fledge.watson.org Date: 2009-11-03 15:12:32 -0800 (Tue, 03 Nov 2009) Log Message: ----------- Fix POSIX_SPAWN_START_SUSPENDED checks. Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2009-11-03 22:49:45 UTC (rev 114) +++ trunk/configure.ac 2009-11-03 23:12:32 UTC (rev 115) @@ -181,8 +181,9 @@ AC_CHECK_FUNCS([pthread_key_init_np pthread_main_np mach_absolute_time malloc_create_zone]) AC_CHECK_DECLS([POSIX_SPAWN_START_SUSPENDED], - [have_posix_spawn_start_suspended=true] - [have_posix_spawn_start_suspended=false] + [have_posix_spawn_start_suspended=true], + [have_posix_spawn_start_suspended=false], + [[#include <sys/spawn.h>]] ) AM_CONDITIONAL(HAVE_POSIX_SPAWN_START_SUSPENDED, $have_posix_spawn_start_suspended)

1 0

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

03 Nov '09

Revision: 114 http://trac.macosforge.org/projects/libdispatch/changeset/114 Author: robert(a)fledge.watson.org Date: 2009-11-03 14:49:45 -0800 (Tue, 03 Nov 2009) Log Message: ----------- Add test for POSIX_SPAWN_START_SUSPENDED, and compile dispatch_proc test if found. Modified Paths: -------------- trunk/configure.ac trunk/testing/Makefile.am Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2009-11-03 20:31:16 UTC (rev 113) +++ trunk/configure.ac 2009-11-03 22:49:45 UTC (rev 114) @@ -180,6 +180,12 @@ AC_CHECK_DECLS([VQ_UPDATE, VQ_VERYLOWDISK], [], [], [[#include <sys/mount.h>]]) AC_CHECK_FUNCS([pthread_key_init_np pthread_main_np mach_absolute_time malloc_create_zone]) +AC_CHECK_DECLS([POSIX_SPAWN_START_SUSPENDED], + [have_posix_spawn_start_suspended=true] + [have_posix_spawn_start_suspended=false] +) +AM_CONDITIONAL(HAVE_POSIX_SPAWN_START_SUSPENDED, $have_posix_spawn_start_suspended) + AC_CHECK_FUNC([sem_init], [have_sem_init=true], [have_sem_init=false] Modified: trunk/testing/Makefile.am =================================================================== --- trunk/testing/Makefile.am 2009-11-03 20:31:16 UTC (rev 113) +++ trunk/testing/Makefile.am 2009-11-03 22:49:45 UTC (rev 114) @@ -38,12 +38,17 @@ endif TESTS+=$(CORESERVICES_TESTS) +if HAVE_POSIX_SPAWN_START_SUSPENDED +POSIX_SPAWN_START_SUSPENDED_TESTS= \ + dispatch_proc +endif +TESTS+=$(POSIX_SPAWN_START_SUSPENDED_TESTS) + # # 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_proc \ dispatch_timer_set_time BROKEN_TOOLS= \

1 0

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

03 Nov '09

Revision: 113 http://trac.macosforge.org/projects/libdispatch/changeset/113 Author: robert(a)fledge.watson.org Date: 2009-11-03 12:31:16 -0800 (Tue, 03 Nov 2009) Log Message: ----------- Remove unneeded references to OSAtomic.h. Modified Paths: -------------- trunk/testing/dispatch_after.c trunk/testing/dispatch_group.c Modified: trunk/testing/dispatch_after.c =================================================================== --- trunk/testing/dispatch_after.c 2009-11-03 20:28:17 UTC (rev 112) +++ trunk/testing/dispatch_after.c 2009-11-03 20:31:16 UTC (rev 113) @@ -23,9 +23,6 @@ #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 20:28:17 UTC (rev 112) +++ trunk/testing/dispatch_group.c 2009-11-03 20:31:16 UTC (rev 113) @@ -24,9 +24,6 @@ #include <stdio.h> #include <stdlib.h> #include <assert.h> -#if HAVE_LIBKERN_OSATOMIC_H -#include <libkern/OSAtomic.h> -#endif #include "dispatch_test.h"

1 0

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

03 Nov '09

Revision: 112 http://trac.macosforge.org/projects/libdispatch/changeset/112 Author: robert(a)fledge.watson.org Date: 2009-11-03 12:28:17 -0800 (Tue, 03 Nov 2009) Log Message: ----------- Test for Core Services, and if present, do compile dispatch_cffd regression test. Modified Paths: -------------- trunk/configure.ac trunk/testing/Makefile.am Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2009-11-03 17:47:11 UTC (rev 111) +++ trunk/configure.ac 2009-11-03 20:28:17 UTC (rev 112) @@ -140,6 +140,16 @@ AC_CHECK_HEADERS([TargetConditionals.h pthread_machdep.h pthread_np.h malloc/malloc.h libkern/OSCrossEndian.h libkern/OSAtomic.h]) # +# Core Services is tested in one of the GCD regression tests, so test for its +# presence using its header file. +# +AC_CHECK_HEADER([CoreServices/CoreServices.h], + [have_coreservices=true], + [have_coreservices=false] +) +AM_CONDITIONAL(HAVE_CORESERVICES, $have_coreservices) + +# # We use the availability of mach.h to decide whether to compile in all sorts # of Machisms, including using Mach ports as event sources, etc. # Modified: trunk/testing/Makefile.am =================================================================== --- trunk/testing/Makefile.am 2009-11-03 17:47:11 UTC (rev 111) +++ trunk/testing/Makefile.am 2009-11-03 20:28:17 UTC (rev 112) @@ -7,6 +7,15 @@ libtest_la_SOURCES= \ dispatch_test.c +TESTS= \ + dispatch_api \ + dispatch_c99 \ + dispatch_cascade \ + dispatch_debug \ + dispatch_priority \ + dispatch_starfish \ + queue_finalizer + if HAVE_BLOCKS BLOCKS_TESTS= \ dispatch_after \ @@ -20,24 +29,20 @@ dispatch_timer_bit31 \ dispatch_timer_bit63 endif +TESTS+=$(BLOCKS_TESTS) -TESTS= \ - dispatch_api \ - dispatch_c99 \ - dispatch_cascade \ - dispatch_debug \ - dispatch_priority \ - dispatch_starfish \ - queue_finalizer +if HAVE_CORESERVICES +CORESERVICES_TESTS= \ + dispatch_cffd +dispatch_cffd_LDFLAGS=-framework CoreFoundation +endif +TESTS+=$(CORESERVICES_TESTS) -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. # BROKEN_TESTS= \ - dispatch_cffd \ dispatch_proc \ dispatch_timer_set_time

1 0