- libdispatch-dev - lists.macosforge.org

[PATCH] use libkqueue if sys/event.h is missing
by Mark Heily 18 Nov '09

18 Nov '09

Here is a patch that enables libdispatch to use libkqueue on platforms that do not support kqueue(2). I have made pretty good progress with libkqueue and the current sources are here: http://mark.heily.com/src/libkqueue/ diff -ru -x .svn ./configure.ac ../trunk.NEW/configure.ac --- ./configure.ac 2009-10-18 20:59:34.000000000 -0400 +++ ../trunk.NEW/configure.ac 2009-10-18 20:55:29.000000000 -0400 @@ -170,6 +170,17 @@ ) # +# Use either libkqueue or the native kqueue(2) system calls +# +AC_CHECK_HEADER([sys/event.h], + [use_libkqueue=false], + [AC_CHECK_HEADER([kqueue/sys/event.h], + use_libkqueue=true, + AC_MSG_ERROR("sys/event.h not found"))] +) +AM_CONDITIONAL(USE_LIBKQUEUE, $use_libkqueue) + +# # Find functions and declarations we care about. # AC_CHECK_DECLS([CLOCK_UPTIME, CLOCK_MONOTONIC], [], [], diff -ru -x .svn ./src/Makefile.am ../trunk.NEW/src/Makefile.am --- ./src/Makefile.am 2009-10-18 20:59:34.000000000 -0400 +++ ../trunk.NEW/src/Makefile.am 2009-10-18 21:03:54.000000000 -0400 @@ -16,6 +16,7 @@ time.c libdispatch_la_CFLAGS=-Wall +libdispatch_la_LIBADD= INCLUDES=-I$(top_builddir) -I$(top_srcdir) \ @APPLE_LIBC_SOURCE_PATH@ @APPLE_XNU_SOURCE_PATH@ @@ -27,7 +28,12 @@ endif if USE_LIBPTHREAD -libdispatch_la_LIBADD=-lpthread +libdispatch_la_LIBADD+= -lpthread +endif + +if USE_LIBKQUEUE +libdispatch_la_LIBADD+= -lkqueue +libdispatch_la_CFLAGS+= -I/usr/include/kqueue endif if USE_MIG

5 22

[PATCH 4/4]
by Mario Schwalbe 18 Nov '09

18 Nov '09

Hi, Standard versions of GCC don't define __unused. And LLVM/GCC doesn't define __block anymore. I don't know whether it is right to put it in testing/dispatch_test.h, but it at least affects all test applications at once. Together with the other patches I sent the last days, this is everything required to compile and use libdispatch on Linux (with the exception of queue_finalizer due to arc4random). ciao, Mario Index: testing/dispatch_test.h =================================================================== --- testing/dispatch_test.h (Revision 171) +++ testing/dispatch_test.h (Arbeitskopie) @@ -1,5 +1,18 @@ #include <errno.h> +/* standard GCC and LLVM/GCC don't define __unused by default */ +#ifndef __unused + #define __unused __attribute__((__unused__)) +#endif + +/* standard LLVM/GCC doesn't define __block by default, because + * used as a parameter name in include/c++/4.2.1/ext/mt_allocator.h as well */ +#if __BLOCKS__ + #ifndef __block + #define __block __attribute__((__blocks__(byref))) + #endif +#endif + __BEGIN_DECLS void test_start(const char* desc);

1 0

[PATCH 3/4] add blocks headers to libshims
by Mario Schwalbe 18 Nov '09

18 Nov '09

Hi, libshims also needs the blocks headers in order to compile. ciao, Mario Index: src/Makefile.am =================================================================== --- src/Makefile.am (Revision 171) +++ src/Makefile.am (Arbeitskopie) @@ -26,6 +26,7 @@ @APPLE_LIBC_SOURCE_PATH@ @APPLE_XNU_SOURCE_PATH@ libdispatch_la_CFLAGS+=$(MARCH_FLAGS) $(CBLOCKS_FLAGS) $(KQUEUE_CFLAGS) +libshims_la_CFLAGS=$(CBLOCKS_FLAGS) if USE_LEGACY_API libdispatch_la_SOURCES+= \

