November 2009 - libdispatch-dev - lists.macosforge.org

[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

[PATCH] conditional support for NOTE_REVOKE
by Mark Heily 16 Nov '09

16 Nov '09

Linux does not have the revoke(2) syscall, so libkqueue does not define NOTE_REVOKE and will probably never support it. The following patch allows libdispatch to conditionally support NOTE_REVOKE. - Mark Index: configure.ac =================================================================== --- configure.ac (revision 162) +++ configure.ac (working copy) @@ -185,7 +185,7 @@ # AC_CHECK_DECLS([CLOCK_UPTIME, CLOCK_MONOTONIC, CLOCK_REALTIME], [], [], [[#include <time.h>]]) -AC_CHECK_DECLS([EVFILT_LIO, EVFILT_SESSION, NOTE_NONE, NOTE_REAP, NOTE_SIGNAL], [], [], +AC_CHECK_DECLS([EVFILT_LIO, EVFILT_SESSION, NOTE_NONE, NOTE_REAP, NOTE_REVOKE, NOTE_SIGNAL], [], [], [[#include <sys/event.h>]]) AC_CHECK_DECLS([FD_COPY], [], [], [[#include <sys/select.h>]]) AC_CHECK_DECLS([SIGEMT], [], [], [[#include <signal.h>]]) Index: src/source_kevent.c =================================================================== --- src/source_kevent.c (revision 162) +++ src/source_kevent.c (working copy) @@ -693,7 +693,10 @@ const struct dispatch_source_type_s _dispatch_source_type_vnode = { .opaque = (void *)&_dispatch_source_type_vnode_ke, .mask = NOTE_DELETE|NOTE_WRITE|NOTE_EXTEND|NOTE_ATTRIB|NOTE_LINK| - NOTE_RENAME|NOTE_REVOKE + NOTE_RENAME +#if HAVE_DECL_NOTE_REVOKE + |NOTE_REVOKE +#endif #if HAVE_DECL_NOTE_NONE |NOTE_NONE #endif

2 1

Check for sys/sysctl.h PATCH
by Joakim Johansson 15 Nov '09

15 Nov '09

Not available on Solaris... Joakim > svn diff Index: configure.ac =================================================================== --- configure.ac (revision 159) +++ configure.ac (working copy) @@ -143,7 +143,7 @@ # Checks for header files. # AC_HEADER_STDC -AC_CHECK_HEADERS([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 sys/sysctl.h]) # # Core Services is tested in one of the GCD regression tests, so test for its Index: src/internal.h =================================================================== --- src/internal.h (revision 159) +++ src/internal.h (working copy) @@ -88,7 +88,9 @@ #include <sys/mount.h> #include <sys/queue.h> #include <sys/stat.h> +#if HAVE_SYS_SYSCTL_H #include <sys/sysctl.h> +#endif #include <sys/socket.h> #include <sys/time.h> #include <netinet/in.h>

2 1

[PATCH 3/4] remove last mention of struct kevent from "generic" code
by Paolo Bonzini 15 Nov '09

15 Nov '09

--- src/internal.h | 1 - src/source_internal.h | 2 +- src/source_kevent.c | 116 +++++++++++++++++++++++++++++-------------------- 3 files changed, 70 insertions(+), 49 deletions(-) diff --git a/src/internal.h b/src/internal.h index 56fa9c4..e34a42b 100644 --- a/src/internal.h +++ b/src/internal.h @@ -85,7 +85,6 @@ #if HAVE_MALLOC_MALLOC_H #include <malloc/malloc.h> #endif -#include <sys/event.h> #include <sys/mount.h> #include <sys/queue.h> #include <sys/stat.h> diff --git a/src/source_internal.h b/src/source_internal.h index 222a85d..3ea8d8d 100644 --- a/src/source_internal.h +++ b/src/source_internal.h @@ -116,7 +116,7 @@ struct kevent {}; #endif struct dispatch_source_type_s { - struct kevent ke; + void *opaque; uint64_t mask; bool (*init) (dispatch_source_t ds, dispatch_source_type_t type, diff --git a/src/source_kevent.c b/src/source_kevent.c index 0e1d34f..db54768 100644 --- a/src/source_kevent.c +++ b/src/source_kevent.c @@ -572,10 +572,10 @@ dispatch_source_merge_data(dispatch_source_t ds, unsigned long val) static bool dispatch_source_type_kevent_init (dispatch_source_t ds, dispatch_source_type_t type, uintptr_t handle, unsigned long mask, dispatch_queue_t q) { - const struct kevent *proto_kev = &type->ke; + const struct kevent *proto_kev = type->opaque; dispatch_kevent_t dk = NULL; - switch (type->ke.filter) { + switch (proto_kev->filter) { case EVFILT_SIGNAL: if (handle >= NSIG) { return false; @@ -629,35 +629,43 @@ static bool dispatch_source_type_timer_init (dispatch_source_t ds, dispatch_sour return true; } +static const struct kevent _dispatch_source_type_timer_ke = { + .filter = DISPATCH_EVFILT_TIMER, +}; + const struct dispatch_source_type_s _dispatch_source_type_timer = { - .ke = { - .filter = DISPATCH_EVFILT_TIMER, - }, + .opaque = (void *) &_dispatch_source_type_timer_ke, .mask = DISPATCH_TIMER_INTERVAL|DISPATCH_TIMER_ONESHOT|DISPATCH_TIMER_ABSOLUTE|DISPATCH_TIMER_WALL_CLOCK, .init = dispatch_source_type_timer_init, }; +static const struct kevent _dispatch_source_type_read_ke = { + .filter = EVFILT_READ, + .flags = EV_DISPATCH, +}; + const struct dispatch_source_type_s _dispatch_source_type_read = { - .ke = { - .filter = EVFILT_READ, - .flags = EV_DISPATCH, - }, + .opaque = (void *) &_dispatch_source_type_read_ke, .init = dispatch_source_type_kevent_init }; +static const struct kevent _dispatch_source_type_write_ke = { + .filter = EVFILT_WRITE, + .flags = EV_DISPATCH, +}; + const struct dispatch_source_type_s _dispatch_source_type_write = { - .ke = { - .filter = EVFILT_WRITE, - .flags = EV_DISPATCH, - }, + .opaque = (void *) &_dispatch_source_type_write_ke, .init = dispatch_source_type_kevent_init }; +static const struct kevent _dispatch_source_type_proc_ke = { + .filter = EVFILT_PROC, + .flags = EV_CLEAR, +}; + const struct dispatch_source_type_s _dispatch_source_type_proc = { - .ke = { - .filter = EVFILT_PROC, - .flags = EV_CLEAR, - }, + .opaque = (void *) &_dispatch_source_type_proc_ke, .mask = NOTE_EXIT|NOTE_FORK|NOTE_EXEC #if HAVE_DECL_NOTE_SIGNAL |NOTE_SIGNAL @@ -669,18 +677,22 @@ const struct dispatch_source_type_s _dispatch_source_type_proc = { .init = dispatch_source_type_kevent_init }; +static const struct kevent _dispatch_source_type_signal_ke = { + .filter = EVFILT_SIGNAL, +}; + const struct dispatch_source_type_s _dispatch_source_type_signal = { - .ke = { - .filter = EVFILT_SIGNAL, - }, + .opaque = (void *) &_dispatch_source_type_signal_ke, .init = dispatch_source_type_kevent_init }; +static const struct kevent _dispatch_source_type_vnode_ke = { + .filter = EVFILT_VNODE, + .flags = EV_CLEAR, +}; + const struct dispatch_source_type_s _dispatch_source_type_vnode = { - .ke = { - .filter = EVFILT_VNODE, - .flags = EV_CLEAR, - }, + .opaque = (void *) &_dispatch_source_type_vnode_ke, .mask = NOTE_DELETE|NOTE_WRITE|NOTE_EXTEND|NOTE_ATTRIB|NOTE_LINK| NOTE_RENAME|NOTE_REVOKE #if HAVE_DECL_NOTE_NONE @@ -690,11 +702,13 @@ const struct dispatch_source_type_s _dispatch_source_type_vnode = { .init = dispatch_source_type_kevent_init }; +static const struct kevent _dispatch_source_type_vfs_ke = { + .filter = EVFILT_FS, + .flags = EV_CLEAR, +}; + const struct dispatch_source_type_s _dispatch_source_type_vfs = { - .ke = { - .filter = EVFILT_FS, - .flags = EV_CLEAR, - }, + .opaque = (void *) &_dispatch_source_type_vfs_ke, .mask = VQ_NOTRESP|VQ_NEEDAUTH|VQ_LOWDISK|VQ_MOUNT|VQ_UNMOUNT|VQ_DEAD| VQ_ASSIST|VQ_NOTRESPLOCK #if HAVE_DECL_VQ_UPDATE @@ -722,12 +736,14 @@ dispatch_source_type_mach_send_init(dispatch_source_t ds, dispatch_source_type_t return true; } +static const struct kevent _dispatch_source_type_mach_send_ke = { + .filter = EVFILT_MACHPORT, + .flags = EV_DISPATCH, + .fflags = DISPATCH_MACHPORT_DEAD, +}; + const struct dispatch_source_type_s _dispatch_source_type_mach_send = { - .ke = { - .filter = EVFILT_MACHPORT, - .flags = EV_DISPATCH, - .fflags = DISPATCH_MACHPORT_DEAD, - }, + .opaque = (void *) &_dispatch_source_type_mach_send_ke, .mask = DISPATCH_MACH_SEND_DEAD, .init = dispatch_source_type_mach_send_init, }; @@ -742,30 +758,36 @@ dispatch_source_type_mach_recv_init(dispatch_source_t ds, dispatch_source_type_t return true; } +static const struct kevent _dispatch_source_type_mach_recv_ke = { + .filter = EVFILT_MACHPORT, + .flags = EV_DISPATCH, + .fflags = DISPATCH_MACHPORT_RECV, +}; + const struct dispatch_source_type_s _dispatch_source_type_mach_recv = { - .ke = { - .filter = EVFILT_MACHPORT, - .flags = EV_DISPATCH, - .fflags = DISPATCH_MACHPORT_RECV, - }, + .opaque = (void *) &_dispatch_source_type_mach_recv_ke, .init = dispatch_source_type_mach_recv_init, }; #endif +static const struct kevent _dispatch_source_type_data_add_ke = { + .filter = DISPATCH_EVFILT_CUSTOM_ADD, +}; + const struct dispatch_source_type_s _dispatch_source_type_data_add = { - .ke = { - .filter = DISPATCH_EVFILT_CUSTOM_ADD, - }, + .opaque = (void *) &_dispatch_source_type_data_add_ke, .init = dispatch_source_type_kevent_init, }; +static const struct kevent _dispatch_source_type_data_or_ke = { + .filter = DISPATCH_EVFILT_CUSTOM_OR, + .flags = EV_CLEAR, + .fflags = ~0, +}; + const struct dispatch_source_type_s _dispatch_source_type_data_or = { - .ke = { - .filter = DISPATCH_EVFILT_CUSTOM_OR, - .flags = EV_CLEAR, - .fflags = ~0, - }, - .init = dispatch_source_type_kevent_init + .opaque = (void *) &_dispatch_source_type_data_or_ke, + .init = dispatch_source_type_kevent_init, }; // Updates the ordered list of timers based on next fire date for changes to ds. -- 1.6.2.5

2 1