svn commit: r262466 - head/sys/cddl/dev/systrace

Mark Johnston markj at FreeBSD.org
Tue Feb 25 02:58:12 UTC 2014


Author: markj
Date: Tue Feb 25 02:58:11 2014
New Revision: 262466
URL: http://svnweb.freebsd.org/changeset/base/262466

Log:
  Make all 8 syscall arguments available to syscall probes in the same way
  that this is done for SDT probes. This fixes the syscall/tst.args.d test,
  which was failing because mmap(2)'s sixth argument wasn't available to the
  probe.
  
  MFC after:	2 weeks

Modified:
  head/sys/cddl/dev/systrace/systrace.c

Modified: head/sys/cddl/dev/systrace/systrace.c
==============================================================================
--- head/sys/cddl/dev/systrace/systrace.c	Tue Feb 25 01:42:02 2014	(r262465)
+++ head/sys/cddl/dev/systrace/systrace.c	Tue Feb 25 02:58:11 2014	(r262466)
@@ -168,6 +168,9 @@ static dtrace_pops_t systrace_pops = {
 static struct cdev		*systrace_cdev;
 static dtrace_provider_id_t	systrace_id;
 
+typedef void (*systrace_dtrace_probe)(dtrace_id_t, uintptr_t, uintptr_t,
+    uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t);
+
 #if !defined(LINUX_SYSTRACE)
 /*
  * Probe callback function.
@@ -211,7 +214,8 @@ systrace_probe(u_int32_t id, int sysnum,
 	}
 
 	/* Process the probe using the converted argments. */
-	dtrace_probe(id, uargs[0], uargs[1], uargs[2], uargs[3], uargs[4]);
+	((systrace_dtrace_probe)(dtrace_probe))(id, uargs[0], uargs[1],
+	    uargs[2], uargs[3], uargs[4], uargs[5], uargs[6], uargs[7]);
 }
 
 #endif


More information about the svn-src-head mailing list