Author: avg
Date: Mon Feb 17 11:28:16 2014
New Revision: 262023
URL: http://svnweb.freebsd.org/changeset/base/262023

Log:
  MFC r253720: Use kern_ioctl() rather than ioctl() for testing the FBT provider

Modified:
  
stable/9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d
  
stable/9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d
  
stable/9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d
  
stable/9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d
  
stable/9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d
  
stable/9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d
  
stable/9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d
Directory Properties:
  stable/9/cddl/contrib/opensolaris/   (props changed)

Modified: 
stable/9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d
==============================================================================
--- 
stable/9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d
        Mon Feb 17 11:23:21 2014        (r262022)
+++ 
stable/9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d
        Mon Feb 17 11:28:16 2014        (r262023)
@@ -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: 
stable/9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d
==============================================================================
--- 
stable/9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d
  Mon Feb 17 11:23:21 2014        (r262022)
+++ 
stable/9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d
  Mon Feb 17 11:28:16 2014        (r262023)
@@ -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: 
stable/9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d
==============================================================================
--- 
stable/9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d
    Mon Feb 17 11:23:21 2014        (r262022)
+++ 
stable/9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d
    Mon Feb 17 11:28:16 2014        (r262023)
@@ -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: 
stable/9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d
==============================================================================
--- 
stable/9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d
       Mon Feb 17 11:23:21 2014        (r262022)
+++ 
stable/9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d
       Mon Feb 17 11:28:16 2014        (r262023)
@@ -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: 
stable/9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d
==============================================================================
--- 
stable/9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d
   Mon Feb 17 11:23:21 2014        (r262022)
+++ 
stable/9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d
   Mon Feb 17 11:28:16 2014        (r262023)
@@ -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: 
stable/9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d
==============================================================================
--- 
stable/9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d
      Mon Feb 17 11:23:21 2014        (r262022)
+++ 
stable/9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d
      Mon Feb 17 11:28:16 2014        (r262023)
@@ -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: 
stable/9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d
==============================================================================
--- 
stable/9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d
     Mon Feb 17 11:23:21 2014        (r262022)
+++ 
stable/9/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d
     Mon Feb 17 11:28:16 2014        (r262023)
@@ -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;
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"

Reply via email to