November 2009 - libdispatch-changes

[161] trunk/config/config.h
by source_changes＠macosforge.org 15 Nov '09

15 Nov '09

Revision: 161 http://trac.macosforge.org/projects/libdispatch/changeset/161 Author: robert(a)fledge.watson.org Date: 2009-11-15 13:55:02 -0800 (Sun, 15 Nov 2009) Log Message: ----------- Regenerate Snow Leopard configuration after recent configure.ac changes. Modified Paths: -------------- trunk/config/config.h Modified: trunk/config/config.h =================================================================== --- trunk/config/config.h 2009-11-15 21:53:40 UTC (rev 160) +++ trunk/config/config.h 2009-11-15 21:55:02 UTC (rev 161) @@ -16,6 +16,10 @@ don't. */ #define HAVE_DECL_CLOCK_UPTIME 0 +/* Define to 1 if you have the declaration of `EVFILT_LIO', and to 0 if you + don't. */ +#define HAVE_DECL_EVFILT_LIO 0 + /* Define to 1 if you have the declaration of `EVFILT_SESSION', and to 0 if you don't. */ #define HAVE_DECL_EVFILT_SESSION 1 @@ -115,12 +119,18 @@ /* Define to 1 if you have the <string.h> header file. */ #define HAVE_STRING_H 1 +/* Define to 1 if you have the `sysconf' function. */ +#define HAVE_SYSCONF 1 + /* Define to 1 if you have the <sys/cdefs.h> header file. */ #define HAVE_SYS_CDEFS_H 1 /* Define to 1 if you have the <sys/stat.h> header file. */ #define HAVE_SYS_STAT_H 1 +/* Define to 1 if you have the <sys/sysctl.h> header file. */ +#define HAVE_SYS_SYSCTL_H 1 + /* Define to 1 if you have the <sys/types.h> header file. */ #define HAVE_SYS_TYPES_H 1

1 0

[160] trunk
by source_changes＠macosforge.org 15 Nov '09

15 Nov '09

Revision: 160 http://trac.macosforge.org/projects/libdispatch/changeset/160 Author: robert(a)fledge.watson.org Date: 2009-11-15 13:53:40 -0800 (Sun, 15 Nov 2009) Log Message: ----------- Test for sys/sysctl.h before including. Submitted by: Joakim Johansson <jocke(a)tbricks.com> Modified Paths: -------------- trunk/configure.ac trunk/src/internal.h Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2009-11-15 13:13:45 UTC (rev 159) +++ trunk/configure.ac 2009-11-15 21:53:40 UTC (rev 160) @@ -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 Modified: trunk/src/internal.h =================================================================== --- trunk/src/internal.h 2009-11-15 13:13:45 UTC (rev 159) +++ trunk/src/internal.h 2009-11-15 21:53:40 UTC (rev 160) @@ -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>

1 0

[159] trunk
by source_changes＠macosforge.org 15 Nov '09

15 Nov '09

Revision: 159 http://trac.macosforge.org/projects/libdispatch/changeset/159 Author: robert(a)fledge.watson.org Date: 2009-11-15 05:13:45 -0800 (Sun, 15 Nov 2009) Log Message: ----------- Test for and support printing the name of EVFILT_LIO, a kqueue event source implemented on FreeBSD but not Mac OS X. Modified Paths: -------------- trunk/configure.ac trunk/src/source_kevent.c Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2009-11-15 12:26:16 UTC (rev 158) +++ trunk/configure.ac 2009-11-15 13:13:45 UTC (rev 159) @@ -179,7 +179,7 @@ # AC_CHECK_DECLS([CLOCK_UPTIME, CLOCK_MONOTONIC, CLOCK_REALTIME], [], [], [[#include <time.h>]]) -AC_CHECK_DECLS([EVFILT_SESSION, NOTE_NONE, NOTE_REAP, NOTE_SIGNAL], [], [], +AC_CHECK_DECLS([EVFILT_LIO, EVFILT_SESSION, NOTE_NONE, NOTE_REAP, NOTE_SIGNAL], [], [], [[#include <sys/event.h>]]) AC_CHECK_DECLS([FD_COPY], [], [], [[#include <sys/select.h>]]) AC_CHECK_DECLS([SIGEMT], [], [], [[#include <signal.h>]]) Modified: trunk/src/source_kevent.c =================================================================== --- trunk/src/source_kevent.c 2009-11-15 12:26:16 UTC (rev 158) +++ trunk/src/source_kevent.c 2009-11-15 13:13:45 UTC (rev 159) @@ -101,6 +101,9 @@ #if HAVE_DECL_EVFILT_SESSION _evfilt2(EVFILT_SESSION); #endif +#if HAVE_DECL_EVFILT_LIO + _evilt2(EVFILT_LIO); +#endif _evfilt2(DISPATCH_EVFILT_TIMER); _evfilt2(DISPATCH_EVFILT_CUSTOM_ADD);

