about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog117
-rw-r--r--sysdeps/mach/getsysstats.c19
2 files changed, 80 insertions, 56 deletions
diff --git a/ChangeLog b/ChangeLog
index cb61fd0a7d..3267bd6e23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,61 +1,8 @@
-Sat Sep 21 14:59:22 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
-
-	* sysdeps/mach/getsysstats.c: New file.
-
-	* shlib-versions (*-*-gnu*): Increment libc to 0.2 for upcoming
-	binary distribution.
+Sat Sep 21 23:42:39 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
 
-	* sysdeps/mach/hurd/Makefile (rtld-installed-name): Provide
-	definition to override dangerous one in Makeconfig.
-
-	* hurd/Makefile (install-headers-nosubdir): Install <rpc/netdb.h>.
-	($(includedir)/rpc/netdb.h): New rule.
-	[ This is XXX until sunrpc can be built; <rpc/netdb.h> is
-	essential. ]
-
-Fri Sep 20 16:06:06 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
+	* sysdeps/mach/getsysstats.c: Include <sys/sysinfo.h>.
+ 	(__get_nproc_conf): New function.
 
-	* sysdeps/mach/hurd/i386/init-first.c (_dl_start): Add definition,
-	to guarantee link errors if this is included in ld.so.
-
-Thu Sep 19 23:36:19 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
-
-	* hurd/hurdinit.c (__libc_argv): Provide common decl.
-	(_hurd_setproc): Don't declare __libc_argv here.
-
-Tue Sep 17 10:51:58 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
-
-	* malloc/memalign.c (memalign): Only acquire __libc_malloc_lock
-	for actual modifications to global state.  
-
-Fri Sep 13 01:21:36 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
-
-	* sysdeps/mach/Makefile (includes): Add -I$(common-objpfx)mach/.
-	* sysdeps/mach/hurd/Makefile (includes): Add
-	-I$(common-objpfx)hurd/.  Reported by Marcus Daniels.
-
-	* sysdeps/generic/schedbits.h (struct sched_param): Renamed from
-	struct sched_params.
-	* sysdeps/stub/sched_setp.c (__sched_setparam): struct
-	sched_params -> struct sched_param.
-	* sysdeps/stub/sched_getp.c (__sched_getparam): Likewise.
-	* sysdeps/stub/sched_sets.c (__sched_setscheduler): Likewise.
-
-Thu Sep 12 23:58:25 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
-
-	* sysdeps/mach/libc-lock.h (__libc_cleanup_region_start): Fix
-	syntax error.
-	
-	* stdio-common/Makefile: Put lockfile in routines
-	unconditionally. 
-		
-	* stdio-common/vfprintf.c (__flockfile, __funlockfile): Declare
-	this always, not just if _LIBC_REENTRANT.
-	(__funlockfile): Don't use weak_extern for this one;
-	__libc_cleanup_region_end might be defined and the use of
-	__funlockfile can't be protected the way the use of __flockfile
-	can be. 
-	
 Sun Sep 22 03:40:52 1996  Ulrich Drepper  <drepper@cygnus.com>
 
 	* resolv/resolv.h: Update to bind-4.9.5-T4B.
@@ -141,6 +88,64 @@ Sat Sep 21 03:00:19 1996  Ulrich Drepper  <drepper@cygnus.com>
 	* misc/hsearch.c: Likewise.
 	* misc/hsearch_r.c: Likewise.
 
+Sat Sep 21 14:59:22 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
+
+	* sysdeps/mach/getsysstats.c: New file.
+
+	* shlib-versions (*-*-gnu*): Increment libc to 0.2 for upcoming
+	binary distribution.
+
+	* sysdeps/mach/hurd/Makefile (rtld-installed-name): Provide
+	definition to override dangerous one in Makeconfig.
+
+	* hurd/Makefile (install-headers-nosubdir): Install <rpc/netdb.h>.
+	($(includedir)/rpc/netdb.h): New rule.
+	[ This is XXX until sunrpc can be built; <rpc/netdb.h> is
+	essential. ]
+
+Fri Sep 20 16:06:06 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
+
+	* sysdeps/mach/hurd/i386/init-first.c (_dl_start): Add definition,
+	to guarantee link errors if this is included in ld.so.
+
+Thu Sep 19 23:36:19 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
+
+	* hurd/hurdinit.c (__libc_argv): Provide common decl.
+	(_hurd_setproc): Don't declare __libc_argv here.
+
+Tue Sep 17 10:51:58 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
+
+	* malloc/memalign.c (memalign): Only acquire __libc_malloc_lock
+	for actual modifications to global state.  
+
+Fri Sep 13 01:21:36 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
+
+	* sysdeps/mach/Makefile (includes): Add -I$(common-objpfx)mach/.
+	* sysdeps/mach/hurd/Makefile (includes): Add
+	-I$(common-objpfx)hurd/.  Reported by Marcus Daniels.
+
+	* sysdeps/generic/schedbits.h (struct sched_param): Renamed from
+	struct sched_params.
+	* sysdeps/stub/sched_setp.c (__sched_setparam): struct
+	sched_params -> struct sched_param.
+	* sysdeps/stub/sched_getp.c (__sched_getparam): Likewise.
+	* sysdeps/stub/sched_sets.c (__sched_setscheduler): Likewise.
+
+Thu Sep 12 23:58:25 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
+
+	* sysdeps/mach/libc-lock.h (__libc_cleanup_region_start): Fix
+	syntax error.
+	
+	* stdio-common/Makefile: Put lockfile in routines
+	unconditionally. 
+		
+	* stdio-common/vfprintf.c (__flockfile, __funlockfile): Declare
+	this always, not just if _LIBC_REENTRANT.
+	(__funlockfile): Don't use weak_extern for this one;
+	__libc_cleanup_region_end might be defined and the use of
+	__funlockfile can't be protected the way the use of __flockfile
+	can be. 
+	
 Thu Sep 19 21:50:55 1996  Ulrich Drepper  <drepper@cygnus.com>
 
 	* sysdeps/posix/gettimeofday.c (__gettimeofday): Use localtime_r
diff --git a/sysdeps/mach/getsysstats.c b/sysdeps/mach/getsysstats.c
index 00d7c7609b..cd72e734ae 100644
--- a/sysdeps/mach/getsysstats.c
+++ b/sysdeps/mach/getsysstats.c
@@ -20,6 +20,25 @@ Cambridge, MA 02139, USA.  */
 #include <errno.h>
 #include <mach.h>
 #include <hurd.h>
+#include <sys/sysinfo.h>
+
+
+/* Return the number of processors configured on the system. */
+int
+__get_nproc_conf ()
+{
+  struct host_basic_info hbi;
+  kern_return_t err;
+  mach_msg_type_number_t cnt = HOST_BASIC_INFO_COUNT;
+  
+  err = __host_info (__mach_host_self (), HOST_BASIC_INFO, &hbi, &cnt);
+  if (err)
+    return __hurd_fail (err);
+  else if (cnt != HOST_BASIC_INFO_COUNT)
+    return __hurd_fail (EIEIO);
+
+  return hbi.max_cpus;
+}
 
 /* Return the number of processors currently available on the system. */
 int