Switch the sleep/wakeup and condition variable implementations to use the

sleep queue interface:
- Sleep queues attempt to merge some of the benefits of both sleep queues
  and condition variables.  Having sleep qeueus in a hash table avoids
  having to allocate a queue head for each wait channel.  Thus, struct cv
  has shrunk down to just a single char * pointer now.  However, the
  hash table does not hold threads directly, but queue heads.  This means
  that once you have located a queue in the hash bucket, you no longer have
  to walk the rest of the hash chain looking for threads.  Instead, you have
  a list of all the threads sleeping on that wait channel.
- Outside of the sleepq code and the sleep/cv code the kernel no longer
  differentiates between cv's and sleep/wakeup.  For example, calls to
  abortsleep() and cv_abort() are replaced with a call to sleepq_abort().
  Thus, the TDF_CVWAITQ flag is removed.  Also, calls to unsleep() and
  cv_waitq_remove() have been replaced with calls to sleepq_remove().
- The sched_sleep() function no longer accepts a priority argument as
  sleep's no longer inherently bump the priority.  Instead, this is soley
  a propery of msleep() which explicitly calls sched_prio() before
  blocking.
- The TDF_ONSLEEPQ flag has been dropped as it was never used.  The
  associated TDF_SET_ONSLEEPQ and TDF_CLR_ON_SLEEPQ macros have also been
  dropped and replaced with a single explicit clearing of td_wchan.
  TD_SET_ONSLEEPQ() would really have only made sense if it had taken
  the wait channel and message as arguments anyway.  Now that that only
  happens in one place, a macro would be overkill.

1 files changed, 7 insertions, 11 deletions

diff --git a/sys/kern/kern_kse.c b/sys/kern/kern_kse.c
index 3adc8ae..cb46e9d 100644
--- a/sys/kern/kern_kse.c
+++ b/sys/kern/kern_kse.c
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/filedesc.h>
 #include <sys/sched.h>
 #include <sys/signalvar.h>
+#include <sys/sleepqueue.h>
 #include <sys/sx.h>
 #include <sys/tty.h>
 #include <sys/turnstile.h>
@@ -188,6 +189,7 @@ thread_init(void *mem, int size)
 	td = (struct thread *)mem;
 	vm_thread_new(td, 0);
 	cpu_thread_setup(td);
+	td->td_sleepqueue = sleepq_alloc();
 	td->td_turnstile = turnstile_alloc();
 	td->td_sched = (struct td_sched *)&td[1];
 }
@@ -202,6 +204,7 @@ thread_fini(void *mem, int size)
 
 	td = (struct thread *)mem;
 	turnstile_free(td->td_turnstile);
+	sleepq_free(td->td_sleepqueue);
 	vm_thread_dispose(td);
 }
 
@@ -456,12 +459,8 @@ kse_thr_interrupt(struct thread *td, struct kse_thr_interrupt_args *uap)
 				td2->td_intrval = EINTR;
 			else
 				td2->td_intrval = ERESTART;
-			if (TD_ON_SLEEPQ(td2) && (td2->td_flags & TDF_SINTR)) {
-				if (td2->td_flags & TDF_CVWAITQ)
-					cv_abort(td2);
-				else
-					abortsleep(td2);
-			}
+			if (TD_ON_SLEEPQ(td2) && (td2->td_flags & TDF_SINTR))
+				sleepq_abort(td2);
 			mtx_unlock_spin(&sched_lock);
 		}
 		PROC_UNLOCK(p);
@@ -648,7 +647,7 @@ kse_wakeup(struct thread *td, struct kse_wakeup_args *uap)
 		           ((td2->td_wchan == &kg->kg_completed) ||
 			    (td2->td_wchan == &p->p_siglist &&
 			     (ku->ku_mflags & KMF_WAITSIGEVENT)))) {
-			abortsleep(td2);
+			sleepq_abort(td2);
 		} else {
 			ku->ku_flags |= KUF_DOUPCALL;
 		}
@@ -1907,10 +1906,7 @@ thread_single(int force_exit)
 					}
 					if (TD_ON_SLEEPQ(td2) &&
 					    (td2->td_flags & TDF_SINTR)) {
-						if (td2->td_flags & TDF_CVWAITQ)
-							cv_abort(td2);
-						else
-							abortsleep(td2);
+						sleepq_abort(td2);
 					}
 				} else {
 					if (TD_IS_SUSPENDED(td2))