1 0

[158] trunk/src
by source_changes＠macosforge.org 15 Nov '09

15 Nov '09

Revision: 158 http://trac.macosforge.org/projects/libdispatch/changeset/158 Author: robert(a)fledge.watson.org Date: 2009-11-15 04:26:16 -0800 (Sun, 15 Nov 2009) Log Message: ----------- Remove embedded struct kevent from struct dispatch_source_type_s, and replace with an opaque pointer, which source_kevent.c populates with statically allocated struct kevents. This removes the last remaining kqueue dependency from the generic source code. Minor differences from the submitted patch due to merge conflicts and slight style tweaks (no space between cast and pointer). Submitted by: Paolo Bonzini <bonzini(a)gnu.org> Modified Paths: -------------- trunk/src/internal.h trunk/src/source_internal.h trunk/src/source_kevent.c Modified: trunk/src/internal.h =================================================================== --- trunk/src/internal.h 2009-11-15 01:05:48 UTC (rev 157) +++ trunk/src/internal.h 2009-11-15 12:26:16 UTC (rev 158) @@ -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> Modified: trunk/src/source_internal.h =================================================================== --- trunk/src/source_internal.h 2009-11-15 01:05:48 UTC (rev 157) +++ trunk/src/source_internal.h 2009-11-15 12:26:16 UTC (rev 158) @@ -110,7 +110,7 @@ void _dispatch_timer_list_update(dispatch_source_t ds); struct dispatch_source_type_s { - struct kevent ke; + void *opaque; uint64_t mask; bool (*init) (dispatch_source_t ds, dispatch_source_type_t type, Modified: trunk/src/source_kevent.c =================================================================== --- trunk/src/source_kevent.c 2009-11-15 01:05:48 UTC (rev 157) +++ trunk/src/source_kevent.c 2009-11-15 12:26:16 UTC (rev 158) @@ -567,10 +567,10 @@ 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; @@ -625,35 +625,43 @@ 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 @@ -665,18 +673,22 @@ .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 @@ -686,11 +698,13 @@ .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 @@ -718,12 +732,14 @@ 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, }; @@ -738,29 +754,35 @@ 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, - }, + .opaque = (void *)&_dispatch_source_type_data_or_ke, .init = dispatch_source_type_kevent_init, };

1 0

[157] trunk/src
by source_changes＠macosforge.org 15 Nov '09

15 Nov '09

Revision: 157 http://trac.macosforge.org/projects/libdispatch/changeset/157 Author: kvv(a)apple.com Date: 2009-11-14 17:05:48 -0800 (Sat, 14 Nov 2009) Log Message: ----------- use HAVE_UNISTD_H test Modified Paths: -------------- trunk/src/internal.h trunk/src/private.h Modified: trunk/src/internal.h =================================================================== --- trunk/src/internal.h 2009-11-14 23:58:57 UTC (rev 156) +++ trunk/src/internal.h 2009-11-15 01:05:48 UTC (rev 157) @@ -115,7 +115,9 @@ #include <stdlib.h> #include <string.h> #include <syslog.h> +#if HAVE_UNISTD_H #include <unistd.h> +#endif #define DISPATCH_NOINLINE __attribute__((noinline)) Modified: trunk/src/private.h =================================================================== --- trunk/src/private.h 2009-11-14 23:58:57 UTC (rev 156) +++ trunk/src/private.h 2009-11-15 01:05:48 UTC (rev 157) @@ -32,7 +32,9 @@ #include <mach/mach.h> #include <mach/message.h> #endif +#if HAVE_UNISTD_H #include <unistd.h> +#endif #if HAVE_SYS_CDEFS_H #include <sys/cdefs.h> #endif

