diff options
author | andreast <andreast@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-09-19 20:27:11 +0000 |
---|---|---|
committer | andreast <andreast@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-09-19 20:27:11 +0000 |
commit | 84f90f7d600759655dead891eeab9f4a2f20eebb (patch) | |
tree | 2bbc3bd7ed9e5c0e7c24b786dc3adfb5eaef9818 /libgomp | |
parent | 464cc29ad11b1f3205c995e05ee5e87a089e5962 (diff) | |
download | gcc-84f90f7d600759655dead891eeab9f4a2f20eebb.tar.gz |
2008-09-19 Jakub Jelinek <jakub@redhat.com>
Andreas Tobler <a.tobler@schweiz.org>
* config/bsd/proc.c: New file.
* configure.tgt (*-*-darwin*): Use config_path "darwin posix".
* configure.ac: Check for header <sys/sysctl.h>
* configure: Regenerate.
* config.h.in: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@140497 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgomp')
-rw-r--r-- | libgomp/ChangeLog | 9 | ||||
-rw-r--r-- | libgomp/config/bsd/proc.c | 117 | ||||
-rwxr-xr-x | libgomp/configure | 3 | ||||
-rw-r--r-- | libgomp/configure.ac | 2 | ||||
-rw-r--r-- | libgomp/configure.tgt | 4 |
5 files changed, 133 insertions, 2 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index eaa08f9ca30..7403947cc70 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,12 @@ +2008-09-19 Jakub Jelinek <jakub@redhat.com> + Andreas Tobler <a.tobler@schweiz.org> + + * config/bsd/proc.c: New file. + * configure.tgt (*-*-darwin*): Use config_path "darwin posix". + * configure.ac: Check for header <sys/sysctl.h> + * configure: Regenerate. + * config.h.in: Likewise. + 2008-09-05 Janis Johnson <janis187@us.ibm.com> * testsuite/ligbomp.c/c.exp: Unset lang_test_file only if it exists. diff --git a/libgomp/config/bsd/proc.c b/libgomp/config/bsd/proc.c new file mode 100644 index 00000000000..513d8df3910 --- /dev/null +++ b/libgomp/config/bsd/proc.c @@ -0,0 +1,117 @@ +/* Copyright (C) 2005, 2006, 2008 Free Software Foundation, Inc. + Contributed by Richard Henderson <rth@redhat.com>. + + This file is part of the GNU OpenMP Library (libgomp). + + Libgomp is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + Libgomp 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 Lesser General Public License for + more details. + + You should have received a copy of the GNU Lesser General Public License + along with libgomp; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02110-1301, USA. */ + +/* As a special exception, if you link this library with other files, some + of which are compiled with GCC, to produce an executable, this library + does not by itself cause the resulting executable to be covered by the + GNU General Public License. This exception does not however invalidate + any other reasons why the executable file might be covered by the GNU + General Public License. */ + +/* This file contains system specific routines related to counting + online processors and dynamic load balancing. It is expected that + a system may well want to write special versions of each of these. + + The following implementation uses a mix of POSIX and BSD routines. */ + +#include "libgomp.h" +#include <unistd.h> +#include <stdlib.h> +#ifdef HAVE_GETLOADAVG +# ifdef HAVE_SYS_LOADAVG_H +# include <sys/loadavg.h> +# endif +#endif +#ifdef HAVE_SYS_SYSCTL_H +# include <sys/sysctl.h> +#endif + +static int +get_num_procs (void) +{ +#ifdef _SC_NPROCESSORS_ONLN + return sysconf (_SC_NPROCESSORS_ONLN); +#elif defined HW_NCPU + int ncpus = 1; + size_t len = sizeof(ncpus); + sysctl((int[2]) {CTL_HW, HW_NCPU}, 2, &ncpus, &len, NULL, 0); + return ncpus; +#else + return 0; +#endif +} + +/* At startup, determine the default number of threads. It would seem + this should be related to the number of cpus online. */ + +void +gomp_init_num_threads (void) +{ + int ncpus = get_num_procs (); + + if (ncpus > 0) + gomp_global_icv.nthreads_var = ncpus; +} + +/* When OMP_DYNAMIC is set, at thread launch determine the number of + threads we should spawn for this team. */ +/* ??? I have no idea what best practice for this is. Surely some + function of the number of processors that are *still* online and + the load average. Here I use the number of processors online + minus the 15 minute load average. */ + +unsigned +gomp_dynamic_max_threads (void) +{ + unsigned n_onln, loadavg; + unsigned nthreads_var = gomp_icv (false)->nthreads_var; + + n_onln = get_num_procs (); + if (!n_onln || n_onln > nthreads_var) + n_onln = nthreads_var; + + loadavg = 0; +#ifdef HAVE_GETLOADAVG + { + double dloadavg[3]; + if (getloadavg (dloadavg, 3) == 3) + { + /* Add 0.1 to get a kind of biased rounding. */ + loadavg = dloadavg[2] + 0.1; + } + } +#endif + + if (loadavg >= n_onln) + return 1; + else + return n_onln - loadavg; +} + +int +omp_get_num_procs (void) +{ + int ncpus = get_num_procs (); + if (ncpus <= 0) + ncpus = gomp_icv (false)->nthreads_var; + return ncpus; +} + +ialias (omp_get_num_procs) diff --git a/libgomp/configure b/libgomp/configure index 1fc0891b26f..a9f7df510f0 100755 --- a/libgomp/configure +++ b/libgomp/configure @@ -13540,7 +13540,8 @@ fi -for ac_header in unistd.h semaphore.h sys/loadavg.h sys/time.h + +for ac_header in unistd.h semaphore.h sys/loadavg.h sys/time.h sys/time.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then diff --git a/libgomp/configure.ac b/libgomp/configure.ac index 21aed2ba819..db8e2811a30 100644 --- a/libgomp/configure.ac +++ b/libgomp/configure.ac @@ -154,7 +154,7 @@ AC_SUBST(libtool_VERSION) AC_STDC_HEADERS AC_HEADER_TIME ACX_HEADER_STRING -AC_CHECK_HEADERS(unistd.h semaphore.h sys/loadavg.h sys/time.h) +AC_CHECK_HEADERS(unistd.h semaphore.h sys/loadavg.h sys/time.h sys/time.h) GCC_HEADER_STDINT(gstdint.h) diff --git a/libgomp/configure.tgt b/libgomp/configure.tgt index ef44a12a4bd..d66899fbf5f 100644 --- a/libgomp/configure.tgt +++ b/libgomp/configure.tgt @@ -111,6 +111,10 @@ case "${target}" in XLDFLAGS="${XLDFLAGS} -lposix4" ;; + *-*-darwin*) + config_path="bsd posix" + ;; + *) ;; |