aboutsummaryrefslogtreecommitdiff
path: root/linuxthreads
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-07-18 22:09:09 +0000
committerUlrich Drepper <drepper@redhat.com>2000-07-18 22:09:09 +0000
commit247c88694bd583af7967c9d785d5c3ebbd843de5 (patch)
tree68ed6f498e8f9a55dd1fad856830e5bc24811adc /linuxthreads
parent695a076385ac3b4f4e3aed34945e4c5c7606503f (diff)
downloadglibc-247c88694bd583af7967c9d785d5c3ebbd843de5.tar
glibc-247c88694bd583af7967c9d785d5c3ebbd843de5.tar.gz
glibc-247c88694bd583af7967c9d785d5c3ebbd843de5.tar.bz2
glibc-247c88694bd583af7967c9d785d5c3ebbd843de5.zip
Update.
* nss/makedb.c (main): Compare result of load_db with NSS_STATUS_SUCCESS and not 0. Patch by Jan Rekorajski <baggins@sith.mimuw.edu.pl>.
Diffstat (limited to 'linuxthreads')
-rw-r--r--linuxthreads/ChangeLog3
-rw-r--r--linuxthreads/pthread.c36
2 files changed, 38 insertions, 1 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 661dfd21bc..750ad05989 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,5 +1,8 @@
2000-07-18 Ulrich Drepper <drepper@redhat.com>
+ * pthread.c (pthread_initialize): Don't use syscond to determine
+ whether the machine has more than one processor.
+
* spinlock.c (__pthread_alt_timedlock): Add back one of the
removed thread_self calls.
diff --git a/linuxthreads/pthread.c b/linuxthreads/pthread.c
index c264da53ab..551086f84b 100644
--- a/linuxthreads/pthread.c
+++ b/linuxthreads/pthread.c
@@ -23,6 +23,7 @@
#include <fcntl.h>
#include <sys/wait.h>
#include <sys/resource.h>
+#include <sys/sysctl.h>
#include <shlib-compat.h>
#include "pthread.h"
#include "internals.h"
@@ -311,6 +312,39 @@ __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 (fd == -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:
- a constructor function that blocks the __pthread_sig_restart signal
@@ -410,7 +444,7 @@ static void pthread_initialize(void)
else
__on_exit (pthread_exit_process, NULL);
/* How many processors. */
- __pthread_smp_kernel = sysconf (_SC_NPROCESSORS_ONLN) > 1;
+ __pthread_smp_kernel = is_smp_system ();
}
void __pthread_initialize(void)