1 0

[156] trunk/src/queue.c
by source_changes＠macosforge.org 14 Nov '09

14 Nov '09

Revision: 156 http://trac.macosforge.org/projects/libdispatch/changeset/156 Author: kvv(a)apple.com Date: 2009-11-14 15:58:57 -0800 (Sat, 14 Nov 2009) Log Message: ----------- 10.6.2: Always run dispatch_sync blocks on the current thread to better support the thread-local garbage collector. <rdar://problem/7181849> Modified Paths: -------------- trunk/src/queue.c Modified: trunk/src/queue.c =================================================================== --- trunk/src/queue.c 2009-11-14 23:53:59 UTC (rev 155) +++ trunk/src/queue.c 2009-11-14 23:58:57 UTC (rev 156) @@ -716,8 +716,9 @@ } struct dispatch_barrier_sync_slow2_s { + dispatch_queue_t dbss2_dq; dispatch_function_t dbss2_func; - dispatch_function_t dbss2_ctxt; + dispatch_function_t dbss2_ctxt; dispatch_semaphore_t dbss2_sema; }; @@ -726,7 +727,13 @@ { struct dispatch_barrier_sync_slow2_s *dbss2 = ctxt; - dbss2->dbss2_func(dbss2->dbss2_ctxt); + dispatch_assert(dbss2->dbss2_dq == dispatch_get_current_queue()); + // ALL blocks on the main queue, must be run on the main thread + if (dbss2->dbss2_dq == dispatch_get_main_queue()) { + dbss2->dbss2_func(dbss2->dbss2_ctxt); + } else { + dispatch_suspend(dbss2->dbss2_dq); + } dispatch_semaphore_signal(dbss2->dbss2_sema); } @@ -734,9 +741,15 @@ static void _dispatch_barrier_sync_f_slow(dispatch_queue_t dq, void *ctxt, dispatch_function_t func) { + + // It's preferred to execute synchronous blocks on the current thread + // due to thread-local side effects, garbage collection, etc. However, + // blocks submitted to the main thread MUST be run on the main thread + struct dispatch_barrier_sync_slow2_s dbss2 = { + .dbss2_dq = dq, .dbss2_func = func, - .dbss2_ctxt = ctxt, + .dbss2_ctxt = ctxt, .dbss2_sema = _dispatch_get_thread_semaphore(), }; struct dispatch_barrier_sync_slow_s { @@ -746,17 +759,17 @@ .dc_func = _dispatch_barrier_sync_f_slow_invoke, .dc_ctxt = &dbss2, }; - + + dispatch_queue_t old_dq = _dispatch_thread_getspecific(dispatch_queue_key); _dispatch_queue_push(dq, (void *)&dbss); + dispatch_semaphore_wait(dbss2.dbss2_sema, DISPATCH_TIME_FOREVER); - while (dispatch_semaphore_wait(dbss2.dbss2_sema, dispatch_time(0, 3ull * NSEC_PER_SEC))) { - if (DISPATCH_OBJECT_SUSPENDED(dq)) { - continue; - } - if (_dispatch_queue_trylock(dq)) { - _dispatch_queue_drain(dq); - _dispatch_queue_unlock(dq); - } + if (dq != dispatch_get_main_queue()) { + _dispatch_thread_setspecific(dispatch_queue_key, dq); + func(ctxt); + _dispatch_workitem_inc(); + _dispatch_thread_setspecific(dispatch_queue_key, old_dq); + dispatch_resume(dq); } _dispatch_put_thread_semaphore(dbss2.dbss2_sema); } @@ -765,6 +778,13 @@ void dispatch_barrier_sync(dispatch_queue_t dq, void (^work)(void)) { + // Blocks submitted to the main queue MUST be run on the main thread, + // therefore we must Block_copy in order to notify the thread-local + // garbage collector that the objects are transferring to the main thread + if (dq == dispatch_get_main_queue()) { + dispatch_block_t block = Block_copy(work); + return dispatch_barrier_sync_f(dq, block, _dispatch_call_block_and_release); + } struct Block_basic *bb = (void *)work; dispatch_barrier_sync_f(dq, work, (dispatch_function_t)bb->Block_invoke);

1 0

