Date: Tue, 29 Jul 2014 22:26:41 +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-10@freebsd.org Subject: svn commit: r269272 - stable/10/sys/cddl/dev/systrace Message-ID: <201407292226.s6TMQfv0001467@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markj Date: Tue Jul 29 22:26:41 2014 New Revision: 269272 URL: http://svnweb.freebsd.org/changeset/base/269272 Log: MFC r264435: Ensure that all eight syscall arguments are available to dtrace_probe(), rather than just the first five. Modified: stable/10/sys/cddl/dev/systrace/systrace.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/cddl/dev/systrace/systrace.c ============================================================================== --- stable/10/sys/cddl/dev/systrace/systrace.c Tue Jul 29 22:07:52 2014 (r269271) +++ stable/10/sys/cddl/dev/systrace/systrace.c Tue Jul 29 22:26:41 2014 (r269272) @@ -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_t)(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. @@ -180,6 +183,7 @@ static void systrace_probe(u_int32_t id, int sysnum, struct sysent *sysent, void *params, int ret) { + systrace_dtrace_probe_t probe; int n_args = 0; u_int64_t uargs[8]; @@ -211,7 +215,9 @@ 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]); + probe = (systrace_dtrace_probe_t)dtrace_probe; + probe(id, uargs[0], uargs[1], uargs[2], uargs[3], uargs[4], uargs[5], + uargs[6], uargs[7]); } #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407292226.s6TMQfv0001467>