From owner-p4-projects@FreeBSD.ORG Sun Mar 23 03:46:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C4D611065671; Sun, 23 Mar 2008 03:46:57 +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 8496D106566C for ; Sun, 23 Mar 2008 03:46:57 +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 741AF8FC12 for ; Sun, 23 Mar 2008 03:46:57 +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 m2N3kvN1070291 for ; Sun, 23 Mar 2008 03:46:57 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2N3kvKN070289 for perforce@freebsd.org; Sun, 23 Mar 2008 03:46:57 GMT (envelope-from jb@freebsd.org) Date: Sun, 23 Mar 2008 03:46:57 GMT Message-Id: <200803230346.m2N3kvKN070289@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 138325 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: Sun, 23 Mar 2008 03:46:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=138325 Change 138325 by jb@jb_freebsd1 on 2008/03/23 03:46:32 Put the SDT probes back in after they got whacked by the KSE removal. Affected files ... .. //depot/projects/dtrace/src/sys/kern/kern_sig.c#25 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/kern_sig.c#25 (text+ko) ==== @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD: src/sys/kern/kern_sig.c,v 1.360 2008/03/21 08:23:25 jeff Exp $"); #include "opt_compat.h" +#include "opt_kdtrace.h" #include "opt_ktrace.h" #include @@ -59,6 +60,7 @@ #include #include #include +#include #include #include #include @@ -82,6 +84,19 @@ #define ONSIG 32 /* NSIG for osig* syscalls. XXX. */ +SDT_PROVIDER_DECLARE(proc); +SDT_PROBE_DEFINE(proc, kernel, , signal_send); +SDT_PROBE_ARGTYPE(proc, kernel, , signal_send, 0, "struct thread *"); +SDT_PROBE_ARGTYPE(proc, kernel, , signal_send, 1, "struct proc *"); +SDT_PROBE_ARGTYPE(proc, kernel, , signal_send, 2, "int"); +SDT_PROBE_DEFINE(proc, kernel, , signal_clear); +SDT_PROBE_ARGTYPE(proc, kernel, , signal_clear, 0, "int"); +SDT_PROBE_ARGTYPE(proc, kernel, , signal_clear, 1, "ksiginfo_t *"); +SDT_PROBE_DEFINE(proc, kernel, , signal_discard); +SDT_PROBE_ARGTYPE(proc, kernel, , signal_discard, 0, "struct thread *"); +SDT_PROBE_ARGTYPE(proc, kernel, , signal_discard, 1, "struct proc *"); +SDT_PROBE_ARGTYPE(proc, kernel, , signal_discard, 2, "int"); + static int coredump(struct thread *); static char *expand_name(const char *, uid_t, pid_t); static int killpg1(struct thread *td, int sig, int pgid, int all); @@ -1236,6 +1251,9 @@ ksiginfo_init(ksi); sigqueue_get(&td->td_sigqueue, sig, ksi); ksi->ksi_signo = sig; + + SDT_PROBE(proc, kernel, , signal_clear, sig, ksi, 0, 0, 0); + if (ksi->ksi_code == SI_TIMER) itimer_accept(p, ksi->ksi_timerid, ksi); error = 0; @@ -1976,6 +1994,8 @@ sigqueue = &td->td_sigqueue; } + SDT_PROBE(proc, kernel, , signal_send, td, p, sig, 0, 0 ); + /* * If the signal is being ignored, * then we forget about it immediately. @@ -1985,6 +2005,8 @@ */ mtx_lock(&ps->ps_mtx); if (SIGISMEMBER(ps->ps_sigignore, sig)) { + SDT_PROBE(proc, kernel, , signal_discard, ps, td, sig, 0, 0 ); + mtx_unlock(&ps->ps_mtx); if (ksi && (ksi->ksi_flags & KSI_INS)) ksiginfo_tryfree(ksi);