1 0

[PATCH 1/4] specify headers of the blocks runtime at configure time
by Mario Schwalbe 18 Nov '09

18 Nov '09

Hi, If the blocks runtime isn't installed in standard paths, it's headers are missing as well. But --with-blocks-runtime doesn't add -I<path> to CFLAGS, so I added another option --with-blocks-include. Please note that the -I<path> option is added to CBLOCKS_FLAGS and CXXBLOCKS_FLAGS, because it seemed appropriate and can be reused for libshims.la and the testing directory. Please also note that this path must also be specified when checking whether additional libraries are required. Otherwise the check fails to add -lBlocksRuntime. But I cannot explain why, as the checked code fragment shouldn't need any headers at all. ciao, Mario Index: m4/blocks.m4 =================================================================== --- m4/blocks.m4 (Revision 171) +++ m4/blocks.m4 (Arbeitskopie) @@ -1,6 +1,18 @@ AC_DEFUN([DISPATCH_C_BLOCKS], [ # # Allow configure to be passed a path to the directory where it should look +# for the Blocks runtime headers, if any. +# +AC_ARG_WITH([blocks-include], + [AS_HELP_STRING([--with-blocks-include=PATH], + [Specify path to the blocks runtime include files])], + [blocks_include=${withval} + CBLOCKS_FLAGS="-I$blocks_include" + CXXBLOCKS_FLAGS="-I$blocks_include"] +) + +# +# Allow configure to be passed a path to the directory where it should look # for the Blocks runtime library, if any. # AC_ARG_WITH([blocks-runtime], @@ -27,7 +39,7 @@ ]) AS_IF([test "x$dispatch_cv_cblocks" != "xno"], [ - CBLOCKS_FLAGS="$dispatch_cv_cblocks" + CBLOCKS_FLAGS="$CBLOCKS_FLAGS $dispatch_cv_cblocks" # # It may be necessary to directly link the Blocks runtime on some @@ -36,7 +48,7 @@ # should force that linkage already. # saveCFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -fblocks" + CFLAGS="$CFLAGS $CBLOCKS_FLAGS" AC_MSG_CHECKING([whether additional libraries are required for the Blocks runtime]) AC_TRY_LINK([], [ ^{ int j; j=0; }(); @@ -80,10 +92,10 @@ ]) AS_IF([test "x$dispatch_cv_cxxblocks" != "xno"], [ - CXXBLOCKS_FLAGS="$dispatch_cv_cxxblocks" + CXXBLOCKS_FLAGS="$CXXBLOCKS_FLAGS $dispatch_cv_cxxblocks" saveCXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -fblocks" + CXXFLAGS="$CXXFLAGS $CXXBLOCKS_FLAGS" AC_MSG_CHECKING([whether additional libraries are required for the Blocks runtime]) AC_TRY_LINK([], [ ^{ int j; j=0; }();

1 0

Solaris portability, dispatch.h - PATCH [6/6]
by Joakim Johansson 17 Nov '09

17 Nov '09

There is a type mismatch here agin, pthread_t is not a pointer on Solaris, but an unsigned int, so we need a different formatting string. We also need to include additional headers. Joakim > svn diff internal.h Index: internal.h =================================================================== --- internal.h (revision 140) +++ internal.h (working copy) @@ -116,6 +119,8 @@ #include <string.h> #include <syslog.h> #include <unistd.h> +#include <limits.h> +#include <strings.h> #define DISPATCH_NOINLINE __attribute__((noinline)) @@ -225,6 +230,16 @@ /* Make sure the debug statments don't get too stale */ +/* pthread_t is an integer on Solaris, need a different formatting string */ +#if defined (__SVR4) && defined (__sun) +#define _dispatch_debug(x, args...) \ +({ \ + if (DISPATCH_DEBUG) { \ + _dispatch_log("libdispatch: %u\t%d\t" x, __LINE__, \ + _dispatch_thread_self(), ##args); \ + } \ +}) +#else #define _dispatch_debug(x, args...) \ ({ \ if (DISPATCH_DEBUG) { \ @@ -232,7 +247,7 @@ (void *)_dispatch_thread_self(), ##args); \ } \ }) - +#endif uint64_t _dispatch_get_nanoseconds(void);

3 5

[PATCH] testing/dispatch_test.c
by Mario Schwalbe 17 Nov '09

17 Nov '09

Hi, to get a prototype for apsintf in order to compile testing/dispatch_test.c on Linux. ciao, Mario Index: testing/dispatch_test.c =================================================================== --- testing/dispatch_test.c (Revision 165) +++ testing/dispatch_test.c (Arbeitskopie) @@ -4,6 +4,19 @@ #include <sys/wait.h> #include <stdarg.h> + +#if defined(__linux__) + /* needed to get a prototype for asprintf */ + #define __USE_GNU + /* + * __USE_GNU also enables a prototype for fopencookie using the type + * _IO_cookie_io_functions_t which is only defined in libio.h + * included with _GNU_SOURCE defined + */ + #define _GNU_SOURCE + #include <libio.h> +#endif + #include <stdio.h> #include <stdlib.h> #include <unistd.h>

2 3

libdispatch compiles under Linux but arc4random(3) is missing
by Mark Heily 17 Nov '09

17 Nov '09

Good news: libdispatch now compiles successfully under Linux using libkqueue r96 or higher. The test programs in the testing/ directory fail to link because arc4random(3) is not available on Linux. I found a compatibility function written for BIND that might work; the URI is: http://mirror.its.uidaho.edu/pub/netbsd/NetBSD-current/src/external/bsd/bin… See below for the actual code. Any objections to adding something like this to libdispatch? Regards, - Mark /* $NetBSD: random.c,v 1.1.1.1 2009/03/22 15:02:07 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ /* Id: random.c,v 1.25 2007/06/19 23:47:17 tbox Exp */ /*! \file */ #include <config.h> #include <stdlib.h> #include <time.h> /* Required for time(). */ #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif #ifdef HAVE_UNISTD_H #include <unistd.h> #endif #include <isc/mutex.h> #include <isc/once.h> #include <isc/random.h> #include <isc/string.h> #include <isc/util.h> static isc_once_t once = ISC_ONCE_INIT; static void initialize_rand(void) { #ifndef HAVE_ARC4RANDOM unsigned int pid = getpid(); /* * The low bits of pid generally change faster. * Xor them with the high bits of time which change slowly. */ pid = ((pid << 16) & 0xffff0000) | ((pid >> 16) & 0xffff); srand(time(NULL) ^ pid); #endif } static void initialize(void) { RUNTIME_CHECK(isc_once_do(&once, initialize_rand) == ISC_R_SUCCESS); } void isc_random_seed(isc_uint32_t seed) { initialize(); #ifndef HAVE_ARC4RANDOM srand(seed); #else arc4random_addrandom((u_char *) &seed, sizeof(isc_uint32_t)); #endif } void isc_random_get(isc_uint32_t *val) { REQUIRE(val != NULL); initialize(); #ifndef HAVE_ARC4RANDOM /* * rand()'s lower bits are not random. * rand()'s upper bit is zero. */ *val = ((rand() >> 4) & 0xffff) | ((rand() << 12) & 0xffff0000); #else *val = arc4random(); #endif } isc_uint32_t isc_random_jitter(isc_uint32_t max, isc_uint32_t jitter) { REQUIRE(jitter < max); if (jitter == 0) return (max); else #ifndef HAVE_ARC4RANDOM return (max - rand() % jitter); #else return (max - arc4random() % jitter); #endif }

6 6

typo on man/Makefile.am
by Rui Paulo 17 Nov '09

17 Nov '09

Hi, This should speak for itself. :-) Index: man/Makefile.am =================================================================== --- man/Makefile.am (revision 153) +++ man/Makefile.am (working copy) @@ -54,7 +54,7 @@ cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ dispatch_object.3 dispatch_suspend.3 cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ - dispatch_object.3 dispacth_resume.3 + dispatch_object.3 dispatch_resume.3 cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ dispatch_object.3 dispatch_get_context.3 cd $(DESTDIR)$(mandir)/man3 && $(LN_S) \ -- Rui Paulo

3 3

[PATCH] testing/summarize.c on Linux
by Mario Schwalbe 16 Nov '09

16 Nov '09

Hi, convert from fgetln (not available on Linux) to fgets. (this patch also removes whitespace on empty lines. sorry.) ciao, Mario Index: testing/summarize.c =================================================================== --- testing/summarize.c (Revision 165) +++ testing/summarize.c (Arbeitskopie) @@ -43,7 +43,7 @@ fprintf(stderr, "%s: usage: summarize\n", argv[0]); exit(1); } - + /* FILE* f = fopen(argv[1], "w"); if (f == NULL) { @@ -56,8 +56,8 @@ fprintf(f, "\n==================================================\n"); fprintf(f, "[SUMMARY] Test Summary\n"); fprintf(f, "==================================================\n\n"); - - size_t len; + + char buf[1024]; char* ln; long total = 0; long pass = 0; @@ -66,8 +66,8 @@ long total_pass = 0; long total_fail = 0; for(;;) { - ln = fgetln(stdin, &len); - //if (ln) fprintf(stdout, "%.*s", (int)len, ln); + ln = fgets(buf, sizeof(buf), stdin); + if (ln == NULL || has_prefix(ln, "[TEST]")) { if (total) { print_summary(f, total, pass, fail); @@ -79,7 +79,7 @@ pass = 0; fail = 0; if (ln) { - fprintf(f, "%.*s", (int)len, ln); + fprintf(f, "%s", ln); } else { fprintf(f, "[TOTAL]\n"); print_summary(f, total_total, total_pass, total_fail); @@ -93,6 +93,6 @@ ++fail; } } - + return (total_fail ? EXIT_FAILURE : EXIT_SUCCESS); }

1 0

PATCH - libdispatch.xcodeproj/project.pbxproj include missing source files to project
by Joakim Johansson 16 Nov '09

16 Nov '09

For convenience for those using Xcode; xxx_kevent.c, malloc_zone.h, etc. Joakim host:gcd/trunk/libdispatch.xcodeproj> svn diff Index: project.pbxproj =================================================================== --- project.pbxproj (revision 162) +++ project.pbxproj (working copy) @@ -12,6 +12,10 @@ 721F5C5D0F15520500FF03A6 /* semaphore.h in Headers */ = {isa = PBXBuildFile; fileRef = 721F5C5C0F15520500FF03A6 /* semaphore.h */; settings = {ATTRIBUTES = (Public, ); }; }; 721F5CCF0F15553500FF03A6 /* semaphore.c in Sources */ = {isa = PBXBuildFile; fileRef = 721F5CCE0F15553500FF03A6 /* semaphore.c */; }; 72CC94300ECCD8750031B751 /* base.h in Headers */ = {isa = PBXBuildFile; fileRef = 72CC942F0ECCD8750031B751 /* base.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 8543EE8010B18CE400B1048D /* queue_kevent.c in Sources */ = {isa = PBXBuildFile; fileRef = 8543EE7F10B18CE400B1048D /* queue_kevent.c */; }; + 8543EE8210B18CF400B1048D /* source_kevent.c in Sources */ = {isa = PBXBuildFile; fileRef = 8543EE8110B18CF400B1048D /* source_kevent.c */; }; + 85A41C3510B18DA400ED1D95 /* kevent_internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 85A41C3410B18DA400ED1D95 /* kevent_internal.h */; }; + 85A41C4010B18DEC00ED1D95 /* malloc_zone.h in Headers */ = {isa = PBXBuildFile; fileRef = 85A41C3F10B18DEC00ED1D95 /* malloc_zone.h */; }; 96032E4B0F5CC8C700241C5F /* time.c in Sources */ = {isa = PBXBuildFile; fileRef = 96032E4A0F5CC8C700241C5F /* time.c */; }; 96032E4D0F5CC8D100241C5F /* time.h in Headers */ = {isa = PBXBuildFile; fileRef = 96032E4C0F5CC8D100241C5F /* time.h */; settings = {ATTRIBUTES = (Public, ); }; }; 961B99360F3E83980006BC96 /* benchmark.h in Headers */ = {isa = PBXBuildFile; fileRef = 961B99350F3E83980006BC96 /* benchmark.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -55,6 +59,10 @@ 72CC940C0ECCD5720031B751 /* dispatch_object.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; name = dispatch_object.3; path = man/dispatch_object.3; sourceTree = "<group>"; }; 72CC940D0ECCD5720031B751 /* dispatch.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; name = dispatch.3; path = man/dispatch.3; sourceTree = "<group>"; }; 72CC942F0ECCD8750031B751 /* base.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = base.h; path = dispatch/base.h; sourceTree = "<group>"; }; + 8543EE7F10B18CE400B1048D /* queue_kevent.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = queue_kevent.c; path = src/queue_kevent.c; sourceTree = "<group>"; }; + 8543EE8110B18CF400B1048D /* source_kevent.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = source_kevent.c; path = src/source_kevent.c; sourceTree = "<group>"; }; + 85A41C3410B18DA400ED1D95 /* kevent_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = kevent_internal.h; path = src/kevent_internal.h; sourceTree = "<group>"; }; + 85A41C3F10B18DEC00ED1D95 /* malloc_zone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = malloc_zone.h; path = src/shims/malloc_zone.h; sourceTree = "<group>"; }; 96032E4A0F5CC8C700241C5F /* time.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = time.c; path = src/time.c; sourceTree = "<group>"; }; 96032E4C0F5CC8D100241C5F /* time.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = time.h; path = dispatch/time.h; sourceTree = "<group>"; }; 960F0E7D0F3FB232000D88BF /* dispatch_apply.3 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dispatch_apply.3; path = man/dispatch_apply.3; sourceTree = "<group>"; }; @@ -137,6 +145,8 @@ 96032E4A0F5CC8C700241C5F /* time.c */, 2EC9C9B70E8809EF00E2499A /* legacy.c */, FC7BED950E8361E600161930 /* protocol.defs */, + 8543EE7F10B18CE400B1048D /* queue_kevent.c */, + 8543EE8110B18CF400B1048D /* source_kevent.c */, FC18329D10992387003403D5 /* shims */, ); name = Source; @@ -182,6 +192,7 @@ FC1832A0109923B3003403D5 /* shims */ = { isa = PBXGroup; children = ( + 85A41C3F10B18DEC00ED1D95 /* malloc_zone.h */, FC1832A2109923C7003403D5 /* perfmon.h */, FC1832A3109923C7003403D5 /* time.h */, FC1832A4109923C7003403D5 /* tsd.h */, @@ -228,6 +239,7 @@ 96929D950F3EA2170041FF5D /* queue_internal.h */, 5A5D13AB0F6B280500197CC3 /* semaphore_internal.h */, FC0B34780FA2851C0080FFA0 /* source_internal.h */, + 85A41C3410B18DA400ED1D95 /* kevent_internal.h */, FC1832A0109923B3003403D5 /* shims */, ); name = "Project Headers"; @@ -265,6 +277,8 @@ FC1832A6109923C7003403D5 /* perfmon.h in Headers */, FC1832A7109923C7003403D5 /* time.h in Headers */, FC1832A8109923C7003403D5 /* tsd.h in Headers */, + 85A41C3510B18DA400ED1D95 /* kevent_internal.h in Headers */, + 85A41C4010B18DEC00ED1D95 /* malloc_zone.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -386,6 +400,8 @@ 96032E4B0F5CC8C700241C5F /* time.c in Sources */, FC18329F109923A7003403D5 /* mach.c in Sources */, E4BF990110A89607007655D0 /* time.c in Sources */, + 8543EE8010B18CE400B1048D /* queue_kevent.c in Sources */, + 8543EE8210B18CF400B1048D /* source_kevent.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };

1 0