diff options
| author | des <des@FreeBSD.org> | 2006-03-29 05:38:19 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2006-03-29 05:38:19 +0000 |
| commit | 590f74742c3404d7cf7de1d2dbba7ffe7e80a4e8 (patch) | |
| tree | 92d647bce752feba552f4ea5a9d791dd6f84d874 /lib/libkse/thread | |
| parent | 7415466d60d1ee5bbced95a31d13510067d11ca6 (diff) | |
| download | FreeBSD-src-590f74742c3404d7cf7de1d2dbba7ffe7e80a4e8.zip FreeBSD-src-590f74742c3404d7cf7de1d2dbba7ffe7e80a4e8.tar.gz | |
Bring libpthread up to WARNS level 2.
Reviewed by: deischen
Diffstat (limited to 'lib/libkse/thread')
| -rw-r--r-- | lib/libkse/thread/thr_getprio.c | 6 | ||||
| -rw-r--r-- | lib/libkse/thread/thr_private.h | 16 |
2 files changed, 15 insertions, 7 deletions
diff --git a/lib/libkse/thread/thr_getprio.c b/lib/libkse/thread/thr_getprio.c index 07c1b0b..875c1b3 100644 --- a/lib/libkse/thread/thr_getprio.c +++ b/lib/libkse/thread/thr_getprio.c @@ -31,8 +31,12 @@ * * $FreeBSD$ */ + +#include "namespace.h" #include <errno.h> #include <pthread.h> +#include "un-namespace.h" + #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_getprio); @@ -46,7 +50,7 @@ _pthread_getprio(pthread_t pthread) int policy, ret; struct sched_param param; - if ((ret = pthread_getschedparam(pthread, &policy, ¶m)) == 0) + if ((ret = _pthread_getschedparam(pthread, &policy, ¶m)) == 0) ret = param.sched_priority; else { /* Invalid thread: */ diff --git a/lib/libkse/thread/thr_private.h b/lib/libkse/thread/thr_private.h index 9d58078..f839960 100644 --- a/lib/libkse/thread/thr_private.h +++ b/lib/libkse/thread/thr_private.h @@ -107,12 +107,16 @@ /* * Kernel fatal error handler macro. */ -#define PANIC(string) _thr_exit(__FILE__,__LINE__,string) +#define PANIC(string) _thr_exit(__FILE__, __LINE__, string) /* Output debug messages like this: */ -#define stdout_debug(args...) _thread_printf(STDOUT_FILENO, ##args) -#define stderr_debug(args...) _thread_printf(STDOUT_FILENO, ##args) +#ifdef STDOUT_FILENO +#define stdout_debug(...) _thread_printf(STDOUT_FILENO, __VA_ARGS__) +#endif +#ifdef STDERR_FILENO +#define stderr_debug(...) _thread_printf(STDERR_FILENO, __VA_ARGS__) +#endif #define DBG_MUTEX 0x0001 #define DBG_SIG 0x0002 @@ -449,7 +453,7 @@ struct pthread_spinlock { */ struct pthread_cleanup { struct pthread_cleanup *next; - void (*routine) (); + void (*routine) (void *); void *routine_arg; int onstack; }; @@ -486,7 +490,7 @@ struct pthread_attr { #define THR_SIGNAL_THREAD 0x200 /* This is a signal thread */ int flags; void *arg_attr; - void (*cleanup_attr) (); + void (*cleanup_attr) (void *); void *stackaddr_attr; size_t stacksize_attr; size_t guardsize_attr; @@ -1131,7 +1135,7 @@ kse_critical_t _kse_critical_enter(void); void _kse_critical_leave(kse_critical_t); int _kse_in_critical(void); void _kse_free(struct pthread *, struct kse *); -void _kse_init(); +void _kse_init(void); struct kse_group *_kseg_alloc(struct pthread *); void _kse_lock_wait(struct lock *, struct lockuser *lu); void _kse_lock_wakeup(struct lock *, struct lockuser *lu); |
