svn commit: r209503 - stable/8/sys/kern

[John Baldwin]

Author: jhb
Date: Thu Jun 24 12:08:50 2010
New Revision: 209503
URL: http://svn.freebsd.org/changeset/base/209503

Log:
  MFC 208391:
  Assert that the thread passed to sched_bind() and sched_unbind() is
  curthread as those routines are only supported for curthread currently.

Modified:
  stable/8/sys/kern/sched_4bsd.c
  stable/8/sys/kern/sched_ule.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/kern/sched_4bsd.c
==============================================================================
--- stable/8/sys/kern/sched_4bsd.c      Thu Jun 24 10:14:31 2010        
(r209502)
+++ stable/8/sys/kern/sched_4bsd.c      Thu Jun 24 12:08:50 2010        
(r209503)
@@ -1462,9 +1462,8 @@ sched_bind(struct thread *td, int cpu)
 {
        struct td_sched *ts;
 
-       THREAD_LOCK_ASSERT(td, MA_OWNED);
-       KASSERT(TD_IS_RUNNING(td),
-           ("sched_bind: cannot bind non-running thread"));
+       THREAD_LOCK_ASSERT(td, MA_OWNED|MA_NOTRECURSED);
+       KASSERT(td == curthread, ("sched_bind: can only bind curthread"));
 
        ts = td->td_sched;
 
@@ -1482,6 +1481,7 @@ void
 sched_unbind(struct thread* td)
 {
        THREAD_LOCK_ASSERT(td, MA_OWNED);
+       KASSERT(td == curthread, ("sched_unbind: can only bind curthread"));
        td->td_flags &= ~TDF_BOUND;
 }
 

Modified: stable/8/sys/kern/sched_ule.c
==============================================================================
--- stable/8/sys/kern/sched_ule.c       Thu Jun 24 10:14:31 2010        
(r209502)
+++ stable/8/sys/kern/sched_ule.c       Thu Jun 24 12:08:50 2010        
(r209503)
@@ -2427,6 +2427,7 @@ sched_bind(struct thread *td, int cpu)
        struct td_sched *ts;
 
        THREAD_LOCK_ASSERT(td, MA_OWNED|MA_NOTRECURSED);
+       KASSERT(td == curthread, ("sched_bind: can only bind curthread"));
        ts = td->td_sched;
        if (ts->ts_flags & TSF_BOUND)
                sched_unbind(td);
@@ -2448,6 +2449,7 @@ sched_unbind(struct thread *td)
        struct td_sched *ts;
 
        THREAD_LOCK_ASSERT(td, MA_OWNED);
+       KASSERT(td == curthread, ("sched_unbind: can only bind curthread"));
        ts = td->td_sched;
        if ((ts->ts_flags & TSF_BOUND) == 0)
                return;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"