Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 15 Nov 2018 23:03:00 +0000 (UTC)
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r340467 - head/sys/kern
Message-ID:  <201811152303.wAFN30JF060222@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: markj
Date: Thu Nov 15 23:02:59 2018
New Revision: 340467
URL: https://svnweb.freebsd.org/changeset/base/340467

Log:
  Remove mostly-useless proc provider probes.
  
  For some reason the proc UMA zone's ctor, dtor and init functions are
  instrumented, but these functions are always available through FBT.
  Moreover, the probes are not part of the original Solaris proc
  provider, aren't documented, have no uses (e.g., in dwatch(8)) and
  have no clear use to begin with.  Therefore, remove them.
  
  Reviewed by:	rpaulo
  Differential Revision:	https://reviews.freebsd.org/D2169

Modified:
  head/sys/kern/kern_proc.c

Modified: head/sys/kern/kern_proc.c
==============================================================================
--- head/sys/kern/kern_proc.c	Thu Nov 15 23:00:30 2018	(r340466)
+++ head/sys/kern/kern_proc.c	Thu Nov 15 23:02:59 2018	(r340467)
@@ -93,15 +93,6 @@ __FBSDID("$FreeBSD$");
 #endif
 
 SDT_PROVIDER_DEFINE(proc);
-SDT_PROBE_DEFINE4(proc, , ctor, entry, "struct proc *", "int", "void *",
-    "int");
-SDT_PROBE_DEFINE4(proc, , ctor, return, "struct proc *", "int", "void *",
-    "int");
-SDT_PROBE_DEFINE4(proc, , dtor, entry, "struct proc *", "int", "void *",
-    "struct thread *");
-SDT_PROBE_DEFINE3(proc, , dtor, return, "struct proc *", "int", "void *");
-SDT_PROBE_DEFINE3(proc, , init, entry, "struct proc *", "int", "int");
-SDT_PROBE_DEFINE3(proc, , init, return, "struct proc *", "int", "int");
 
 MALLOC_DEFINE(M_PGRP, "pgrp", "process group header");
 MALLOC_DEFINE(M_SESSION, "session", "session header");
@@ -206,9 +197,7 @@ proc_ctor(void *mem, int size, void *arg, int flags)
 	struct thread *td;
 
 	p = (struct proc *)mem;
-	SDT_PROBE4(proc, , ctor , entry, p, size, arg, flags);
 	EVENTHANDLER_DIRECT_INVOKE(process_ctor, p);
-	SDT_PROBE4(proc, , ctor , return, p, size, arg, flags);
 	td = FIRST_THREAD_IN_PROC(p);
 	if (td != NULL) {
 		/* Make sure all thread constructors are executed */
@@ -229,7 +218,6 @@ proc_dtor(void *mem, int size, void *arg)
 	/* INVARIANTS checks go here */
 	p = (struct proc *)mem;
 	td = FIRST_THREAD_IN_PROC(p);
-	SDT_PROBE4(proc, , dtor, entry, p, size, arg, td);
 	if (td != NULL) {
 #ifdef INVARIANTS
 		KASSERT((p->p_numthreads == 1),
@@ -247,7 +235,6 @@ proc_dtor(void *mem, int size, void *arg)
 	EVENTHANDLER_DIRECT_INVOKE(process_dtor, p);
 	if (p->p_ksi != NULL)
 		KASSERT(! KSI_ONQ(p->p_ksi), ("SIGCHLD queue"));
-	SDT_PROBE3(proc, , dtor, return, p, size, arg);
 }
 
 /*
@@ -259,7 +246,6 @@ proc_init(void *mem, int size, int flags)
 	struct proc *p;
 
 	p = (struct proc *)mem;
-	SDT_PROBE3(proc, , init, entry, p, size, flags);
 	mtx_init(&p->p_mtx, "process lock", NULL, MTX_DEF | MTX_DUPOK | MTX_NEW);
 	mtx_init(&p->p_slock, "process slock", NULL, MTX_SPIN | MTX_NEW);
 	mtx_init(&p->p_statmtx, "pstatl", NULL, MTX_SPIN | MTX_NEW);
@@ -270,7 +256,6 @@ proc_init(void *mem, int size, int flags)
 	EVENTHANDLER_DIRECT_INVOKE(process_init, p);
 	p->p_stats = pstats_alloc();
 	p->p_pgrp = NULL;
-	SDT_PROBE3(proc, , init, return, p, size, flags);
 	return (0);
 }

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811152303.wAFN30JF060222>