January 2010 - libdispatch-changes - lists.macosforge.org

[183] trunk/src
by source_changes＠macosforge.org 27 Jan '10

27 Jan '10

Revision: 183 http://trac.macosforge.org/projects/libdispatch/changeset/183 Author: dsteffen(a)apple.com Date: 2010-01-27 09:32:37 -0800 (Wed, 27 Jan 2010) Log Message: ----------- Final dispatch_release() needs to call _dispatch_wakeup() for sources even when libdispatch is built with DISPATCH_NO_LEGACY, to ensure sources that have not been cancelled get uninstalled on final release. <rdar://problem/7581831> Modified Paths: -------------- trunk/src/object.c trunk/src/source.c trunk/src/source_internal.h Modified: trunk/src/object.c =================================================================== --- trunk/src/object.c 2010-01-27 17:32:30 UTC (rev 182) +++ trunk/src/object.c 2010-01-27 17:32:37 UTC (rev 183) @@ -87,11 +87,9 @@ return; } if (oldval == 1) { -#ifndef DISPATCH_NO_LEGACY if (dou._do->do_vtable == (void*)&_dispatch_source_kevent_vtable) { - return _dispatch_source_legacy_xref_release(dou._ds); + return _dispatch_source_xref_release(dou._ds); } -#endif if (slowpath(DISPATCH_OBJECT_SUSPENDED(dou._do))) { // Arguments for and against this assert are within 6705399 DISPATCH_CLIENT_CRASH("Release of a suspended object"); Modified: trunk/src/source.c =================================================================== --- trunk/src/source.c 2010-01-27 17:32:30 UTC (rev 182) +++ trunk/src/source.c 2010-01-27 17:32:37 UTC (rev 183) @@ -60,25 +60,26 @@ _dispatch_release(ds); } -#ifndef DISPATCH_NO_LEGACY +DISPATCH_NOINLINE void -_dispatch_source_legacy_xref_release(dispatch_source_t ds) +_dispatch_source_xref_release(dispatch_source_t ds) { +#ifndef DISPATCH_NO_LEGACY if (ds->ds_is_legacy) { if (!(ds->ds_timer.flags & DISPATCH_TIMER_ONESHOT)) { dispatch_source_cancel(ds); } - // Clients often leave sources suspended at the last release dispatch_atomic_and(&ds->do_suspend_cnt, DISPATCH_OBJECT_SUSPEND_LOCK); - } else if (slowpath(DISPATCH_OBJECT_SUSPENDED(ds))) { + } else +#endif + if (slowpath(DISPATCH_OBJECT_SUSPENDED(ds))) { // Arguments for and against this assert are within 6705399 DISPATCH_CLIENT_CRASH("Release of a suspended object"); } _dispatch_wakeup(ds); _dispatch_release(ds); } -#endif /* DISPATCH_NO_LEGACY */ long dispatch_source_testcancel(dispatch_source_t ds) Modified: trunk/src/source_internal.h =================================================================== --- trunk/src/source_internal.h 2010-01-27 17:32:30 UTC (rev 182) +++ trunk/src/source_internal.h 2010-01-27 17:32:37 UTC (rev 183) @@ -98,7 +98,7 @@ }; -void _dispatch_source_legacy_xref_release(dispatch_source_t ds); +void _dispatch_source_xref_release(dispatch_source_t ds); dispatch_queue_t _dispatch_source_invoke(dispatch_source_t ds); bool _dispatch_source_probe(dispatch_source_t ds); void _dispatch_source_dispose(dispatch_source_t ds);

1 0

[182] trunk/src/queue.c
by source_changes＠macosforge.org 27 Jan '10

27 Jan '10

Revision: 182 http://trac.macosforge.org/projects/libdispatch/changeset/182 Author: dsteffen(a)apple.com Date: 2010-01-27 09:32:30 -0800 (Wed, 27 Jan 2010) Log Message: ----------- move (disabled) non-pthread-workqueue-specific code out of #if HAVE_PTHREAD_WORKQUEUES section Modified Paths: -------------- trunk/src/queue.c Modified: trunk/src/queue.c =================================================================== --- trunk/src/queue.c 2010-01-25 23:07:27 UTC (rev 181) +++ trunk/src/queue.c 2010-01-27 17:32:30 UTC (rev 182) @@ -1171,18 +1171,17 @@ #endif for (i = 0; i < DISPATCH_ROOT_QUEUE_COUNT; i++) { -#if HAVE_PTHREAD_WORKQUEUES - r = pthread_workqueue_attr_setqueuepriority_np(&pwq_attr, _dispatch_rootq2wq_pri(i)); - (void)dispatch_assume_zero(r); - r = pthread_workqueue_attr_setovercommit_np(&pwq_attr, i & 1); - (void)dispatch_assume_zero(r); // some software hangs if the non-overcommitting queues do not overcommit when threads block #if 0 if (!(i & 1)) { dispatch_root_queue_contexts[i].dgq_thread_pool_size = _dispatch_hw_config.cc_max_active; } #endif - +#if HAVE_PTHREAD_WORKQUEUES + r = pthread_workqueue_attr_setqueuepriority_np(&pwq_attr, _dispatch_rootq2wq_pri(i)); + (void)dispatch_assume_zero(r); + r = pthread_workqueue_attr_setovercommit_np(&pwq_attr, i & 1); + (void)dispatch_assume_zero(r); r = 0; if (disable_wq || (r = pthread_workqueue_create_np(&_dispatch_root_queue_contexts[i].dgq_kworkqueue, &pwq_attr))) { if (r != ENOTSUP) {

