December 2010 - libdispatch-changes

[197] trunk
by source_changes＠macosforge.org 24 Dec '10

24 Dec '10

Revision: 197 http://trac.macosforge.org/projects/libdispatch/changeset/197 Author: jkh(a)apple.com Date: 2010-12-23 17:40:31 -0800 (Thu, 23 Dec 2010) Log Message: ----------- Author: Mark Heily <mark(a)heily.com> Further changes to facilitate building on linux for latest trunk. Modified Paths: -------------- trunk/configure.ac trunk/testing/shims/arc4random.c trunk/testing/shims/fgetln.c Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2010-12-23 21:57:41 UTC (rev 196) +++ trunk/configure.ac 2010-12-24 01:40:31 UTC (rev 197) @@ -8,6 +8,7 @@ AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) AC_CONFIG_MACRO_DIR([m4]) +AC_USE_SYSTEM_EXTENSIONS AM_MAINTAINER_MODE # Modified: trunk/testing/shims/arc4random.c =================================================================== --- trunk/testing/shims/arc4random.c 2010-12-23 21:57:41 UTC (rev 196) +++ trunk/testing/shims/arc4random.c 2010-12-24 01:40:31 UTC (rev 197) @@ -34,6 +34,7 @@ #include <sys/types.h> #include <sys/time.h> +#include <stdint.h> #include <stdlib.h> #include <fcntl.h> #include <unistd.h> Modified: trunk/testing/shims/fgetln.c =================================================================== --- trunk/testing/shims/fgetln.c 2010-12-23 21:57:41 UTC (rev 196) +++ trunk/testing/shims/fgetln.c 2010-12-24 01:40:31 UTC (rev 197) @@ -41,6 +41,7 @@ #include <stdio.h> #include <stdlib.h> +#include <string.h> #include <strings.h> #include <errno.h>

1 0

[196] trunk/testing
by source_changes＠macosforge.org 23 Dec '10

23 Dec '10