[155] trunk/src
by source_changes＠macosforge.org 14 Nov '09

14 Nov '09

Revision: 155 http://trac.macosforge.org/projects/libdispatch/changeset/155 Author: kvv(a)apple.com Date: 2009-11-14 15:53:59 -0800 (Sat, 14 Nov 2009) Log Message: ----------- 10.6.2: Fix a performance regression in the dispatch_queue_pust_list fast path. <rdar://problem/7217227> Modified Paths: -------------- trunk/src/queue.c trunk/src/queue_internal.h Modified: trunk/src/queue.c =================================================================== --- trunk/src/queue.c 2009-11-14 21:24:14 UTC (rev 154) +++ trunk/src/queue.c 2009-11-14 23:53:59 UTC (rev 155) @@ -620,6 +620,22 @@ _dispatch_dispose(dq); } +DISPATCH_NOINLINE +void +_dispatch_queue_push_list_slow(dispatch_queue_t dq, struct dispatch_object_s *obj) +{ + // The queue must be retained before dq_items_head is written in order + // to ensure that the reference is still valid when _dispatch_wakeup is + // called. Otherwise, if preempted between the assignment to + // dq_items_head and _dispatch_wakeup, the blocks submitted to the + // queue may release the last reference to the queue when invoked by + // _dispatch_queue_drain. <rdar://problem/6932776> + _dispatch_retain(dq); + dq->dq_items_head = obj; + _dispatch_wakeup(dq); + _dispatch_release(dq); +} + DISPATCH_NOINLINE static void _dispatch_barrier_async_f_slow(dispatch_queue_t dq, void *context, dispatch_function_t func) Modified: trunk/src/queue_internal.h =================================================================== --- trunk/src/queue_internal.h 2009-11-14 21:24:14 UTC (rev 154) +++ trunk/src/queue_internal.h 2009-11-14 23:53:59 UTC (rev 155) @@ -95,6 +95,7 @@ void _dispatch_queue_init(dispatch_queue_t dq); void _dispatch_queue_drain(dispatch_queue_t dq); void _dispatch_queue_dispose(dispatch_queue_t dq); +void _dispatch_queue_push_list_slow(dispatch_queue_t dq, struct dispatch_object_s *obj); void _dispatch_queue_serial_drain_till_empty(dispatch_queue_t dq); void _dispatch_force_cache_cleanup(void); @@ -105,17 +106,14 @@ struct dispatch_object_s *prev, *head = _head._do, *tail = _tail._do; tail->do_next = NULL; - _dispatch_retain(dq); prev = fastpath(dispatch_atomic_xchg(&dq->dq_items_tail, tail)); if (prev) { // if we crash here with a value less than 0x1000, then we are at a known bug in client code // for example, see _dispatch_queue_dispose or _dispatch_atfork_child prev->do_next = head; } else { - dq->dq_items_head = head; - _dispatch_wakeup(dq); + _dispatch_queue_push_list_slow(dq, head); } - _dispatch_release(dq); } #define _dispatch_queue_push(x, y) _dispatch_queue_push_list((x), (y), (y))

1 0

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

14 Nov '09

Revision: 154 http://trac.macosforge.org/projects/libdispatch/changeset/154 Author: robert(a)fledge.watson.org Date: 2009-11-14 13:24:14 -0800 (Sat, 14 Nov 2009) Log Message: ----------- Fix typo in man page link for dispatch_resume.3. Submitted by: Rui Paulo <rpaulo(a)gmail.com> Modified Paths: -------------- trunk/man/Makefile.am Modified: trunk/man/Makefile.am =================================================================== --- trunk/man/Makefile.am 2009-11-14 16:53:08 UTC (rev 153) +++ trunk/man/Makefile.am 2009-11-14 21:24:14 UTC (rev 154) @@ -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) \

1 0

[153] trunk/src
by source_changes＠macosforge.org 14 Nov '09

14 Nov '09

