PERFORCE change 129913 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=129913

Change 129913 by peter at peter_daintree on 2007/12/01 23:02:33

	Unsed.

Affected files ...

.. //depot/projects/bike_sched/sys/amd64/conf/DEFAULTS#4 edit
.. //depot/projects/bike_sched/sys/arm/conf/AVILA#2 edit
.. //depot/projects/bike_sched/sys/conf/options#4 edit
.. //depot/projects/bike_sched/sys/i386/conf/DEFAULTS#4 edit
.. //depot/projects/bike_sched/sys/ia64/conf/DEFAULTS#4 edit
.. //depot/projects/bike_sched/sys/kern/kern_sig.c#4 edit
.. //depot/projects/bike_sched/sys/kern/kern_synch.c#5 edit
.. //depot/projects/bike_sched/sys/kern/kern_thread.c#6 edit
.. //depot/projects/bike_sched/sys/kern/sched_ule.c#8 edit
.. //depot/projects/bike_sched/sys/pc98/conf/DEFAULTS#4 edit
.. //depot/projects/bike_sched/sys/powerpc/conf/DEFAULTS#4 edit
.. //depot/projects/bike_sched/sys/sparc64/conf/DEFAULTS#4 edit

Differences ...

==== //depot/projects/bike_sched/sys/amd64/conf/DEFAULTS#4 (text+ko) ====

@@ -18,6 +18,3 @@
 # Default partitioning schemes
 options 	GEOM_BSD
 options 	GEOM_MBR
-
-# KSE support went from being default to a kernel option
-options 	KSE

==== //depot/projects/bike_sched/sys/arm/conf/AVILA#2 (text+ko) ====

@@ -49,7 +49,6 @@
 #options		DIAGNOSTIC
 
 options 	SCHED_4BSD		#4BSD scheduler
-options		KSE
 options 	INET			#InterNETworking
 options 	INET6			#IPv6 communications protocols
 options 	FFS			#Berkeley Fast Filesystem

==== //depot/projects/bike_sched/sys/conf/options#4 (text+ko) ====

@@ -98,7 +98,6 @@
 GEOM_VIRSTOR	opt_geom.h
 GEOM_VOL	opt_geom.h
 GEOM_ZERO	opt_geom.h
-KSE		opt_global.h
 KSTACK_MAX_PAGES
 KSTACK_PAGES
 KTRACE

==== //depot/projects/bike_sched/sys/i386/conf/DEFAULTS#4 (text+ko) ====

@@ -22,6 +22,3 @@
 # Default partitioning schemes
 options 	GEOM_BSD
 options 	GEOM_MBR
-
-# KSE support went from being default to a kernel option
-options 	KSE

==== //depot/projects/bike_sched/sys/ia64/conf/DEFAULTS#4 (text+ko) ====

@@ -17,6 +17,3 @@
 options 	GEOM_BSD
 options 	GEOM_PART_GPT
 options 	GEOM_PART_MBR
-
-# KSE support went from being default to a kernel option
-options 	KSE

==== //depot/projects/bike_sched/sys/kern/kern_sig.c#4 (text+ko) ====