Revision: 196 http://trac.macosforge.org/projects/libdispatch/changeset/196 Author: jkh(a)apple.com Date: 2010-12-23 13:57:41 -0800 (Thu, 23 Dec 2010) Log Message: ----------- Whoops! I knew I was forgetting something on that last commit. Added Paths: ----------- trunk/testing/os_shims.h trunk/testing/shims/ trunk/testing/shims/arc4random.c trunk/testing/shims/arc4random.h trunk/testing/shims/asprintf.c trunk/testing/shims/asprintf.h trunk/testing/shims/fgetln.c trunk/testing/shims/fgetln.h Added: trunk/testing/os_shims.h =================================================================== --- trunk/testing/os_shims.h (rev 0) +++ trunk/testing/os_shims.h 2010-12-23 21:57:41 UTC (rev 196) @@ -0,0 +1,30 @@ +/* + * @APPLE_APACHE_LICENSE_HEADER_START@ + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * @APPLE_APACHE_LICENSE_HEADER_END@ + */ + + +#ifndef __DISPATCH_TESTS_OS_SHIMS__ +#define __DISPATCH_TESTS_OS_SHIMS__ + +#include "config/config.h" + +#include "shims/asprintf.h" +#include "shims/arc4random.h" +#include "shims/fgetln.h" + +#endif /* __DISPATCH_TESTS_OS_SHIMS__ */ + Added: trunk/testing/shims/arc4random.c =================================================================== --- trunk/testing/shims/arc4random.c (rev 0) +++ trunk/testing/shims/arc4random.c 2010-12-23 21:57:41 UTC (rev 196) @@ -0,0 +1,241 @@ +/* + * arc4random() for libdispatch + * + * Based on http://www.opensource.apple.com/source/Libc/Libc-594.9.1/gen/FreeBSD/arc4ra… + * + * + * Arc4 random number generator for OpenBSD. + * Copyright 1996 David Mazieres <dm(a)lcs.mit.edu>. + * + * Modification and redistribution in source and binary forms is + * permitted provided that due credit is given to the author and the + * OpenBSD project (for instance by leaving this copyright notice + * intact). + */ + +/* + * This code is derived from section 17.1 of Applied Cryptography, + * second edition, which describes a stream cipher allegedly + * compatible with RSA Labs "RC4" cipher (the actual description of + * which is a trade secret). The same algorithm is used as a stream + * cipher called "arcfour" in Tatu Ylonen's ssh package. + * + * Here the stream cipher has been modified always to include the time + * when initializing the state. That makes it impossible to + * regenerate the same random sequence twice, so this can't be used + * for encryption, but will generate good random numbers. + * + * RC4 is a registered trademark of RSA Laboratories. + */ + +#include "config/config.h" + +#ifndef HAVE_ARC4RANDOM + +#include <sys/types.h> +#include <sys/time.h> +#include <stdlib.h> +#include <fcntl.h> +#include <unistd.h> +#include <pthread.h> + +struct arc4_stream { + uint8_t i; + uint8_t j; + uint8_t s[256]; +}; + +static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER; + +#define __isthreaded 1 +#define RANDOMDEV "/dev/urandom" +#define THREAD_LOCK() \ + do { \ + if (__isthreaded) \ + pthread_mutex_lock(&arc4random_mtx); \ + } while (0) + +#define THREAD_UNLOCK() \ + do { \ + if (__isthreaded) \ + pthread_mutex_unlock(&arc4random_mtx); \ + } while (0) + +static struct arc4_stream rs; +static int rs_initialized; +static int rs_stired; + +static inline uint8_t arc4_getbyte(struct arc4_stream *); +static void arc4_stir(struct arc4_stream *); + +static inline void +arc4_init(as) + struct arc4_stream *as; +{ + int n; + + for (n = 0; n < 256; n++) + as->s[n] = n; + as->i = 0; + as->j = 0; +} + +static inline void +arc4_addrandom(as, dat, datlen) + struct arc4_stream *as; + u_char *dat; + int datlen; +{ + int n; + uint8_t si; + + as->i--; + for (n = 0; n < 256; n++) { + as->i = (as->i + 1); + si = as->s[as->i]; + as->j = (as->j + si + dat[n % datlen]); + as->s[as->i] = as->s[as->j]; + as->s[as->j] = si; + } +} + +static void +arc4_stir(as) + struct arc4_stream *as; +{ + int fd, n; + struct { + struct timeval tv; + pid_t pid; + uint8_t rnd[128 - sizeof(struct timeval) - sizeof(pid_t)]; + } rdat; + + gettimeofday(&rdat.tv, NULL); + rdat.pid = getpid(); + fd = open(RANDOMDEV, O_RDONLY, 0); + if (fd >= 0) { + (void) read(fd, rdat.rnd, sizeof(rdat.rnd)); + close(fd); + } + /* fd < 0? Ah, what the heck. We'll just take whatever was on the + * stack... */ + + arc4_addrandom(as, (void *) &rdat, sizeof(rdat)); + + /* + * Throw away the first N bytes of output, as suggested in the + * paper "Weaknesses in the Key Scheduling Algorithm of RC4" + * by Fluher, Mantin, and Shamir. N=1024 is based on + * suggestions in the paper "(Not So) Random Shuffles of RC4" + * by Ilya Mironov. + */ + for (n = 0; n < 1024; n++) + arc4_getbyte(as); +} + +static inline uint8_t +arc4_getbyte(as) + struct arc4_stream *as; +{ + uint8_t si, sj; + + as->i = (as->i + 1); + si = as->s[as->i]; + as->j = (as->j + si); + sj = as->s[as->j]; + as->s[as->i] = sj; + as->s[as->j] = si; + + return (as->s[(si + sj) & 0xff]); +} + +static inline uint32_t +arc4_getword(as) + struct arc4_stream *as; +{ + uint32_t val; + + val = arc4_getbyte(as) << 24; + val |= arc4_getbyte(as) << 16; + val |= arc4_getbyte(as) << 8; + val |= arc4_getbyte(as); + + return (val); +} + +static void +arc4_check_init(void) +{ + if (!rs_initialized) { + arc4_init(&rs); + rs_initialized = 1; + } +} + +static void +arc4_check_stir(void) +{ + if (!rs_stired) { + arc4_stir(&rs); + rs_stired = 1; + } +} + +void +arc4random_stir() +{ + THREAD_LOCK(); + arc4_check_init(); + arc4_stir(&rs); + THREAD_UNLOCK(); +} + +void +arc4random_addrandom(dat, datlen) + u_char *dat; + int datlen; +{ + THREAD_LOCK(); + arc4_check_init(); + arc4_check_stir(); + arc4_addrandom(&rs, dat, datlen); + THREAD_UNLOCK(); +} + +uint32_t +arc4random() +{ + uint32_t rnd; + + THREAD_LOCK(); + arc4_check_init(); + arc4_check_stir(); + rnd = arc4_getword(&rs); + THREAD_UNLOCK(); + + return (rnd); +} + +#if 0 +/*-------- Test code for i386 --------*/ +#include <stdio.h> +#include <machine/pctr.h> +int +main(int argc, char **argv) +{ + const int iter = 1000000; + int i; + pctrval v; + + v = rdtsc(); + for (i = 0; i < iter; i++) + arc4random(); + v = rdtsc() - v; + v /= iter; + + printf("%qd cycles\n", v); +} +#endif + +#endif /* HAVE_ARC4RANDOM */ + Added: trunk/testing/shims/arc4random.h =================================================================== --- trunk/testing/shims/arc4random.h (rev 0) +++ trunk/testing/shims/arc4random.h 2010-12-23 21:57:41 UTC (rev 196) @@ -0,0 +1,29 @@ +/* + * @APPLE_APACHE_LICENSE_HEADER_START@ + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * @APPLE_APACHE_LICENSE_HEADER_END@ + */ + + +#ifndef __DISPATCH_TESTS_SHIMS_ARC4RANDOM__ +#define __DISPATCH_TESTS_SHIMS_ARC4RANDOM__ + +#ifndef HAVE_ARC4RANDOM +unsigned int arc4random(); +#endif + +#endif /* __DISPATCH_TESTS_SHIMS_ARC4RANDOM__ */ + + Added: trunk/testing/shims/asprintf.c =================================================================== --- trunk/testing/shims/asprintf.c (rev 0) +++ trunk/testing/shims/asprintf.c 2010-12-23 21:57:41 UTC (rev 196) @@ -0,0 +1,95 @@ +/* + * libdispatch asprintf portability shim, based on + * http://www.opensource.apple.com/source/OpenSSH/OpenSSH-142/openssh/openbsd-… + * + * + * Copyright (c) 2004 Darren Tucker. + * + * Based originally on asprintf.c from OpenBSD: + * Copyright (c) 1997 Todd C. Miller <Todd.Miller(a)courtesan.com> + * + * Permission to use, copy, modify, and 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 THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR 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. + */ + +#include "config/config.h" + +#ifndef HAVE_VASPRINTF + +#include <stdio.h> +#include <errno.h> +#include <stdarg.h> +#include <stdlib.h> +#include <sys/types.h> + +#define INIT_SZ 128 + +int +vasprintf(char **str, const char *fmt, va_list ap) +{ + int ret = -1; + va_list ap2; + char *string, *newstr; + size_t len; + + va_copy(ap2, ap); + if ((string = malloc(INIT_SZ)) == NULL) + goto fail; + + ret = vsnprintf(string, INIT_SZ, fmt, ap2); + if (ret >= 0 && ret < INIT_SZ) { /* succeeded with initial alloc */ + *str = string; + } else if (ret < 0) { /* Bad length */ + free(string); + goto fail; + } else { /* bigger than initial, realloc allowing for nul */ + len = (size_t)ret + 1; + if ((newstr = realloc(string, len)) == NULL) { + free(string); + goto fail; + } else { + va_end(ap2); + va_copy(ap2, ap); + ret = vsnprintf(newstr, len, fmt, ap2); + if (ret >= 0 && (size_t)ret < len) { + *str = newstr; + } else { /* failed with realloc'ed string, give up */ + free(newstr); + goto fail; + } + } + } + va_end(ap2); + return (ret); + +fail: + *str = NULL; + errno = ENOMEM; + va_end(ap2); + return (-1); +} +#endif + +#ifndef HAVE_ASPRINTF +int asprintf(char **str, const char *fmt, ...) +{ + va_list ap; + int ret; + + *str = NULL; + va_start(ap, fmt); + ret = vasprintf(str, fmt, ap); + va_end(ap); + + return ret; +} +#endif Added: trunk/testing/shims/asprintf.h =================================================================== --- trunk/testing/shims/asprintf.h (rev 0) +++ trunk/testing/shims/asprintf.h 2010-12-23 21:57:41 UTC (rev 196) @@ -0,0 +1,27 @@ +/* + * @APPLE_APACHE_LICENSE_HEADER_START@ + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * @APPLE_APACHE_LICENSE_HEADER_END@ + */ + + +#ifndef __DISPATCH_TESTS_SHIMS_ASPRINTF__ +#define __DISPATCH_TESTS_SHIMS_ASPRINTF__ + +#ifndef HAVE_ASPRINTF +int asprintf(char **str, const char *fmt, ...); +#endif + +#endif /* __DISPATCH_TESTS_SHIMS_ASPRINTF__ */ Added: trunk/testing/shims/fgetln.c =================================================================== --- trunk/testing/shims/fgetln.c (rev 0) +++ trunk/testing/shims/fgetln.c 2010-12-23 21:57:41 UTC (rev 196) @@ -0,0 +1,93 @@ +/* $NetBSD: fgetln.c,v 1.3 2006/09/25 07:18:17 lukem Exp $ */ + +/*- + * libdispatch fgetln shim + * Based on http://www.opensource.apple.com/source/lukemftpd/lukemftpd-32/tnftpd/libnet… + * + * Copyright (c) 1998 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Christos Zoulas. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of The NetBSD Foundation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include "config/config.h" + +#ifndef HAVE_FGETLN + +#include <stdio.h> +#include <stdlib.h> +#include <strings.h> +#include <errno.h> + +char * +fgetln(fp, len) + FILE *fp; + size_t *len; +{ + static char *buf = NULL; + static size_t bufsiz = 0; + char *ptr; + + + if (buf == NULL) { + bufsiz = BUFSIZ; + if ((buf = malloc(bufsiz)) == NULL) + return NULL; + } + + if (fgets(buf, bufsiz, fp) == NULL) + return NULL; + + *len = 0; + while ((ptr = strchr(&buf[*len], '\n')) == NULL) { + size_t nbufsiz = bufsiz + BUFSIZ; + char *nbuf = realloc(buf, nbufsiz); + + if (nbuf == NULL) { + int oerrno = errno; + free(buf); + errno = oerrno; + buf = NULL; + return NULL; + } else + buf = nbuf; + + *len = bufsiz; + if (fgets(&buf[bufsiz], BUFSIZ, fp) == NULL) + return buf; + + bufsiz = nbufsiz; + } + + *len = (ptr - buf) + 1; + return buf; +} + +#endif /* #ifndef HAVE_FGETLN */ + + Added: trunk/testing/shims/fgetln.h =================================================================== --- trunk/testing/shims/fgetln.h (rev 0) +++ trunk/testing/shims/fgetln.h 2010-12-23 21:57:41 UTC (rev 196) @@ -0,0 +1,29 @@ +/* + * @APPLE_APACHE_LICENSE_HEADER_START@ + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * @APPLE_APACHE_LICENSE_HEADER_END@ + */ + + +#ifndef __DISPATCH_TESTS_SHIMS_FGETLN__ +#define __DISPATCH_TESTS_SHIMS_FGETLN__ + +#ifndef HAVE_FGETLN +#include <stdio.h> + +char *fgetln(FILE *stream, size_t *len); +#endif + +#endif /* __DISPATCH_TESTS_SHIMS_FGETLN__ */

