PERFORCE change 62619 for review

[Julian Elischer]

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

Change 62619 by julian at julian_ref on 2004/10/04 03:26:05

	CTR doesn't need function +line.. it's there anyhow.
	whitespace.
	correct alq config.

Affected files ...

.. //depot/projects/nsched/sys/conf/files#28 edit
.. //depot/projects/nsched/sys/kern/kern_kse.c#31 edit
.. //depot/projects/nsched/sys/kern/sched_4bsd.c#59 edit
.. //depot/projects/nsched/sys/kern/sched_ule.c#37 edit

Differences ...

==== //depot/projects/nsched/sys/conf/files#28 (text+ko) ====

@@ -1060,7 +1060,7 @@
 kern/init_sysent.c	standard
 kern/kern_acct.c	standard
 kern/kern_acl.c		standard
-kern/kern_alq.c		optional ktr_alq
+kern/kern_alq.c		optional alq
 kern/kern_clock.c	standard
 kern/kern_condvar.c	standard
 kern/kern_conf.c	standard

==== //depot/projects/nsched/sys/kern/kern_kse.c#31 (text+ko) ====

@@ -567,7 +567,6 @@
 		p->p_flag |= P_SA|P_HADTHREADS;
 	}
 
-
 	PROC_UNLOCK(p);
 	/*
 	 * Now pay attention!
@@ -615,7 +614,6 @@
 		newkg = kg;
 	}
 
-
 	/* 
 	 * This test is a bit "indirect".
 	 * It might simplify things if we made a direct way of testing

==== //depot/projects/nsched/sys/kern/sched_4bsd.c#59 (text+ko) ====

@@ -122,9 +122,7 @@
 #define SLOT_RELEASE(kg)						\
 do {									\
 	kg->kg_avail_opennings++; 					\
-	CTR5(KTR_RUNQ, "%s line %d: kg %p(%d) Slot released (->%d)",	\
-	__FUNCTION__,							\
-	__LINE__,							\
+	CTR3(KTR_RUNQ, "kg %p(%d) Slot released (->%d)",		\
 	kg,								\
 	kg->kg_concurrency,						\
 	 kg->kg_avail_opennings);					\
@@ -135,9 +133,7 @@
 #define SLOT_USE(kg)							\
 do {									\
 	kg->kg_avail_opennings--; 					\
-	CTR5(KTR_RUNQ, "%s line %d: kg %p(%d) Slot used (->%d)",	\
-	__FUNCTION__,							\
-	__LINE__,							\
+	CTR3(KTR_RUNQ, "kg %p(%d) Slot used (->%d)",			\
 	kg,								\
 	kg->kg_concurrency,						\
 	 kg->kg_avail_opennings);					\

==== //depot/projects/nsched/sys/kern/sched_ule.c#37 (text+ko) ====

@@ -167,27 +167,23 @@
 #define SLOT_RELEASE(kg)						\
 do {									\
 	kg->kg_avail_opennings++; 					\
-	CTR5(KTR_RUNQ, "%s line %d: kg %p(%d) Slot released (->%d)",	\
-	__FUNCTION__,							\
-	__LINE__,							\
+	CTR3(KTR_RUNQ, "kg %p(%d) Slot released (->%d)",		\
 	kg,								\
 	kg->kg_concurrency,						\
 	 kg->kg_avail_opennings);					\
-	KASSERT((kg->kg_avail_opennings <= kg->kg_concurrency),		\
-	    ("slots out of whack"));					\
+	/*KASSERT((kg->kg_avail_opennings <= kg->kg_concurrency),	\
+	    ("slots out of whack")); */					\
 } while (0)
 
 #define SLOT_USE(kg)							\
 do {									\
 	kg->kg_avail_opennings--; 					\
-	CTR5(KTR_RUNQ, "%s line %d: kg %p(%d) Slot used (->%d)",	\
-	__FUNCTION__,							\
-	__LINE__,							\
+	CTR3(KTR_RUNQ, "kg %p(%d) Slot used (->%d)",			\
 	kg,								\
 	kg->kg_concurrency,						\
 	 kg->kg_avail_opennings);					\
-	KASSERT((kg->kg_avail_opennings >= 0),				\
-	    ("slots out of whack"));					\
+	/*KASSERT((kg->kg_avail_opennings >= 0),			\
+	    ("slots out of whack"));*/ 					\
 } while (0)