diff options
| author | Uros Bizjak <ubizjak@gmail.com> | 2011-08-03 12:46:04 +0200 |
|---|---|---|
| committer | Uros Bizjak <uros@gcc.gnu.org> | 2011-08-03 12:46:04 +0200 |
| commit | e0b23d9fd37bfef08ad71836438ba88446ecb5b7 (patch) | |
| tree | 0e7d2a27bf466c8bf3dea438e99068bf00c01d1c /libgomp/config/linux/proc.c | |
| parent | e280f98126fb6f0df2d7d980615b97bc4d540e5e (diff) | |
| download | gcc-e0b23d9fd37bfef08ad71836438ba88446ecb5b7.zip gcc-e0b23d9fd37bfef08ad71836438ba88446ecb5b7.tar.gz gcc-e0b23d9fd37bfef08ad71836438ba88446ecb5b7.tar.bz2 | |
proc.h: New.
* config/linux/proc.h: New.
* config/linux/proc.c: Include "proc.h". Do not include <sched.h>.
(gomp_cpuset_popcount): Rename from cpuset_popcount. No more static.
(gomp_init_num_threads): Update call to cpuset_popcount.
(get_num_procs): Ditto.
* config/linux/affinity.c (gomp_init_affinity): Call
gomp_cpuset_popcount.
From-SVN: r177265
Diffstat (limited to 'libgomp/config/linux/proc.c')
| -rw-r--r-- | libgomp/config/linux/proc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libgomp/config/linux/proc.c b/libgomp/config/linux/proc.c index 01f51df..8d9cfb5 100644 --- a/libgomp/config/linux/proc.c +++ b/libgomp/config/linux/proc.c @@ -30,7 +30,7 @@ #define _GNU_SOURCE 1 #endif #include "libgomp.h" -#include <sched.h> +#include "proc.h" #include <stdlib.h> #include <unistd.h> #ifdef HAVE_GETLOADAVG @@ -40,8 +40,8 @@ #endif #ifdef HAVE_PTHREAD_AFFINITY_NP -static unsigned long -cpuset_popcount (cpu_set_t *cpusetp) +unsigned long +gomp_cpuset_popcount (cpu_set_t *cpusetp) { #ifdef CPU_COUNT /* glibc 2.6 and above provide a macro for this. */ @@ -76,7 +76,7 @@ gomp_init_num_threads (void) if (pthread_getaffinity_np (pthread_self (), sizeof (cpuset), &cpuset) == 0) { /* Count only the CPUs this process can use. */ - gomp_global_icv.nthreads_var = cpuset_popcount (&cpuset); + gomp_global_icv.nthreads_var = gomp_cpuset_popcount (&cpuset); if (gomp_global_icv.nthreads_var == 0) gomp_global_icv.nthreads_var = 1; return; @@ -99,7 +99,7 @@ get_num_procs (void) if (pthread_getaffinity_np (pthread_self (), sizeof (cpuset), &cpuset) == 0) { - int ret = cpuset_popcount (&cpuset); + int ret = gomp_cpuset_popcount (&cpuset); return ret != 0 ? ret : 1; } } |