1 0

[195] trunk
by source_changes＠macosforge.org 23 Dec '10

23 Dec '10

Revision: 195 http://trac.macosforge.org/projects/libdispatch/changeset/195 Author: jkh(a)apple.com Date: 2010-12-23 13:31:28 -0800 (Thu, 23 Dec 2010) Log Message: ----------- Author: Joakim Johansson <jocke(a)tbricks.com> Shims and small patches required to get the portable parts of the test suite to run properly, it also includes a fix for spurious failures of dispatch_priority/dispatch_priority2 due to a wraparound bug, which should affect test stability on other platforms as well. Modified Paths: -------------- trunk/configure.ac trunk/testing/Makefile.am trunk/testing/dispatch_priority.c trunk/testing/dispatch_test.h trunk/testing/summarize.c Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2010-12-23 01:35:54 UTC (rev 194) +++ trunk/configure.ac 2010-12-23 21:31:28 UTC (rev 195) @@ -200,7 +200,7 @@ AC_CHECK_DECLS([SIGEMT], [], [], [[#include <signal.h>]]) AC_CHECK_DECLS([VQ_UPDATE, VQ_VERYLOWDISK], [], [], [[#include <sys/mount.h>]]) 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 getexecname]) +AC_CHECK_FUNCS([pthread_key_init_np pthread_main_np mach_absolute_time malloc_create_zone sysconf getprogname getexecname vasprintf asprintf arc4random fgetln]) AC_CHECK_DECLS([POSIX_SPAWN_START_SUSPENDED], [have_posix_spawn_start_suspended=true], Modified: trunk/testing/Makefile.am =================================================================== --- trunk/testing/Makefile.am 2010-12-23 01:35:54 UTC (rev 194) +++ trunk/testing/Makefile.am 2010-12-23 21:31:28 UTC (rev 195) @@ -5,7 +5,10 @@ noinst_LTLIBRARIES=libtest.la libtest_la_SOURCES= \ - dispatch_test.c + dispatch_test.c \ + shims/asprintf.c \ + shims/arc4random.c \ + shims/fgetln.c TESTS= \ dispatch_api \ Modified: trunk/testing/dispatch_priority.c =================================================================== --- trunk/testing/dispatch_priority.c 2010-12-23 01:35:54 UTC (rev 194) +++ trunk/testing/dispatch_priority.c 2010-12-23 21:31:28 UTC (rev 195) @@ -48,21 +48,21 @@ int priorities[PRIORITIES] = { DISPATCH_QUEUE_PRIORITY_LOW, DISPATCH_QUEUE_PRIORITY_DEFAULT, DISPATCH_QUEUE_PRIORITY_HIGH }; union { - size_t count; + long count; char padding[64]; } counts[PRIORITIES]; -#define ITERATIONS (size_t)(PRIORITIES * BLOCKS * 0.50) -size_t iterations = ITERATIONS; +#define ITERATIONS (long)(PRIORITIES * BLOCKS * 0.50) +long iterations = ITERATIONS; void histogram(void) { - size_t maxcount = BLOCKS; - size_t sc[PRIORITIES]; + long maxcount = BLOCKS; + long sc[PRIORITIES]; - size_t total = 0; + long total = 0; - size_t x,y; + long x,y; for (y = 0; y < PRIORITIES; ++y) { sc[y] = counts[y].count; } @@ -86,10 +86,10 @@ void cpubusy(void* context) { - size_t *count = context; - size_t iterdone; + long *count = context; + long iterdone; - size_t idx; + long idx; for (idx = 0; idx < LOOP_COUNT; ++idx) { if (done) break; } @@ -132,7 +132,7 @@ test_ptr_notnull("q[i]", q[i]); assert(q[i]); dispatch_set_target_queue(q[i], dispatch_get_global_queue(priorities[i], 0)); - dispatch_queue_set_width(q[i], DISPATCH_QUEUE_WIDTH_MAX_LOGICAL_CPUS); + dispatch_queue_set_width(q[i], DISPATCH_QUEUE_WIDTH_MAX_LOGICAL_CPUS); } #else test_start("Dispatch Priority"); Modified: trunk/testing/dispatch_test.h =================================================================== --- trunk/testing/dispatch_test.h 2010-12-23 01:35:54 UTC (rev 194) +++ trunk/testing/dispatch_test.h 2010-12-23 21:31:28 UTC (rev 195) @@ -1,6 +1,8 @@ #include <errno.h> +#include "os_shims.h" +#include <dispatch/dispatch.h> -__BEGIN_DECLS +__DISPATCH_BEGIN_DECLS void test_start(const char* desc); void test_stop(void); @@ -30,4 +32,5 @@ void _test_errno(const char* file, long line, const char* desc, long actual, long expected); #define test_errno(a,b,c) _test_errno(__FILE__, __LINE__, a, b, c) -__END_DECLS +__DISPATCH_END_DECLS + Modified: trunk/testing/summarize.c =================================================================== --- trunk/testing/summarize.c 2010-12-23 01:35:54 UTC (rev 194) +++ trunk/testing/summarize.c 2010-12-23 21:31:28 UTC (rev 195) @@ -18,7 +18,7 @@ * @APPLE_APACHE_LICENSE_HEADER_END@ */ -#include "config/config.h" +#include "os_shims.h" #include <stdio.h> #include <stdlib.h>

