From owner-p4-projects@FreeBSD.ORG Wed Jan 30 06:08:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1141616A421; Wed, 30 Jan 2008 06:08:07 +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 CAAB616A417 for ; Wed, 30 Jan 2008 06:08:06 +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 B13B013C467 for ; Wed, 30 Jan 2008 06:08:06 +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 m0U686f0089001 for ; Wed, 30 Jan 2008 06:08:06 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0U686ms088998 for perforce@freebsd.org; Wed, 30 Jan 2008 06:08:06 GMT (envelope-from jb@freebsd.org) Date: Wed, 30 Jan 2008 06:08:06 GMT Message-Id: <200801300608.m0U686ms088998@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 134446 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 06:08:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=134446 Change 134446 by jb@jb_freebsd1 on 2008/01/30 06:07:37 IFdtrace Affected files ... .. //depot/projects/dtrace7/src/sys/kern/kern_proc.c#6 edit Differences ... ==== //depot/projects/dtrace7/src/sys/kern/kern_proc.c#6 (text+ko) ==== @@ -32,6 +32,7 @@ #include __FBSDID("$FreeBSD: src/sys/kern/kern_proc.c,v 1.252.2.3 2008/01/18 10:02:51 kib Exp $"); +#include "opt_kdtrace.h" #include "opt_ktrace.h" #include "opt_kstack_pages.h" @@ -49,6 +50,7 @@ #include #include #include +#include #include #include #include @@ -66,6 +68,35 @@ #include #include +SDT_PROVIDER_DEFINE(proc); +SDT_PROBE_DEFINE(proc, kernel, ctor , entry); +SDT_PROBE_ARGTYPE(proc, kernel, ctor , entry, 0, "struct proc *"); +SDT_PROBE_ARGTYPE(proc, kernel, ctor , entry, 1, "int"); +SDT_PROBE_ARGTYPE(proc, kernel, ctor , entry, 2, "void *"); +SDT_PROBE_ARGTYPE(proc, kernel, ctor , entry, 3, "int"); +SDT_PROBE_DEFINE(proc, kernel, ctor , return); +SDT_PROBE_ARGTYPE(proc, kernel, ctor , return, 0, "struct proc *"); +SDT_PROBE_ARGTYPE(proc, kernel, ctor , return, 1, "int"); +SDT_PROBE_ARGTYPE(proc, kernel, ctor , return, 2, "void *"); +SDT_PROBE_ARGTYPE(proc, kernel, ctor , return, 3, "int"); +SDT_PROBE_DEFINE(proc, kernel, dtor , entry); +SDT_PROBE_ARGTYPE(proc, kernel, dtor , entry, 0, "struct proc *"); +SDT_PROBE_ARGTYPE(proc, kernel, dtor , entry, 1, "int"); +SDT_PROBE_ARGTYPE(proc, kernel, dtor , entry, 2, "void *"); +SDT_PROBE_ARGTYPE(proc, kernel, dtor , entry, 3, "struct thread *"); +SDT_PROBE_DEFINE(proc, kernel, dtor , return); +SDT_PROBE_ARGTYPE(proc, kernel, dtor , return, 0, "struct proc *"); +SDT_PROBE_ARGTYPE(proc, kernel, dtor , return, 1, "int"); +SDT_PROBE_ARGTYPE(proc, kernel, dtor , return, 2, "void *"); +SDT_PROBE_DEFINE(proc, kernel, init , entry); +SDT_PROBE_ARGTYPE(proc, kernel, init , entry, 0, "struct proc *"); +SDT_PROBE_ARGTYPE(proc, kernel, init , entry, 1, "int"); +SDT_PROBE_ARGTYPE(proc, kernel, init , entry, 2, "int"); +SDT_PROBE_DEFINE(proc, kernel, init , return); +SDT_PROBE_ARGTYPE(proc, kernel, init , return, 0, "struct proc *"); +SDT_PROBE_ARGTYPE(proc, kernel, init , return, 1, "int"); +SDT_PROBE_ARGTYPE(proc, kernel, init , return, 2, "int"); + MALLOC_DEFINE(M_PGRP, "pgrp", "process group header"); MALLOC_DEFINE(M_SESSION, "session", "session header"); static MALLOC_DEFINE(M_PROC, "proc", "Proc structures"); @@ -131,7 +162,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); } @@ -147,6 +180,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), @@ -165,6 +199,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); } /* @@ -176,6 +211,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); @@ -183,6 +219,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); }