1 0

[181] trunk/libdispatch.plist
by source_changes＠macosforge.org 25 Jan '10

25 Jan '10

Revision: 181 http://trac.macosforge.org/projects/libdispatch/changeset/181 Author: wsiegrist(a)apple.com Date: 2010-01-25 15:07:27 -0800 (Mon, 25 Jan 2010) Log Message: ----------- Adding darwinbuild plist Added Paths: ----------- trunk/libdispatch.plist Added: trunk/libdispatch.plist =================================================================== --- trunk/libdispatch.plist (rev 0) +++ trunk/libdispatch.plist 2010-01-25 23:07:27 UTC (rev 181) @@ -0,0 +1,38 @@ +// !$*UTF8*$! +{ + build = libdispatch; + inherits = 10C540; + projects = { + libdispatch = { + branch = "/trunk"; + dependencies = { + build = ( + bootstrap_cmds, + cctools, + file_cmds, + gcc, + gcc_select, + shell_cmds, + system_cmds, + text_cmds, + ); + lib = ( + ICU, + Libsystem, + xnu, + ); + header = ( + CarbonHeaders, + Libc_headers, + Libsyscall, + libclosure, + ); + }; + source_sites = ( + "http://svn.macosforge.org/repository/libdispatch/", + ); + version = 1; + }; + }; +} +

1 0

[180] trunk
by source_changes＠macosforge.org 04 Jan '10

04 Jan '10

Revision: 180 http://trac.macosforge.org/projects/libdispatch/changeset/180 Author: robert(a)fledge.watson.org Date: 2010-01-04 05:51:50 -0800 (Mon, 04 Jan 2010) Log Message: ----------- Test for program_invocation_short_name using a declaration test not a function test, as it's not a function. Update copyrights. Submitted by: Mark Heily <mark(a)heily.com> Modified Paths: -------------- trunk/configure.ac trunk/src/shims/getprogname.h Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2010-01-04 13:41:04 UTC (rev 179) +++ trunk/configure.ac 2010-01-04 13:51:50 UTC (rev 180) @@ -192,7 +192,8 @@ AC_CHECK_DECLS([FD_COPY], [], [], [[#include <sys/select.h>]]) AC_CHECK_DECLS([SIGEMT], [], [], [[#include <signal.h>]]) 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 sysconf getprogname program_invocation_short_name]) +AC_CHECK_DECLS([program_invocation_short_name], [], [], [[#include <errno.h>]]) +AC_CHECK_FUNCS([pthread_key_init_np pthread_main_np mach_absolute_time malloc_create_zone sysconf getprogname]) AC_CHECK_DECLS([POSIX_SPAWN_START_SUSPENDED], [have_posix_spawn_start_suspended=true], Modified: trunk/src/shims/getprogname.h =================================================================== --- trunk/src/shims/getprogname.h 2010-01-04 13:41:04 UTC (rev 179) +++ trunk/src/shims/getprogname.h 2010-01-04 13:51:50 UTC (rev 180) @@ -1,5 +1,6 @@ /* - * Copyright (c) 2009 Apple Inc. All rights reserved. + * Copyright (c) 2009-2010 Mark Heily <mark(a)heily.com> + * All rights reserved. * * @APPLE_APACHE_LICENSE_HEADER_START@ * @@ -25,7 +26,7 @@ static inline char * getprogname(void) { -# if HAVE_PROGRAM_INVOCATION_SHORT_NAME +# if HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME return program_invocation_short_name; # else # error getprogname(3) is not available on this platform

1 0

[179] trunk/man/dispatch_source_create.3
by source_changes＠macosforge.org 04 Jan '10

04 Jan '10

Revision: 179 http://trac.macosforge.org/projects/libdispatch/changeset/179 Author: robert(a)fledge.watson.org Date: 2010-01-04 05:41:04 -0800 (Mon, 04 Jan 2010) Log Message: ----------- Correct typo. Modified Paths: -------------- trunk/man/dispatch_source_create.3 Modified: trunk/man/dispatch_source_create.3 =================================================================== --- trunk/man/dispatch_source_create.3 2009-12-28 13:33:51 UTC (rev 178) +++ trunk/man/dispatch_source_create.3 2010-01-04 13:41:04 UTC (rev 179) @@ -205,7 +205,7 @@ sources in order to safely close the descriptor or destroy the port. Closing the descriptor or port before the cancellation handler has run may result in a race condition: if a new descriptor is allocated with the same value as the recently -cosed descriptor while the source's event handler is still running, the event +closed descriptor while the source's event handler is still running, the event handler may read/write data to the wrong descriptor. .Pp .Sh DISPATCH SOURCE TYPES

1 0