Revision: 153 http://trac.macosforge.org/projects/libdispatch/changeset/153 Author: robert(a)fledge.watson.org Date: 2009-11-14 08:53:08 -0800 (Sat, 14 Nov 2009) Log Message: ----------- Complete separation of kqueue-specific portions of source.c into source_kevent.c. This differs from the submitted patch in the following ways: conflicts with another submitted patch resolved, house style adopted in some additional places, and __linux__ struct kevent definition removed. Submitted by: Paolo Bonzini <bonzini(a)gnu.org> Modified Paths: -------------- trunk/src/kevent_internal.h trunk/src/source.c trunk/src/source_internal.h trunk/src/source_kevent.c Modified: trunk/src/kevent_internal.h =================================================================== --- trunk/src/kevent_internal.h 2009-11-13 14:18:10 UTC (rev 152) +++ trunk/src/kevent_internal.h 2009-11-14 16:53:08 UTC (rev 153) @@ -28,6 +28,7 @@ #define __DISPATCH_KEVENT_INTERNAL__ #include <internal.h> +#include <sys/event.h> struct dispatch_kevent_s { TAILQ_ENTRY(dispatch_kevent_s) dk_list; @@ -35,11 +36,6 @@ struct kevent dk_kevent; }; -#define DISPATCH_EVFILT_TIMER (-EVFILT_SYSCOUNT - 1) -#define DISPATCH_EVFILT_CUSTOM_ADD (-EVFILT_SYSCOUNT - 2) -#define DISPATCH_EVFILT_CUSTOM_OR (-EVFILT_SYSCOUNT - 3) -#define DISPATCH_EVFILT_SYSCOUNT (EVFILT_SYSCOUNT + 3) - extern const struct dispatch_source_vtable_s _dispatch_source_kevent_vtable; #if DISPATCH_DEBUG Modified: trunk/src/source.c =================================================================== --- trunk/src/source.c 2009-11-13 14:18:10 UTC (rev 152) +++ trunk/src/source.c 2009-11-14 16:53:08 UTC (rev 153) @@ -25,8 +25,6 @@ #endif #include <sys/mount.h> -#include "kevent_internal.h" - #ifndef DISPATCH_NO_LEGACY struct dispatch_source_attr_vtable_s { DISPATCH_VTABLE_HEADER(dispatch_source_attr_s); @@ -392,50 +390,19 @@ unsigned long mask, dispatch_queue_t q) { - const struct kevent *proto_kev = &type->ke; dispatch_source_t ds = NULL; static char source_label[sizeof(ds->dq_label)] = "source"; - dispatch_kevent_t dk = NULL; // input validation if (type == NULL || (mask & ~type->mask)) { goto out_bad; } - switch (type->ke.filter) { - case EVFILT_SIGNAL: - if (handle >= NSIG) { - goto out_bad; - } - break; - case EVFILT_FS: - case DISPATCH_EVFILT_CUSTOM_ADD: - case DISPATCH_EVFILT_CUSTOM_OR: - case DISPATCH_EVFILT_TIMER: - if (handle) { - goto out_bad; - } - break; - default: - break; - } - ds = calloc(1ul, sizeof(struct dispatch_source_s)); if (slowpath(!ds)) { goto out_bad; } - dk = calloc(1ul, sizeof(struct dispatch_kevent_s)); - if (slowpath(!dk)) { - goto out_bad; - } - dk->dk_kevent = *proto_kev; - dk->dk_kevent.ident = handle; - dk->dk_kevent.flags |= EV_ADD|EV_ENABLE; - dk->dk_kevent.fflags |= (uint32_t)mask; - dk->dk_kevent.udata = dk; - TAILQ_INIT(&dk->dk_sources); - // Initialize as a queue first, then override some settings below. _dispatch_queue_init((dispatch_queue_t)ds); memcpy(ds->dq_label, source_label, sizeof(source_label)); @@ -447,22 +414,10 @@ // do_targetq will be retained below, past point of no-return ds->do_targetq = q; - // Dispatch Source - ds->ds_ident_hack = dk->dk_kevent.ident; - ds->ds_dkev = dk; - ds->ds_pending_data_mask = dk->dk_kevent.fflags; - if ((EV_DISPATCH|EV_ONESHOT) & proto_kev->flags) { - ds->ds_is_level = true; - ds->ds_needs_rearm = true; - } else if (!(EV_CLEAR & proto_kev->flags)) { - // we cheat and use EV_CLEAR to mean a "flag thingy" - ds->ds_is_adder = true; + if (slowpath(!type->init(ds, type, handle, mask, q))) { + goto out_bad; } - - // Some sources require special processing - if (type->init != NULL) { - type->init(ds, type, handle, mask, q); - } + dispatch_assert(!(ds->ds_is_level && ds->ds_is_adder)); #if DISPATCH_DEBUG dispatch_debug(ds, __FUNCTION__); @@ -473,7 +428,6 @@ out_bad: free(ds); - free(dk); return NULL; } Modified: trunk/src/source_internal.h =================================================================== --- trunk/src/source_internal.h 2009-11-13 14:18:10 UTC (rev 152) +++ trunk/src/source_internal.h 2009-11-14 16:53:08 UTC (rev 153) @@ -103,7 +103,6 @@ bool _dispatch_source_probe(dispatch_source_t ds); void _dispatch_source_dispose(dispatch_source_t ds); size_t _dispatch_source_debug(dispatch_source_t ds, char* buf, size_t bufsiz); -void _dispatch_source_merge_kevent(dispatch_source_t ds, const struct kevent *ke); void _dispatch_source_kevent_resume(dispatch_source_t ds, uint32_t new_flags, uint32_t del_flags); void _dispatch_kevent_merge(dispatch_source_t ds); @@ -113,7 +112,7 @@ struct dispatch_source_type_s { struct kevent ke; uint64_t mask; - void (*init) (dispatch_source_t ds, + bool (*init) (dispatch_source_t ds, dispatch_source_type_t type, uintptr_t handle, unsigned long mask, Modified: trunk/src/source_kevent.c =================================================================== --- trunk/src/source_kevent.c 2009-11-13 14:18:10 UTC (rev 152) +++ trunk/src/source_kevent.c 2009-11-14 16:53:08 UTC (rev 153) @@ -67,6 +67,7 @@ .dk_sources = TAILQ_HEAD_INITIALIZER(_dispatch_kevent_data_add.dk_sources), }; +static void _dispatch_source_merge_kevent(dispatch_source_t ds, const struct kevent *ke); static void _dispatch_kevent_resume(dispatch_kevent_t dk, uint32_t new_flags, uint32_t del_flags); #if HAVE_MACH static void _dispatch_kevent_machport_resume(dispatch_kevent_t dk, uint32_t new_flags, uint32_t del_flags); @@ -563,11 +564,65 @@ _dispatch_source_merge_kevent(ds, &kev); } -static void +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; + dispatch_kevent_t dk = NULL; + + switch (type->ke.filter) { + case EVFILT_SIGNAL: + if (handle >= NSIG) { + return false; + } + break; + case EVFILT_FS: + case DISPATCH_EVFILT_CUSTOM_ADD: + case DISPATCH_EVFILT_CUSTOM_OR: + case DISPATCH_EVFILT_TIMER: + if (handle) { + return false; + } + break; + default: + break; + } + + dk = calloc(1ul, sizeof(struct dispatch_kevent_s)); + if (slowpath(!dk)) { + return false; + } + + dk->dk_kevent = *proto_kev; + dk->dk_kevent.ident = handle; + dk->dk_kevent.flags |= EV_ADD|EV_ENABLE; + dk->dk_kevent.fflags |= (uint32_t)mask; + dk->dk_kevent.udata = dk; + TAILQ_INIT(&dk->dk_sources); + + // Dispatch Source + ds->ds_ident_hack = dk->dk_kevent.ident; + ds->ds_dkev = dk; + ds->ds_pending_data_mask = dk->dk_kevent.fflags; + if ((EV_DISPATCH|EV_ONESHOT) & proto_kev->flags) { + ds->ds_is_level = true; + ds->ds_needs_rearm = true; + } else if (!(EV_CLEAR & proto_kev->flags)) { + // we cheat and use EV_CLEAR to mean a "flag thingy" + ds->ds_is_adder = true; + } + return true; +} + +static bool dispatch_source_type_timer_init(dispatch_source_t ds, dispatch_source_type_t type, uintptr_t handle, unsigned long mask, dispatch_queue_t q) { + if (!dispatch_source_type_kevent_init(ds, type, handle, mask, q)) { + return false; + } ds->ds_needs_rearm = true; ds->ds_timer.flags = mask; + return true; } const struct dispatch_source_type_s _dispatch_source_type_timer = { @@ -583,6 +638,7 @@ .filter = EVFILT_READ, .flags = EV_DISPATCH, }, + .init = dispatch_source_type_kevent_init, }; const struct dispatch_source_type_s _dispatch_source_type_write = { @@ -590,6 +646,7 @@ .filter = EVFILT_WRITE, .flags = EV_DISPATCH, }, + .init = dispatch_source_type_kevent_init, }; const struct dispatch_source_type_s _dispatch_source_type_proc = { @@ -605,12 +662,14 @@ |NOTE_REAP #endif , + .init = dispatch_source_type_kevent_init, }; const struct dispatch_source_type_s _dispatch_source_type_signal = { .ke = { .filter = EVFILT_SIGNAL, }, + .init = dispatch_source_type_kevent_init, }; const struct dispatch_source_type_s _dispatch_source_type_vnode = { @@ -624,6 +683,7 @@ |NOTE_NONE #endif , + .init = dispatch_source_type_kevent_init, }; const struct dispatch_source_type_s _dispatch_source_type_vfs = { @@ -640,17 +700,22 @@ |VQ_VERYLOWDISK #endif , + .init = dispatch_source_type_kevent_init, }; #if HAVE_MACH -static void +static bool dispatch_source_type_mach_send_init(dispatch_source_t ds, dispatch_source_type_t type, uintptr_t handle, unsigned long mask, dispatch_queue_t q) { static dispatch_once_t pred; + if (!dispatch_source_type_kevent_init(ds, type, handle, mask, q)) { + return false; + } ds->ds_is_level = false; dispatch_once_f(&pred, NULL, _dispatch_mach_notify_source_init); + return true; } const struct dispatch_source_type_s _dispatch_source_type_mach_send = { @@ -663,10 +728,14 @@ .init = dispatch_source_type_mach_send_init, }; -static void +static bool dispatch_source_type_mach_recv_init(dispatch_source_t ds, dispatch_source_type_t type, uintptr_t handle, unsigned long mask, dispatch_queue_t q) { + if (!dispatch_source_type_kevent_init(ds, type, handle, mask, q)) { + return false; + } ds->ds_is_level = false; + return true; } const struct dispatch_source_type_s _dispatch_source_type_mach_recv = { @@ -683,6 +752,7 @@ .ke = { .filter = DISPATCH_EVFILT_CUSTOM_ADD, }, + .init = dispatch_source_type_kevent_init, }; const struct dispatch_source_type_s _dispatch_source_type_data_or = { @@ -691,6 +761,7 @@ .flags = EV_CLEAR, .fflags = ~0, }, + .init = dispatch_source_type_kevent_init, }; // Updates the ordered list of timers based on next fire date for changes to ds.

