From owner-cvs-src@FreeBSD.ORG Fri Feb 4 22:01:08 2005 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 96AC716A4CE for ; Fri, 4 Feb 2005 22:01:08 +0000 (GMT) Received: from smtp814.mail.sc5.yahoo.com (smtp814.mail.sc5.yahoo.com [66.163.170.84]) by mx1.FreeBSD.org (Postfix) with SMTP id 3376443D5E for ; Fri, 4 Feb 2005 22:01:08 +0000 (GMT) (envelope-from noackjr@alumni.rice.edu) Received: from unknown (HELO optimator.noacks.org) (noacks@swbell.net@70.240.249.100 with login) by smtp814.mail.sc5.yahoo.com with SMTP; 4 Feb 2005 22:01:08 -0000 Received: from localhost (localhost [127.0.0.1]) by optimator.noacks.org (Postfix) with ESMTP id 4293861F1; Fri, 4 Feb 2005 16:01:07 -0600 (CST) Received: from optimator.noacks.org ([127.0.0.1]) by localhost (optimator.noacks.org [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 03215-11; Fri, 4 Feb 2005 16:01:05 -0600 (CST) Received: from [127.0.0.1] (optimator [192.168.1.11]) by optimator.noacks.org (Postfix) with ESMTP id B00446113; Fri, 4 Feb 2005 16:01:05 -0600 (CST) Message-ID: <4203F0A1.7090708@alumni.rice.edu> Date: Fri, 04 Feb 2005 16:01:05 -0600 From: Jon Noack User-Agent: Mozilla Thunderbird 1.0 (Windows/20041206) X-Accept-Language: en-us, en MIME-Version: 1.0 To: jeff@freebsd.org Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Scanned: amavisd-new at noacks.org cc: cvs-src@freebsd.org Subject: Re: cvs commit: src/sys/kern kern_clock.c kern_switch.ckern_synch.c sched_4bsd.c sched_ule.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: noackjr@alumni.rice.edu List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Feb 2005 22:01:08 -0000 > jeff 2005-02-04 20:11:59 UTC > > FreeBSD src repository > > Modified files: (Branch: RELENG_5) > sys/kern kern_clock.c kern_switch.c kern_synch.c > sched_4bsd.c sched_ule.c > Log: > - MFC KTR_SCHED/schedgraph support. > > Revision Changes Path > 1.172.2.1 +2 -0 src/sys/kern/kern_clock.c > 1.78.2.17 +3 -0 src/sys/kern/kern_switch.c > 1.257.2.5 +17 -0 src/sys/kern/kern_synch.c > 1.49.2.14 +30 -6 src/sys/kern/sched_4bsd.c > 1.121.2.13 +14 -32 src/sys/kern/sched_ule.c I haven't looked at the others, but parts of the sched_4bsd.c diff look fishy (mismerged revision 1.70?): > @@ -749,6 +764,9 @@ sched_class(struct ksegrp *kg, int class > void > sched_prio(struct thread *td, u_char prio) > { > + CTR6(KTR_SCHED, "sched_prio: %p(%s) prio %d newprio %d by %p(%s)", > + td, td->td_proc->p_comm, td->td_priority, prio, curthread, > + curthread->td_proc->p_comm); > > mtx_assert(&sched_lock, MA_OWNED); > if (TD_ON_RUNQ(td)) { > @@ -979,6 +997,9 @@ sched_add(struct thread *td, int flags) > ke = td->td_kse; > mtx_assert(&sched_lock, MA_OWNED); > KASSERT(ke->ke_state != KES_ONRUNQ, > + CTR5(KTR_SCHED, "sched_add: %p(%s) prio %d by %p(%s)", > + td, td->td_proc->p_comm, td->td_priority, curthread, > + curthread->td_proc->p_comm); > ("sched_add: kse %p (%s) already in run queue", ke, > ke->ke_proc->p_comm)); > KASSERT(ke->ke_proc->p_sflag & PS_INMEM, > @@ -1072,7 +1093,10 @@ sched_rem(struct thread *td) > mtx_assert(&sched_lock, MA_OWNED); > > if ((td->td_proc->p_flag & P_NOLOAD) == 0) > - sched_tdcnt--; > + CTR5(KTR_SCHED, "sched_rem: %p(%s) prio %d by %p(%s)", > + td, td->td_proc->p_comm, td->td_priority, curthread, > + curthread->td_proc->p_comm); > + sched_load_rem(); > SLOT_RELEASE(td->td_ksegrp); > runq_remove(ke->ke_runq, ke); Jon