From owner-p4-projects@FreeBSD.ORG Tue Jun 13 13:34:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C8F916A478; Tue, 13 Jun 2006 13:34:39 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 011B616A418; Tue, 13 Jun 2006 13:34:39 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id AF07F43D55; Tue, 13 Jun 2006 13:34:37 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from zion.baldwin.cx (zion.baldwin.cx [192.168.0.7]) (authenticated bits=0) by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k5DDYVuI022964; Tue, 13 Jun 2006 09:34:36 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: John Birrell Date: Tue, 13 Jun 2006 09:30:46 -0400 User-Agent: KMail/1.9.1 References: <200606130047.k5D0liTa052536@repoman.freebsd.org> In-Reply-To: <200606130047.k5D0liTa052536@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Message-Id: <200606130930.46610.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [192.168.0.1]); Tue, 13 Jun 2006 09:34:36 -0400 (EDT) X-Virus-Scanned: ClamAV 0.87.1/1537/Tue Jun 13 07:24:06 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 99099 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Jun 2006 13:34:39 -0000 On Monday 12 June 2006 20:47, John Birrell wrote: > http://perforce.freebsd.org/chv.cgi?CH=3D99099 >=20 > Change 99099 by jb@jb_freebsd2 on 2006/06/13 00:47:28 >=20 > Add hooks for DTrace to register a function to be called when > the scheduler chooses a new thread to run. This is required for > DTrace vtime. You should probably do this in mi_switch() in kern_synch.c rather than in this macro. > Affected files ... >=20 > .. //depot/projects/dtrace/src/sys/kern/kern_switch.c#3 edit > .. //depot/projects/dtrace/src/sys/sys/proc.h#6 edit >=20 > Differences ... >=20 > =3D=3D=3D=3D //depot/projects/dtrace/src/sys/kern/kern_switch.c#3 (text+k= o) =3D=3D=3D=3D >=20 > @@ -88,6 +88,7 @@ > #include > __FBSDID("$FreeBSD: src/sys/kern/kern_switch.c,v 1.121 2006/06/01 22:45:= 56 cognet Exp $"); > =20 > +#include "opt_kdtrace.h" > #include "opt_sched.h" > =20 > #ifndef KERN_SWITCH_INCLUDE > @@ -126,6 +127,11 @@ > =20 > #define td_kse td_sched > =20 > +#ifdef KDTRACE > +int dtrace_vtime_active; > +dtrace_vtime_switch_func_t dtrace_vtime_switch_func; > +#endif > + > /* > * kern.sched.preemption allows user space to determine if preemption su= pport > * is compiled in or not. It is not currently a boot or runtime flag th= at >=20 > =3D=3D=3D=3D //depot/projects/dtrace/src/sys/sys/proc.h#6 (text+ko) =3D= =3D=3D=3D >=20 > @@ -484,7 +484,17 @@ > #define TD_CLR_SUSPENDED(td) TD_CLR_INHIB((td), TDI_SUSPENDED) > #define TD_CLR_IWAIT(td) TD_CLR_INHIB((td), TDI_IWAIT) > =20 > +#ifdef KDTRACE > +typedef void (*dtrace_vtime_switch_func_t)(struct thread *); > + > +extern int dtrace_vtime_active; > +extern dtrace_vtime_switch_func_t dtrace_vtime_switch_func; > +#define TD_SET_RUNNING(td) if (dtrace_vtime_active) \ > + (*dtrace_vtime_switch_func)(td); \ > + (td)->td_state =3D TDS_RUNNING > +#else > #define TD_SET_RUNNING(td) (td)->td_state =3D TDS_RUNNING > +#endif > #define TD_SET_RUNQ(td) (td)->td_state =3D TDS_RUNQ > #define TD_SET_CAN_RUN(td) (td)->td_state =3D TDS_CAN_RUN > =20 >=20 =2D-=20 John Baldwin =A0<>< =A0http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" =A0=3D =A0http://www.FreeBSD.org