@@ -2115,13 +2115,6 @@
 				goto out;
 			}
 			if (action == SIG_CATCH) {
-#ifdef KSE
-				/*
-				 * The process wants to catch it so it needs
-				 * to run at least one thread, but which one?
-				 * XXXKSE for now however, make them all run.
-				 */
-#endif
 				/*
 				 * The process wants to catch it so it needs
 				 * to run at least one thread, but which one?

==== //depot/projects/bike_sched/sys/kern/kern_synch.c#5 (text+ko) ====

@@ -435,10 +435,6 @@
 	 * We call thread_switchout after the KTR_SCHED prints above so kse
 	 * selecting a new thread to run does not show up as a preemption.
 	 */
-#ifdef KSE
-	if ((flags & SW_VOL) && (td->td_proc->p_flag & P_SA))
-		newtd = thread_switchout(td, flags, newtd);
-#endif
 	sched_switch(td, newtd, flags);
 	CTR3(KTR_SCHED, "mi_switch: running %p(%s) prio %d",
 	    td, td->td_name, td->td_priority);
@@ -502,8 +498,6 @@
 /*
  * Compute a tenex style load average of a quantity on
  * 1, 5 and 15 minute intervals.
- * XXXKSE   Needs complete rewrite when correct info is available.
- * Completely Bogus.. only works with 1:1 (but compiles ok now :-)
  */
 static void
 loadav(void *arg)

==== //depot/projects/bike_sched/sys/kern/kern_thread.c#6 (text+ko) ====

@@ -221,19 +221,6 @@
 }
 
 /*
- * Place an unused thread on the zombie list.
- * Use the slpq as that must be unused by now.
- */
-void
-thread_zombie(struct thread *td)
-{
-
-	mtx_lock_spin(&zombie_lock);
-	TAILQ_INSERT_HEAD(&zombie_threads, td, td_slpq);
-	mtx_unlock_spin(&zombie_lock);
-}
-
-/*
  * Reap zombie kse resource.
  */
 void
@@ -259,9 +246,6 @@
 			td_first = td_next;
 		}
 	}
-#ifdef KSE
-	upcall_reap();
-#endif
 }
 
 /*
@@ -284,6 +268,7 @@
 	return (td);
 }
 
+/*
  * Deallocate a thread.
  */
 void
@@ -330,7 +315,6 @@
 {
 	uint64_t new_switchtime;
 	struct thread *td;
-	struct thread *td2;
 	struct proc *p;
 
 	td = curthread;
@@ -487,13 +471,7 @@
 	struct proc *p = td->td_proc;
 
 	KASSERT((p->p_numthreads == 1), ("Unthreading with >1 threads"));
-#ifdef KSE
-	thread_lock(td);
-	thread_unlock(td);
-		thread_zombie(td->td_standin);
-#else
 	p->p_flag &= ~P_HADTHREADS;
-#endif
 }
 
 /*

==== //depot/projects/bike_sched/sys/kern/sched_ule.c#8 (text+ko) ====

@@ -2097,15 +2097,6 @@
 	CTR3(KTR_SCHED, "sched_exit_thread: %p(%s) prio %d",
 	    child, child->td_name, child->td_priority);
 
-#ifdef KSE
-	/*
-	 * KSE forks and exits so often that this penalty causes short-lived
-	 * threads to always be non-interactive.  This causes mozilla to
-	 * crawl under load.
-	 */
-	if ((td->td_pflags & TDP_SA) && td->td_proc == child->td_proc)
-		return;
-#endif
 	/*
 	 * Give the child's runtime to the parent without returning the
 	 * sleep time as a penalty to the parent.  This causes shells that

==== //depot/projects/bike_sched/sys/pc98/conf/DEFAULTS#4 (text+ko) ====

@@ -24,6 +24,3 @@
 # Default partitioning schemes
 options 	GEOM_BSD
 options 	GEOM_PC98
-
-# KSE support went from being default to a kernel option
-options 	KSE

==== //depot/projects/bike_sched/sys/powerpc/conf/DEFAULTS#4 (text+ko) ====

@@ -14,6 +14,3 @@
 
 options 	GEOM_PART_APM
 options 	GEOM_PART_MBR
-
-# KSE support went from being default to a kernel option
-options 	KSE

==== //depot/projects/bike_sched/sys/sparc64/conf/DEFAULTS#4 (text+ko) ====

@@ -13,9 +13,6 @@
 device		uart_sab82532
 device		uart_z8530
 
-# KSE support went from being default to a kernel option
-options 	KSE
-
 # Default partitioning schemes
 options 	GEOM_BSD
 options 	GEOM_SUNLABEL