svn commit: r253720 - head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider

[Mark Johnston]

Author: markj
Date: Sat Jul 27 21:31:48 2013
New Revision: 253720
URL: http://svnweb.freebsd.org/changeset/base/253720

Log:
  Use kern_ioctl() rather than ioctl() for testing the FBT provider, since the
  latter doesn't exist in FreeBSD. All the tests under fbtprovider pass now.

Modified:
  head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d
  head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d
  head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d
  head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d
  head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d
  head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d
  head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d

Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d	Sat Jul 27 20:47:01 2013	(r253719)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d	Sat Jul 27 21:31:48 2013	(r253720)
@@ -36,12 +36,12 @@
 #pragma D option quiet
 #pragma D option statusrate=10ms
 
-fbt::ioctl:entry
+fbt::kern_ioctl:entry
 {
 	printf("Entering the ioctl function\n");
 }
 
-fbt::ioctl:return
+fbt::kern_ioctl:return
 {
 	printf("Returning from ioctl function\n");
 	exit(0);

Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d	Sat Jul 27 20:47:01 2013	(r253719)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d	Sat Jul 27 21:31:48 2013	(r253720)
@@ -36,7 +36,7 @@
 #pragma D option quiet
 #pragma D option statusrate=10ms
 
-fbt::ioctl:return
+fbt::kern_ioctl:return
 {
 	printf("The function return value is stored in %u\n", arg1);
 	exit(0);

Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d	Sat Jul 27 20:47:01 2013	(r253719)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d	Sat Jul 27 21:31:48 2013	(r253720)
@@ -36,13 +36,13 @@
 #pragma D option quiet
 #pragma D option statusrate=10ms
 
-fbt::ioctl:entry
+fbt::kern_ioctl:entry
 {
 	printf("Entering the ioctl function\n");
 	printf("The few arguments are %u %u %u %u\n", arg0, arg1, arg2, arg3);
 }
 
-fbt::ioctl:return
+fbt::kern_ioctl:return
 {
 	printf("Returning from ioctl function\n");
 	printf("The few arguments are %u %u %u %u\n", arg0, arg1, arg2, arg3);

Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d	Sat Jul 27 20:47:01 2013	(r253719)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d	Sat Jul 27 21:31:48 2013	(r253720)
@@ -41,12 +41,12 @@ BEGIN
 	self->traceme = 1;
 }
 
-fbt::ioctl:entry
+fbt::kern_ioctl:entry
 {
 	printf("Entering the function\n");
 }
 
-fbt::ioctl:return
+fbt::kern_ioctl:return
 {
 	printf("The offset = %u\n", arg0);
 	exit(0);

Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d	Sat Jul 27 20:47:01 2013	(r253719)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d	Sat Jul 27 21:31:48 2013	(r253720)
@@ -36,14 +36,14 @@
 #pragma D option quiet
 #pragma D option statusrate=10ms
 
-fbt::ioctl:entry
+fbt::kern_ioctl:entry
 {
 	printf("Entering the ioctl function\n");
 	printf("The few arguments are %u %u %u %u\n", arg0, arg1, arg2, arg3);
 	exit(0);
 }
 
-fbt::ioctl:return
+fbt::kern_ioctl:return
 {
 	printf("Returning from ioctl function\n");
 	printf("The few arguments are %u %u %u %u\n", arg0, arg1, arg2, arg3);

Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d	Sat Jul 27 20:47:01 2013	(r253719)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d	Sat Jul 27 21:31:48 2013	(r253720)
@@ -36,7 +36,7 @@
 #pragma D option quiet
 #pragma D option statusrate=10ms
 
-fbt::ioctl:return
+fbt::kern_ioctl:return
 /arg1 == 0/
 {
 	printf("%s %x returned 0", probefunc, arg0);

Modified: head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d	Sat Jul 27 20:47:01 2013	(r253719)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d	Sat Jul 27 21:31:48 2013	(r253720)
@@ -36,7 +36,7 @@
 #pragma D option quiet
 #pragma D option statusrate=10ms
 
-fbt::ioctl:entry
+fbt::kern_ioctl:entry
 {
 	self->traceme = 1;
 }
@@ -47,7 +47,7 @@ fbt:::entry
 	printf("called %s\n", probefunc);
 }
 
-fbt::ioctl:return
+fbt::kern_ioctl:return
 /self->traceme/
 {
 	self->traceme = 0;