Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

disable PTHREAD_CONCURRENCY until the bugs are fixed.

Browse Source
This commit is contained in:
christos 2009-03-06 14:00:40 +00:00
parent 0c5245cd7e
commit 7ef7e1b997
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sys/compat/sa/compat_sa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: compat_sa.c,v 1.8 2009/03/02 22:11:28 ad Exp $ */
/* $NetBSD: compat_sa.c,v 1.9 2009/03/06 14:00:40 christos Exp $ */
/*-
* Copyright (c) 2001, 2004, 2005, 2006 The NetBSD Foundation, Inc.
@ -41,7 +41,7 @@
#include "opt_ktrace.h"
#include "opt_multiprocessor.h"
#include "opt_sa.h"
__KERNEL_RCSID(0, "$NetBSD: compat_sa.c,v 1.8 2009/03/02 22:11:28 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: compat_sa.c,v 1.9 2009/03/06 14:00:40 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -70,6 +70,15 @@ __KERNEL_RCSID(0, "$NetBSD: compat_sa.c,v 1.8 2009/03/02 22:11:28 ad Exp $");
*/
#ifdef KERN_SA
/*
* SA_CONCURRENCY is buggy can lead to kernel crashes.
*/
#ifdef SA_CONCURRENCY
#ifndef MULTIPROCESSOR
#error "SA_CONCURRENCY is only valid on MULTIPROCESSOR kernels"
#endif
#endif
/*
* memory pool for sadata structures
*/
@ -101,7 +110,7 @@ static inline void sa_setstackfree(struct sastack *, struct sadata *);
static struct sastack *sa_getstack(struct sadata *);
static inline struct sastack *sa_getstack0(struct sadata *);
static inline int sast_compare(struct sastack *, struct sastack *);
#ifdef MULTIPROCESSOR
#ifdef SA_CONCURRENCY
static int sa_increaseconcurrency(struct lwp *, int);
#endif
static void sa_switchcall(void *);
@ -821,7 +830,7 @@ sys_sa_enable(struct lwp *l, const void *v, register_t *retval)
* Must be called with sa_mutex locked. Will unlock and relock as
* needed, and will lock p_lock. Will exit with sa_mutex locked.
*/
#ifdef MULTIPROCESSOR
#ifdef SA_CONCURRENCY
static int
sa_increaseconcurrency(struct lwp *l, int concurrency)
@ -916,7 +925,7 @@ sys_sa_setconcurrency(struct lwp *l, const struct sys_sa_setconcurrency_args *ua
{
struct proc *p = l->l_proc;
struct sadata *sa = p->p_sa;
#ifdef MULTIPROCESSOR
#ifdef SA_CONCURRENCY
struct sadata_vp *vp = l->l_savp;
struct lwp *l2;
int ncpus;
@ -944,7 +953,7 @@ sys_sa_setconcurrency(struct lwp *l, const struct sys_sa_setconcurrency_args *ua
* XXX Should we ever support hot-plug CPUs, this will need
* adjustment.
*/
#ifdef MULTIPROCESSOR
#ifdef SA_CONCURRENCY
mutex_enter(&sa->sa_mutex);
if (SCARG(uap, concurrency) > sa->sa_maxconcurrency) {
@ -959,7 +968,7 @@ sys_sa_setconcurrency(struct lwp *l, const struct sys_sa_setconcurrency_args *ua
DPRINTFN(11,("sys_sa_concurrency(%d.%d) want %d, have %d, max %d\n",
p->p_pid, l->l_lid, SCARG(uap, concurrency),
sa->sa_concurrency, sa->sa_maxconcurrency));
#ifdef MULTIPROCESSOR
#ifdef SA_CONCURRENCY
if (SCARG(uap, concurrency) <= sa->sa_concurrency) {
mutex_exit(&sa->sa_mutex);
return 0;
@ -2596,5 +2605,4 @@ debug_print_sa(struct proc *p)
#endif
#else /* KERN_SA */
#endif /* KERN_SA */