From owner-p4-projects@FreeBSD.ORG Wed Jan 30 05:11:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 252CA16A420; Wed, 30 Jan 2008 05:11:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C68CC16A419 for ; Wed, 30 Jan 2008 05:11:05 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 95B1013C447 for ; Wed, 30 Jan 2008 05:11:05 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0U5B5vO084752 for ; Wed, 30 Jan 2008 05:11:05 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0U5B5nZ084742 for perforce@freebsd.org; Wed, 30 Jan 2008 05:11:05 GMT (envelope-from jb@freebsd.org) Date: Wed, 30 Jan 2008 05:11:05 GMT Message-Id: <200801300511.m0U5B5nZ084742@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 134441 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: Wed, 30 Jan 2008 05:11:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=134441 Change 134441 by jb@jb_freebsd1 on 2008/01/30 05:10:54 IFdtrace Affected files ... .. //depot/projects/dtrace7/src/sys/kern/sched_4bsd.c#3 edit .. //depot/projects/dtrace7/src/sys/kern/sched_ule.c#3 edit Differences ... ==== //depot/projects/dtrace7/src/sys/kern/sched_4bsd.c#3 (text+ko) ==== @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.106.2.1 2007/12/20 07:15:40 davidxu Exp $"); #include "opt_hwpmc_hooks.h" +#include "opt_kdtrace.h" #include #include @@ -59,6 +60,12 @@ #include #endif +#ifdef KDTRACE_HOOKS +#include +int dtrace_vtime_active; +dtrace_vtime_switch_func_t dtrace_vtime_switch_func; +#endif + /* * INVERSE_ESTCPU_WEIGHT is only suitable for statclock() frequencies in * the range 100-256 Hz (approximately). @@ -901,6 +908,15 @@ PMC_SWITCH_CONTEXT(td, PMC_FN_CSW_OUT); #endif +#ifdef KDTRACE_HOOKS + /* + * 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 /* I feel sleepy */ cpu_switch(td, newtd, td->td_lock); /* ==== //depot/projects/dtrace7/src/sys/kern/sched_ule.c#3 (text+ko) ==== @@ -39,6 +39,7 @@ __FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.214.2.2 2007/12/20 07:15:40 davidxu Exp $"); #include "opt_hwpmc_hooks.h" +#include "opt_kdtrace.h" #include "opt_sched.h" #include @@ -68,6 +69,12 @@ #include #endif +#ifdef KDTRACE_HOOKS +#include +int dtrace_vtime_active; +dtrace_vtime_switch_func_t dtrace_vtime_switch_func; +#endif + #include #include @@ -1895,6 +1902,16 @@ PMC_SWITCH_CONTEXT(td, PMC_FN_CSW_OUT); #endif TDQ_LOCKPTR(tdq)->mtx_lock = (uintptr_t)newtd; + +#ifdef KDTRACE_HOOKS + /* + * 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, mtx); /* * We may return from cpu_switch on a different cpu. However,