From owner-p4-projects@FreeBSD.ORG Tue Jun 20 06:02:28 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 75DC116A47B; Tue, 20 Jun 2006 06:02:28 +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 3609016A479 for ; Tue, 20 Jun 2006 06:02:28 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 003A543D45 for ; Tue, 20 Jun 2006 06:02:27 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5K62R5f072970 for ; Tue, 20 Jun 2006 06:02:27 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5K62Rf7072967 for perforce@freebsd.org; Tue, 20 Jun 2006 06:02:27 GMT (envelope-from jb@freebsd.org) Date: Tue, 20 Jun 2006 06:02:27 GMT Message-Id: <200606200602.k5K62Rf7072967@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 99658 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, 20 Jun 2006 06:02:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=99658 Change 99658 by jb@jb_freebsd2 on 2006/06/20 06:02:19 Choose a better place for the DTrace vtime hook. The new thread can be chosen all sorts of ways right up to the last moment. Affected files ... .. //depot/projects/dtrace/src/sys/kern/kern_synch.c#6 edit .. //depot/projects/dtrace/src/sys/kern/sched_4bsd.c#6 edit .. //depot/projects/dtrace/src/sys/kern/sched_ule.c#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/kern_synch.c#6 (text+ko) ==== @@ -429,16 +429,6 @@ td->td_inhibitors, td->td_wmesg, td->td_lockname); #endif -#ifdef KDTRACE - /* - * If DTrace has set the active vtime enum to anything - * other than INACTIVE (0), then it should have set the - * function to call. - */ - if (dtrace_vtime_active) - (*dtrace_vtime_switch_func)(newtd); -#endif - sched_switch(td, newtd, flags); CTR3(KTR_SCHED, "mi_switch: running %p(%s) prio %d", td, td->td_proc->p_comm, td->td_priority); ==== //depot/projects/dtrace/src/sys/kern/sched_4bsd.c#6 (text+ko) ==== @@ -970,6 +970,17 @@ if (PMC_PROC_IS_USING_PMCS(td->td_proc)) PMC_SWITCH_CONTEXT(td, PMC_FN_CSW_OUT); #endif + +#ifdef KDTRACE + /* + * If DTrace has set the active vtime enum to anything + * other than INACTIVE (0), then it should have set the + * function to call. + */ + if (dtrace_vtime_active) + (*dtrace_vtime_switch_func)(newtd); +#endif + cpu_switch(td, newtd); #ifdef HWPMC_HOOKS if (PMC_PROC_IS_USING_PMCS(td->td_proc)) ==== //depot/projects/dtrace/src/sys/kern/sched_ule.c#4 (text+ko) ==== @@ -1414,6 +1414,17 @@ if (PMC_PROC_IS_USING_PMCS(td->td_proc)) PMC_SWITCH_CONTEXT(td, PMC_FN_CSW_OUT); #endif + +#ifdef KDTRACE + /* + * If DTrace has set the active vtime enum to anything + * other than INACTIVE (0), then it should have set the + * function to call. + */ + if (dtrace_vtime_active) + (*dtrace_vtime_switch_func)(newtd); +#endif + cpu_switch(td, newtd); #ifdef HWPMC_HOOKS if (PMC_PROC_IS_USING_PMCS(td->td_proc))