Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 6 Mar 2020 14:56:02 +0000 (UTC)
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject:   svn commit: r358704 - stable/12/sys/cddl/dev/systrace
Message-ID:  <202003061456.026Eu2Ke028558@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: markj
Date: Fri Mar  6 14:56:02 2020
New Revision: 358704
URL: https://svnweb.freebsd.org/changeset/base/358704

Log:
  MFC r358433:
  Clear systrace_args_func when systrace probes are disabled.

Modified:
  stable/12/sys/cddl/dev/systrace/systrace.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/cddl/dev/systrace/systrace.c
==============================================================================
--- stable/12/sys/cddl/dev/systrace/systrace.c	Fri Mar  6 14:46:50 2020	(r358703)
+++ stable/12/sys/cddl/dev/systrace/systrace.c	Fri Mar  6 14:56:02 2020	(r358704)
@@ -298,9 +298,9 @@ systrace_destroy(void *arg, dtrace_id_t id, void *parg
 	 * disabled.
 	 */
 	if (SYSTRACE_ISENTRY((uintptr_t)parg)) {
-		ASSERT(sysent[sysnum].sy_entry == 0);
+		ASSERT(sysent[sysnum].sy_entry == DTRACE_IDNONE);
 	} else {
-		ASSERT(sysent[sysnum].sy_return == 0);
+		ASSERT(sysent[sysnum].sy_return == DTRACE_IDNONE);
 	}
 #endif
 }
@@ -310,8 +310,7 @@ systrace_enable(void *arg, dtrace_id_t id, void *parg)
 {
 	int sysnum = SYSTRACE_SYSNUM((uintptr_t)parg);
 
-	if (SYSENT[sysnum].sy_systrace_args_func == NULL)
-		SYSENT[sysnum].sy_systrace_args_func = systrace_args;
+	SYSENT[sysnum].sy_systrace_args_func = systrace_args;
 
 	if (SYSTRACE_ISENTRY((uintptr_t)parg))
 		SYSENT[sysnum].sy_entry = id;
@@ -327,8 +326,9 @@ systrace_disable(void *arg, dtrace_id_t id, void *parg
 {
 	int sysnum = SYSTRACE_SYSNUM((uintptr_t)parg);
 
-	SYSENT[sysnum].sy_entry = 0;
-	SYSENT[sysnum].sy_return = 0;
+	SYSENT[sysnum].sy_systrace_args_func = NULL;
+	SYSENT[sysnum].sy_entry = DTRACE_IDNONE;
+	SYSENT[sysnum].sy_return = DTRACE_IDNONE;
 	systrace_enabled_count--;
 	if (systrace_enabled_count == 0)
 		systrace_enabled = false;

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