diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | linuxthreads/ChangeLog | 7 | ||||
| -rw-r--r-- | linuxthreads/Makefile | 2 | ||||
| -rw-r--r-- | linuxthreads/pthread.c | 35 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/unix/sysv/linux/smp.h | 48 | ||||
| -rw-r--r-- | resolv/resolv.h | 13 |
6 files changed, 70 insertions, 41 deletions
diff --git a/ChangeLog b/ChangeLog index 8eaa067975..eba944f8a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-09-08 Roland McGrath <roland@redhat.com> + + * resolv/resolv.h: Include <sys/types.h> for u_long even in + the [__need_res_state] case. + Reported by Bruno Haible <bruno@clisp.org>. + 2002-09-04 Bruno Haible <bruno@clisp.org> * sysdeps/generic/bits/ustat.h: Comment fix. diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index a30efcb3ab..2ed5382a70 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,5 +1,12 @@ 2002-09-04 Bruno Haible <bruno@clisp.org> + * pthread.c: Include <sys/time.h>. + (is_smp_system): Move to sysdeps/unix/sysv/linux/smp.h. + * sysdeps/unix/sysv/linux/smp.h: New file, extracted from pthread.c. + * Makefile (distribute): Add smp.h to the list. + +2002-09-04 Bruno Haible <bruno@clisp.org> + * sysdeps/alpha/pt-machine.h: Choose different include file location on non-Linux platforms. diff --git a/linuxthreads/Makefile b/linuxthreads/Makefile index 4dce3133af..230c75f4f6 100644 --- a/linuxthreads/Makefile +++ b/linuxthreads/Makefile @@ -25,7 +25,7 @@ linuxthreads-version := $(shell sed -n 's/^.*$(subdir)-\([0-9.]*\).*$$/\1/p' \ Banner) headers := pthread.h semaphore.h -distribute := internals.h queue.h restart.h spinlock.h tst-signal.sh +distribute := internals.h queue.h restart.h spinlock.h smp.h tst-signal.sh routines := weaks no-tsd diff --git a/linuxthreads/pthread.c b/linuxthreads/pthread.c index f08bfd4652..9713fb5efd 100644 --- a/linuxthreads/pthread.c +++ b/linuxthreads/pthread.c @@ -24,12 +24,13 @@ #include <fcntl.h> #include <sys/wait.h> #include <sys/resource.h> -#include <sys/sysctl.h> +#include <sys/time.h> #include <shlib-compat.h> #include "pthread.h" #include "internals.h" #include "spinlock.h" #include "restart.h" +#include "smp.h" #include <ldsodefs.h> #include <tls.h> #include <locale.h> /* for __uselocale */ @@ -360,38 +361,6 @@ __libc_allocate_rtsig (int high) #endif } -/* The function we use to get the kernel revision. */ -extern int __sysctl (int *name, int nlen, void *oldval, size_t *oldlenp, - void *newval, size_t newlen); - -/* Test whether the machine has more than one processor. This is not the - best test but good enough. More complicated tests would require `malloc' - which is not available at that time. */ -static int -is_smp_system (void) -{ - static const int sysctl_args[] = { CTL_KERN, KERN_VERSION }; - char buf[512]; - size_t reslen = sizeof (buf); - - /* Try reading the number using `sysctl' first. */ - if (__sysctl ((int *) sysctl_args, - sizeof (sysctl_args) / sizeof (sysctl_args[0]), - buf, &reslen, NULL, 0) < 0) - { - /* This was not successful. Now try reading the /proc filesystem. */ - int fd = __open ("/proc/sys/kernel/version", O_RDONLY); - if (__builtin_expect (fd, 0) == -1 - || (reslen = __read (fd, buf, sizeof (buf))) <= 0) - /* This also didn't work. We give up and say it's a UP machine. */ - buf[0] = '\0'; - - __close (fd); - } - - return strstr (buf, "SMP") != NULL; -} - /* Initialize the pthread library. Initialization is split in two functions: diff --git a/linuxthreads/sysdeps/unix/sysv/linux/smp.h b/linuxthreads/sysdeps/unix/sysv/linux/smp.h new file mode 100644 index 0000000000..81289294b4 --- /dev/null +++ b/linuxthreads/sysdeps/unix/sysv/linux/smp.h @@ -0,0 +1,48 @@ +/* Determine whether the host has multiple processors. Linux version. + Copyright (C) 1996, 2002 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include <sys/sysctl.h> + +/* Test whether the machine has more than one processor. This is not the + best test but good enough. More complicated tests would require `malloc' + which is not available at that time. */ +static inline int +is_smp_system (void) +{ + static const int sysctl_args[] = { CTL_KERN, KERN_VERSION }; + char buf[512]; + size_t reslen = sizeof (buf); + + /* Try reading the number using `sysctl' first. */ + if (__sysctl ((int *) sysctl_args, + sizeof (sysctl_args) / sizeof (sysctl_args[0]), + buf, &reslen, NULL, 0) < 0) + { + /* This was not successful. Now try reading the /proc filesystem. */ + int fd = __open ("/proc/sys/kernel/version", O_RDONLY); + if (__builtin_expect (fd, 0) == -1 + || (reslen = __read (fd, buf, sizeof (buf))) <= 0) + /* This also didn't work. We give up and say it's a UP machine. */ + buf[0] = '\0'; + + __close (fd); + } + + return strstr (buf, "SMP") != NULL; +} diff --git a/resolv/resolv.h b/resolv/resolv.h index 0804d243db..6454f9c3f6 100644 --- a/resolv/resolv.h +++ b/resolv/resolv.h @@ -50,22 +50,21 @@ */ #ifndef _RESOLV_H_ + +/* These headers are needed for types used in the `struct res_state' + declaration. */ +#include <sys/types.h> +#include <netinet/in.h> + #ifndef __need_res_state # define _RESOLV_H_ # include <sys/param.h> -# if (!defined(BSD)) || (BSD < 199306) -# include <sys/bitypes.h> -# else -# include <sys/types.h> -# endif # include <sys/cdefs.h> # include <stdio.h> # include <arpa/nameser.h> #endif -#include <netinet/in.h> - #ifndef __res_state_defined # define __res_state_defined |