1 0

[194] trunk
by source_changes＠macosforge.org 23 Dec '10

23 Dec '10

Revision: 194 http://trac.macosforge.org/projects/libdispatch/changeset/194 Author: jkh(a)apple.com Date: 2010-12-22 17:35:54 -0800 (Wed, 22 Dec 2010) Log Message: ----------- > Mark Heily: > > I have attached a collection of patches that allows libdispatch to build on > Linux and Solaris. Many thanks to Joakim Johansson for providing the Solaris > patches and testing everything. > > The commands I used to build on Linux are: > > CC="clang" LD="llvm-ld-2.8" CFLAGS="-I/usr/local" \ > LDFLAGS="-L/usr/local" LIBS="-lbsd" ./configure && make > > The commands Joakim used to build on Solaris are: > > ./configure CFLAGS="-m64 -I/usr/local/include" \ > LDFLAGS="-L/usr/local/lib?\226?\128?\157 gmake My Solaris and Linux environments are limping at the moment (dev tools all horked up in both) so I couldn't do the build tests on anything but Darwin, but the patches pass the eyeball check in any case. Also made a small change to the xcode project to increase buildability (no legacy APIs). Modified Paths: -------------- trunk/configure.ac trunk/libdispatch.xcodeproj/project.pbxproj trunk/m4/private-extern.m4 trunk/src/Makefile.am trunk/src/queue.c trunk/src/shims/getprogname.h trunk/src/shims/time.c trunk/testing/dispatch_after.c Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2010-10-24 08:36:30 UTC (rev 193) +++ trunk/configure.ac 2010-12-23 01:35:54 UTC (rev 194) @@ -182,6 +182,13 @@ ) # +# Check if libpthread_workqueue.so exists +# +AC_CHECK_LIB(pthread_workqueue, pthread_workqueue_init_np, + have_lpwq=true, have_lpwq=false) +AM_CONDITIONAL(USE_LIBPTHREAD_WORKQUEUE, $have_lpwq) + +# # Find functions and declarations we care about. # AC_CHECK_DECLS([CLOCK_UPTIME, CLOCK_MONOTONIC, CLOCK_REALTIME], [], [], @@ -193,7 +200,7 @@ AC_CHECK_DECLS([SIGEMT], [], [], [[#include <signal.h>]]) AC_CHECK_DECLS([VQ_UPDATE, VQ_VERYLOWDISK], [], [], [[#include <sys/mount.h>]]) 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_FUNCS([pthread_key_init_np pthread_main_np mach_absolute_time malloc_create_zone sysconf getprogname getexecname]) AC_CHECK_DECLS([POSIX_SPAWN_START_SUSPENDED], [have_posix_spawn_start_suspended=true], Modified: trunk/libdispatch.xcodeproj/project.pbxproj =================================================================== --- trunk/libdispatch.xcodeproj/project.pbxproj 2010-10-24 08:36:30 UTC (rev 193) +++ trunk/libdispatch.xcodeproj/project.pbxproj 2010-12-23 01:35:54 UTC (rev 194) @@ -328,7 +328,14 @@ isa = PBXProject; buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "libdispatch" */; compatibilityVersion = "Xcode 3.1"; + developmentRegion = English; hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + ); mainGroup = 08FB7794FE84155DC02AAC07 /* libdispatch */; projectDirPath = ""; projectRoot = ""; @@ -403,7 +410,10 @@ GCC_ENABLE_CPP_RTTI = NO; GCC_ENABLE_OBJC_EXCEPTIONS = NO; GCC_OPTIMIZATION_LEVEL = s; - GCC_PREPROCESSOR_DEFINITIONS = "__DARWIN_NON_CANCELABLE=1"; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DISPATCH_NO_LEGACY=1", + "__DARWIN_NON_CANCELABLE=1", + ); GENERATE_MASTER_OBJECT_FILE = NO; INSTALL_PATH = /usr/local/lib/system; LINK_WITH_STANDARD_LIBRARIES = NO; Modified: trunk/m4/private-extern.m4 =================================================================== --- trunk/m4/private-extern.m4 2010-10-24 08:36:30 UTC (rev 193) +++ trunk/m4/private-extern.m4 2010-12-23 01:35:54 UTC (rev 194) @@ -4,10 +4,12 @@ # AC_DEFUN([DISPATCH_C_PRIVATE_EXTERN], [ +AC_LANG_WERROR + AC_CACHE_CHECK([for __attribute__((visibility("hidden")))], dispatch_cv_hidden_visibility_attribute, [ - AC_TRY_LINK([], - [extern __attribute__ ((visibility ("hidden"))) int foo;], + AC_TRY_LINK([int foo; extern __attribute__ ((visibility ("hidden"))) int foo;], + [foo = 0;], [dispatch_cv_hidden_visibility_attribute=yes], [dispatch_cv_hidden_visibility_attribute=no])]) Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2010-10-24 08:36:30 UTC (rev 193) +++ trunk/src/Makefile.am 2010-12-23 01:35:54 UTC (rev 194) @@ -36,6 +36,10 @@ libdispatch_la_LIBADD=libshims.la $(KQUEUE_LIBS) libdispatch_la_DEPENDENCIES=libshims.la +if USE_LIBPTHREAD_WORKQUEUE +libdispatch_la_LIBADD+=-lpthread_workqueue +endif + if USE_MIG libdispatch_la_SOURCES+= \ protocolUser.c \ Modified: trunk/src/queue.c =================================================================== --- trunk/src/queue.c 2010-10-24 08:36:30 UTC (rev 193) +++ trunk/src/queue.c 2010-12-23 01:35:54 UTC (rev 194) @@ -1206,7 +1206,7 @@ #endif #if HAVE_PTHREAD_WORKQUEUES } else { - dispatch_assume(_dispatch_root_queue_contexts[i].dgq_kworkqueue); + (void)dispatch_assume(_dispatch_root_queue_contexts[i].dgq_kworkqueue); } #endif } Modified: trunk/src/shims/getprogname.h =================================================================== --- trunk/src/shims/getprogname.h 2010-10-24 08:36:30 UTC (rev 193) +++ trunk/src/shims/getprogname.h 2010-12-23 01:35:54 UTC (rev 194) @@ -23,15 +23,19 @@ #define __DISPATCH_SHIMS_GETPROGNAME__ #ifndef HAVE_GETPROGNAME -static inline char * + +static inline const char * getprogname(void) { # if HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME return program_invocation_short_name; +#elif HAVE_GETEXECNAME + return getexecname(); # else # error getprogname(3) is not available on this platform # endif } + #endif /* HAVE_GETPROGNAME */ #endif /* __DISPATCH_SHIMS_GETPROGNAME__ */ Modified: trunk/src/shims/time.c =================================================================== --- trunk/src/shims/time.c 2010-10-24 08:36:30 UTC (rev 193) +++ trunk/src/shims/time.c 2010-12-23 01:35:54 UTC (rev 194) @@ -37,6 +37,10 @@ dispatch_assume(QueryPerformanceFrequency(&freq)); _dispatch_host_time_data.frac = (long double)NSEC_PER_SEC / (long double)freq.QuadPart; _dispatch_host_time_data.ratio_1_to_1 = (freq.QuadPart == 1); -#endif /* TARGET_OS_WIN32 */ +#else // TARGET_OS_WIN32 + _dispatch_host_time_data.frac = 1.0; + _dispatch_host_time_data.ratio_1_to_1 = 1; +#endif } + #endif Modified: trunk/testing/dispatch_after.c =================================================================== --- trunk/testing/dispatch_after.c 2010-10-24 08:36:30 UTC (rev 193) +++ trunk/testing/dispatch_after.c 2010-12-23 01:35:54 UTC (rev 194) @@ -29,7 +29,7 @@ #include "dispatch_test.h" #include <Block.h> -void done(void *arg __unused) { +void done(void *arg __attribute__((unused))) { sleep(1); test_stop(); }

1 0