1 0

[152] trunk/src/queue.c
by source_changes＠macosforge.org 13 Nov '09

13 Nov '09

Revision: 152 http://trac.macosforge.org/projects/libdispatch/changeset/152 Author: robert(a)fledge.watson.org Date: 2009-11-13 06:18:10 -0800 (Fri, 13 Nov 2009) Log Message: ----------- If syscont() and _SC_NPROCESSORS_ONLN are available, use that as a fallback configuration option, which should permit Solaris to probe the number of CPUs. Obtained from: Joakim Johansson <jocke(a)tbricks.com> Modified Paths: -------------- trunk/src/queue.c Modified: trunk/src/queue.c =================================================================== --- trunk/src/queue.c 2009-11-13 14:17:32 UTC (rev 151) +++ trunk/src/queue.c 2009-11-13 14:18:10 UTC (rev 152) @@ -473,6 +473,13 @@ _dispatch_hw_config.cc_max_logical = _dispatch_hw_config.cc_max_physical = _dispatch_hw_config.cc_max_active; +#elif HAVE_SYSCONF && defined(_SC_NPROCESSORS_ONLN) + _dispatch_hw_config.cc_max_active = (int)sysconf(_SC_NPROCESSORS_ONLN); + if (_dispatch_hw_config.cc_max_active < 0) + _dispatch_hw_config.cc_max_active = 1; + _dispatch_hw_config.cc_max_logical = + _dispatch_hw_config.cc_max_physical = + _dispatch_hw_config.cc_max_active; #else #warning "_dispatch_queue_set_width_init: no supported way to query CPU count" _dispatch_hw_config.cc_max_logical =

1 0