From a1ee5b32fc698297149c770417354441ee62701e Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Fri, 5 Feb 2010 19:26:24 +0100 Subject: pthread_{attr_,}{s,g}etaffinity: cleanup symbol names and hide __determine_cpumask_size. Signed-off-by: Bernhard Reutner-Fischer --- .../nptl/sysdeps/unix/sysv/linux/pthread_attr_getaffinity.c | 3 +-- .../nptl/sysdeps/unix/sysv/linux/pthread_attr_setaffinity.c | 5 ++--- libpthread/nptl/sysdeps/unix/sysv/linux/pthread_getaffinity.c | 5 ++--- libpthread/nptl/sysdeps/unix/sysv/linux/pthread_setaffinity.c | 10 +++++----- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_attr_getaffinity.c b/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_attr_getaffinity.c index 5a3d418a9..aec1bc31c 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_attr_getaffinity.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_attr_getaffinity.c @@ -26,7 +26,7 @@ int -__pthread_attr_getaffinity_new (const pthread_attr_t *attr, size_t cpusetsize, +__pthread_attr_getaffinity_np(const pthread_attr_t *attr, size_t cpusetsize, cpu_set_t *cpuset) { const struct pthread_attr *iattr; @@ -53,4 +53,3 @@ __pthread_attr_getaffinity_new (const pthread_attr_t *attr, size_t cpusetsize, return 0; } -weak_alias(__pthread_attr_getaffinity_new, pthread_attr_getaffinity_np) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_attr_setaffinity.c b/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_attr_setaffinity.c index e3414999c..580cf2c43 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_attr_setaffinity.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_attr_setaffinity.c @@ -28,10 +28,10 @@ /* Defined in pthread_setaffinity.c. */ extern size_t __kernel_cpumask_size; extern int __determine_cpumask_size (pid_t tid); - +libpthread_hidden_proto(__determine_cpumask_size) int -__pthread_attr_setaffinity_new (pthread_attr_t *attr, size_t cpusetsize, +pthread_attr_setaffinity_np (pthread_attr_t *attr, size_t cpusetsize, const cpu_set_t *cpuset) { struct pthread_attr *iattr; @@ -79,4 +79,3 @@ __pthread_attr_setaffinity_new (pthread_attr_t *attr, size_t cpusetsize, return 0; } -weak_alias(__pthread_attr_setaffinity_new, pthread_attr_setaffinity_np) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_getaffinity.c b/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_getaffinity.c index 3ca9d7d94..189af774e 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_getaffinity.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_getaffinity.c @@ -27,7 +27,7 @@ int -__pthread_getaffinity_new (pthread_t th, size_t cpusetsize, cpu_set_t *cpuset) +__pthread_getaffinity_np (pthread_t th, size_t cpusetsize, cpu_set_t *cpuset) { const struct pthread *pd = (const struct pthread *) th; @@ -42,5 +42,4 @@ __pthread_getaffinity_new (pthread_t th, size_t cpusetsize, cpu_set_t *cpuset) return 0; } -strong_alias(__pthread_getaffinity_new, __pthread_getaffinity_np) -strong_alias(__pthread_getaffinity_new, pthread_getaffinity_np) +strong_alias(__pthread_getaffinity_np, pthread_getaffinity_np) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_setaffinity.c b/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_setaffinity.c index fa7b48904..d28b6f2f3 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_setaffinity.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/pthread_setaffinity.c @@ -29,8 +29,9 @@ size_t __kernel_cpumask_size; /* Determine the current affinity. As a side affect we learn about the size of the cpumask_t in the kernel. */ -int -__determine_cpumask_size (pid_t tid) +extern int __determine_cpumask_size (pid_t tid); +libpthread_hidden_proto(__determine_cpumask_size) +int __determine_cpumask_size (pid_t tid) { INTERNAL_SYSCALL_DECL (err); int res; @@ -50,10 +51,10 @@ __determine_cpumask_size (pid_t tid) return 0; } - +libpthread_hidden_def(__determine_cpumask_size) int -__pthread_setaffinity_new (pthread_t th, size_t cpusetsize, +pthread_setaffinity_np (pthread_t th, size_t cpusetsize, const cpu_set_t *cpuset) { const struct pthread *pd = (const struct pthread *) th; @@ -83,4 +84,3 @@ __pthread_setaffinity_new (pthread_t th, size_t cpusetsize, ? INTERNAL_SYSCALL_ERRNO (res, err) : 0); } -weak_alias(__pthread_setaffinity_new, pthread_setaffinity_np) -- cgit v1.2.3