From owner-p4-projects@FreeBSD.ORG Wed Jan 16 01:00:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B05816A41B; Wed, 16 Jan 2008 01:00:04 +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 E4C0A16A419 for ; Wed, 16 Jan 2008 01:00:03 +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 C78EA13C44B for ; Wed, 16 Jan 2008 01:00:03 +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 m0G103wk049473 for ; Wed, 16 Jan 2008 01:00:03 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0G103Q9049470 for perforce@freebsd.org; Wed, 16 Jan 2008 01:00:03 GMT (envelope-from jb@freebsd.org) Date: Wed, 16 Jan 2008 01:00:03 GMT Message-Id: <200801160100.m0G103Q9049470@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 133378 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, 16 Jan 2008 01:00:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=133378 Change 133378 by jb@jb_freebsd1 on 2008/01/16 00:59:37 Add some statically defined DTrace probes to the process ctor, init and dtor. If the KDTRACE_HOOKS kernel option isn't set, these macros expand to nothing. If KDTRACE_HOOKS is defined, the extra instructions executed for an unenabled probe are effectively: if (sdt_global_struct.id) { ... probe } where 'sdt_global_struct' is the global instance of 'struct sdt_probe'. Affected files ... .. //depot/projects/dtrace/src/sys/kern/kern_proc.c#17 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/kern_proc.c#17 (text+ko) ==== @@ -33,6 +33,7 @@ __FBSDID("$FreeBSD: src/sys/kern/kern_proc.c,v 1.261 2008/01/10 22:11:20 rwatson Exp $"); #include "opt_ddb.h" +#include "opt_kdtrace.h" #include "opt_ktrace.h" #include "opt_kstack_pages.h" #include "opt_stack.h" @@ -55,6 +56,7 @@ #include #include #include +#include #include #include #include @@ -76,6 +78,8 @@ #include #include +SDT_PROVIDER_DEFINE(proc); + MALLOC_DEFINE(M_PGRP, "pgrp", "process group header"); MALLOC_DEFINE(M_SESSION, "session", "session header"); static MALLOC_DEFINE(M_PROC, "proc", "Proc structures"); @@ -142,7 +146,9 @@ struct proc *p; p = (struct proc *)mem; + SDT_PROBE(proc, kernel, ctor , entry, p, size, arg, flags, 0); EVENTHANDLER_INVOKE(process_ctor, p); + SDT_PROBE(proc, kernel, ctor , return, p, size, arg, flags, 0); return (0); } @@ -158,6 +164,7 @@ /* INVARIANTS checks go here */ p = (struct proc *)mem; td = FIRST_THREAD_IN_PROC(p); + SDT_PROBE(proc, kernel, dtor , entry, p, size, arg, td, 0); if (td != NULL) { #ifdef INVARIANTS KASSERT((p->p_numthreads == 1), @@ -175,6 +182,7 @@ EVENTHANDLER_INVOKE(process_dtor, p); if (p->p_ksi != NULL) KASSERT(! KSI_ONQ(p->p_ksi), ("SIGCHLD queue")); + SDT_PROBE(proc, kernel, dtor , return, p, size, arg, 0, 0); } /* @@ -186,6 +194,7 @@ struct proc *p; p = (struct proc *)mem; + SDT_PROBE(proc, kernel, init , entry, p, size, flags, 0, 0); p->p_sched = (struct p_sched *)&p[1]; bzero(&p->p_mtx, sizeof(struct mtx)); mtx_init(&p->p_mtx, "process lock", NULL, MTX_DEF | MTX_DUPOK); @@ -193,6 +202,7 @@ TAILQ_INIT(&p->p_threads); /* all threads in proc */ EVENTHANDLER_INVOKE(process_init, p); p->p_stats = pstats_alloc(); + SDT_PROBE(proc, kernel, init , return, p, size, flags, 0, 0); return (0); }