From b5e9addd22eabcce2e017947a3b5e8569ca6500a Mon Sep 17 00:00:00 2001 From: rmind Date: Sat, 26 Jan 2008 17:55:29 +0000 Subject: sched_setparam: fix the case when incorrect (according to the class) in-kernel priority is used. Reported by . Minor fixes for scheduling calls to conform the POSIX: - If pid is equal to zero, use the calling process; - In case of permission problem, return EPERM instead of EACESS; - sched_setscheduler() should return previously used policy; - pthread_* calls should return the error code or zero; Should fix the namespace problems (and builds of some packages): - Move cpuset_t defintion from pset.h to sched.h; - Remove the #include of pset.h in pthread.h; --- lib/libpthread/pthread.h | 10 ++++------ lib/libpthread/pthread_misc.c | 34 +++++++++++++++++++++++----------- 2 files changed, 27 insertions(+), 17 deletions(-) (limited to 'lib/libpthread') diff --git a/lib/libpthread/pthread.h b/lib/libpthread/pthread.h index 05e07f1e4e8..4ad7360dde7 100644 --- a/lib/libpthread/pthread.h +++ b/lib/libpthread/pthread.h @@ -1,4 +1,4 @@ -/* $NetBSD: pthread.h,v 1.27 2008/01/19 16:05:34 christos Exp $ */ +/* $NetBSD: pthread.h,v 1.28 2008/01/26 17:55:30 rmind Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -44,9 +44,6 @@ #include /* For timespec */ #include #include -#ifdef _NETBSD_SOURCE -#include -#endif #include @@ -190,13 +187,14 @@ int pthread_barrierattr_destroy(pthread_barrierattr_t *); int pthread_getschedparam(pthread_t, int * __restrict, struct sched_param * __restrict); int pthread_setschedparam(pthread_t, int, const struct sched_param *); -int pthread_getaffinity_np(pthread_t, size_t, cpuset_t *); -int pthread_setaffinity_np(pthread_t, size_t, cpuset_t *); int pthread_setschedprio(pthread_t, int); int *pthread__errno(void); #if defined(_NETBSD_SOURCE) +int pthread_getaffinity_np(pthread_t, size_t, cpuset_t *); +int pthread_setaffinity_np(pthread_t, size_t, cpuset_t *); + int pthread_mutex_held_np(pthread_mutex_t *); pthread_t pthread_mutex_owner_np(pthread_mutex_t *); diff --git a/lib/libpthread/pthread_misc.c b/lib/libpthread/pthread_misc.c index 42e77eae4a6..2c161b655f2 100644 --- a/lib/libpthread/pthread_misc.c +++ b/lib/libpthread/pthread_misc.c @@ -1,4 +1,4 @@ -/* $NetBSD: pthread_misc.c,v 1.4 2008/01/15 03:37:14 rmind Exp $ */ +/* $NetBSD: pthread_misc.c,v 1.5 2008/01/26 17:55:30 rmind Exp $ */ /*- * Copyright (c) 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include -__RCSID("$NetBSD: pthread_misc.c,v 1.4 2008/01/15 03:37:14 rmind Exp $"); +__RCSID("$NetBSD: pthread_misc.c,v 1.5 2008/01/26 17:55:30 rmind Exp $"); #include #include @@ -68,15 +68,15 @@ __strong_alias(__libc_thr_yield,pthread__sched_yield) int pthread_getschedparam(pthread_t thread, int *policy, struct sched_param *param) { - int error; if (pthread__find(thread) != 0) return ESRCH; - error = _sched_getparam(getpid(), thread->pt_lid, param); - if (error == 0) - *policy = param->sched_class; - return error; + if (_sched_getparam(getpid(), thread->pt_lid, param) < 0) + return errno; + + *policy = param->sched_class; + return 0; } int @@ -90,7 +90,10 @@ pthread_setschedparam(pthread_t thread, int policy, memcpy(&sp, param, sizeof(struct sched_param)); sp.sched_class = policy; - return _sched_setparam(getpid(), thread->pt_lid, &sp); + if (_sched_setparam(getpid(), thread->pt_lid, &sp) < 0) + return errno; + + return 0; } int @@ -100,7 +103,10 @@ pthread_getaffinity_np(pthread_t thread, size_t size, cpuset_t *cpuset) if (pthread__find(thread) != 0) return ESRCH; - return _sched_getaffinity(getpid(), thread->pt_lid, size, cpuset); + if (_sched_getaffinity(getpid(), thread->pt_lid, size, cpuset) < 0) + return errno; + + return 0; } int @@ -110,7 +116,10 @@ pthread_setaffinity_np(pthread_t thread, size_t size, cpuset_t *cpuset) if (pthread__find(thread) != 0) return ESRCH; - return _sched_setaffinity(getpid(), thread->pt_lid, size, cpuset); + if (_sched_setaffinity(getpid(), thread->pt_lid, size, cpuset) < 0) + return errno; + + return 0; } int @@ -123,7 +132,10 @@ pthread_setschedprio(pthread_t thread, int prio) sp.sched_class = SCHED_NONE; sp.sched_priority = prio; - return _sched_setparam(getpid(), thread->pt_lid, &sp); + if (_sched_setparam(getpid(), thread->pt_lid, &sp) < 0) + return errno; + + return 0; } int -- cgit