FreeBSD port (48): SMP test

[Bruno Haible <bruno at clisp dot org>]

The Linuxthreads has a test whether the machine has several CPUs, which is
kernel dependent. Here is a patch to move this to a Linux specific file,
so that the FreeBSD port can use its own implementation of this test.

Also, include <sys/time.h> to avoid a warning:

pthread.c: In function `__pthread_timedsuspend_old':
pthread.c:1151: warning: implicit declaration of function `__gettimeofday'


linuxthreads/ChangeLog:
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.

diff -r -c3 glibc-20020828.bak/linuxthreads/pthread.c glibc-20020828/linuxthreads/pthread.c
*** glibc-20020828.bak/linuxthreads/pthread.c	Wed Aug 28 12:51:03 2002
--- glibc-20020828/linuxthreads/pthread.c	Fri Aug 30 11:04:30 2002
***************
*** 24,35 ****
  #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"
  #include "spinlock.h"
  #include "restart.h"
  #include <ldsodefs.h>
  #include <tls.h>
  #include <locale.h>		/* for __uselocale */
--- 24,36 ----
  #include <fcntl.h>
  #include <sys/wait.h>
  #include <sys/resource.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,397 ****
  #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:
--- 362,367 ----
*** /dev/null	Thu Sep  5 02:03:34 2002
--- glibc-20020828/linuxthreads/sysdeps/unix/sysv/linux/smp.h	Wed Jul 24 00:08:32 2002
***************
*** 0 ****
--- 1,47 ----
+ /* 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;
+ }