Print this page
6583 remove whole-process swapping
@@ -129,12 +129,10 @@
static void rt_parmsget(kthread_t *, void *);
static void rt_preempt(kthread_t *);
static void rt_setrun(kthread_t *);
static void rt_tick(kthread_t *);
static void rt_wakeup(kthread_t *);
-static pri_t rt_swapin(kthread_t *, int);
-static pri_t rt_swapout(kthread_t *, int);
static pri_t rt_globpri(kthread_t *);
static void rt_yield(kthread_t *);
static int rt_alloc(void **, int);
static void rt_free(void *);
@@ -168,12 +166,10 @@
rt_parmsset,
rt_nullsys, /* stop */
rt_nullsys, /* exit */
rt_nullsys, /* active */
rt_nullsys, /* inactive */
- rt_swapin,
- rt_swapout,
rt_nullsys, /* trapret */
rt_preempt,
rt_setrun,
rt_nullsys, /* sleep */
rt_tick,
@@ -900,20 +896,13 @@
*/
static void
rt_preempt(kthread_t *t)
{
rtproc_t *rtpp = (rtproc_t *)(t->t_cldata);
- klwp_t *lwp;
ASSERT(THREAD_LOCK_HELD(t));
- /*
- * If the state is user I allow swapping because I know I won't
- * be holding any locks.
- */
- if ((lwp = curthread->t_lwp) != NULL && lwp->lwp_state == LWP_USER)
- t->t_schedflag &= ~TS_DONT_SWAP;
if ((rtpp->rt_flags & RTBACKQ) != 0) {
rtpp->rt_timeleft = rtpp->rt_pquantum;
rtpp->rt_flags &= ~RTBACKQ;
setbackdq(t);
} else
@@ -942,48 +931,10 @@
rtpp->rt_flags &= ~RTBACKQ;
setbackdq(t);
}
/*
- * Returns the priority of the thread, -1 if the thread is loaded or ineligible
- * for swapin.
- *
- * FX and RT threads are designed so that they don't swapout; however, it
- * is possible that while the thread is swapped out and in another class, it
- * can be changed to FX or RT. Since these threads should be swapped in as
- * soon as they're runnable, rt_swapin returns SHRT_MAX, and fx_swapin
- * returns SHRT_MAX - 1, so that it gives deference to any swapped out RT
- * threads.
- */
-/* ARGSUSED */
-static pri_t
-rt_swapin(kthread_t *t, int flags)
-{
- pri_t tpri = -1;
-
- ASSERT(THREAD_LOCK_HELD(t));
-
- if (t->t_state == TS_RUN && (t->t_schedflag & TS_LOAD) == 0) {
- tpri = (pri_t)SHRT_MAX;
- }
-
- return (tpri);
-}
-
-/*
- * Return an effective priority for swapout.
- */
-/* ARGSUSED */
-static pri_t
-rt_swapout(kthread_t *t, int flags)
-{
- ASSERT(THREAD_LOCK_HELD(t));
-
- return (-1);
-}
-
-/*
* Check for time slice expiration (unless thread has infinite time
* slice). If time slice has expired arrange for thread to be preempted
* and placed on back of queue.
*/
static void