diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | lib/nproc.c | 15 | ||||
| -rw-r--r-- | m4/nproc.m4 | 7 |
3 files changed, 26 insertions, 3 deletions
@@ -1,5 +1,12 @@ 2009-10-18 Bruno Haible <bruno@clisp.org> + Implement nproc for IRIX. + * lib/nproc.c: Include <sys/sysmp.h>. + (num_processors): On IRIX systems, try sysmp. + * m4/nproc.m4 (gl_PREREQ_NPROC): Check for sys/sysmp.h and sysmp. + +2009-10-18 Bruno Haible <bruno@clisp.org> + Implement nproc for HP-UX. * lib/nproc.c: Include <sys/pstat.h> (num_processors): On HP-UX systems, try pstat_getdynamic. diff --git a/lib/nproc.c b/lib/nproc.c index 48c0d8aff6..04a047cfb4 100644 --- a/lib/nproc.c +++ b/lib/nproc.c @@ -29,6 +29,10 @@ # include <sys/pstat.h> #endif +#if HAVE_SYS_SYSMP_H +# include <sys/sysmp.h> +#endif + #if HAVE_SYS_PARAM_H # include <sys/param.h> #endif @@ -62,6 +66,17 @@ num_processors (void) } #endif +#if HAVE_SYSMP && defined MP_NAPROCS + { /* This works on IRIX. */ + /* MP_NPROCS yields the number of installed processors. + MP_NAPROCS yields the number of processors available to unprivileged + processes. We need the latter. */ + int nprocs = sysmp (MP_NAPROCS); + if (0 < nprocs) + return nprocs; + } +#endif + #if HAVE_SYSCTL && defined HW_NCPU { /* This works on MacOS X, FreeBSD, NetBSD, OpenBSD. */ int nprocs; diff --git a/m4/nproc.m4 b/m4/nproc.m4 index 5bcae8028d..5e80fa6939 100644 --- a/m4/nproc.m4 +++ b/m4/nproc.m4 @@ -1,4 +1,4 @@ -# nproc.m4 serial 2 +# nproc.m4 serial 3 dnl Copyright (C) 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -12,7 +12,8 @@ AC_DEFUN([gl_NPROC], # Prerequisites of lib/nproc.c. AC_DEFUN([gl_PREREQ_NPROC], [ - AC_CHECK_HEADERS([sys/pstat.h sys/param.h],,, [AC_INCLUDES_DEFAULT]) + AC_CHECK_HEADERS([sys/pstat.h sys/sysmp.h sys/param.h],,, + [AC_INCLUDES_DEFAULT]) dnl <sys/sysctl.h> requires <sys/param.h> on OpenBSD 4.0. AC_CHECK_HEADERS([sys/sysctl.h],,, [AC_INCLUDES_DEFAULT @@ -20,5 +21,5 @@ AC_DEFUN([gl_PREREQ_NPROC], # include <sys/param.h> #endif ]) - AC_CHECK_FUNCS([pstat_getdynamic sysctl]) + AC_CHECK_FUNCS([pstat_getdynamic sysmp sysctl]) ]) |