From owner-p4-projects@FreeBSD.ORG Mon Oct 4 03:26:13 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E61CC16A4D0; Mon, 4 Oct 2004 03:26:12 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9B04916A4CE for ; Mon, 4 Oct 2004 03:26:12 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 74F3143D41 for ; Mon, 4 Oct 2004 03:26:12 +0000 (GMT) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i943QCfM027539 for ; Mon, 4 Oct 2004 03:26:12 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i943QCgB027536 for perforce@freebsd.org; Mon, 4 Oct 2004 03:26:12 GMT (envelope-from julian@freebsd.org) Date: Mon, 4 Oct 2004 03:26:12 GMT Message-Id: <200410040326.i943QCgB027536@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Subject: PERFORCE change 62619 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Oct 2004 03:26:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=62619 Change 62619 by julian@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)