From 48b88892898c4b13b55ba43c273359921f65db1b Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Thu, 16 May 2013 09:11:34 -0400 Subject: [PATCH] update tapset deprecation from <= "2.2" to < "2.3" to make space for minor update --- tapset/linux/i386/syscalls.stp | 6 +++--- tapset/linux/ia64/syscalls.stp | 2 +- tapset/linux/nd_syscalls.stp | 4 ++-- tapset/linux/nd_syscalls2.stp | 2 +- tapset/linux/nfs.stp | 2 +- tapset/linux/powerpc/nd_syscalls.stp | 2 +- tapset/linux/powerpc/syscalls.stp | 2 +- tapset/linux/s390/nd_syscalls.stp | 2 +- tapset/linux/s390/syscalls.stp | 2 +- tapset/linux/syscalls.stp | 4 ++-- tapset/linux/syscalls2.stp | 2 +- tapset/linux/vfs.stp | 20 +++++++++---------- tapset/linux/x86_64/nd_syscalls.stp | 2 +- tapset/linux/x86_64/syscalls.stp | 2 +- .../buildok/nd_syscalls-arch-detailed.stp | 2 +- testsuite/buildok/nd_syscalls-detailed.stp | 2 +- testsuite/buildok/nd_syscalls2-detailed.stp | 2 +- testsuite/buildok/nfs-detailed.stp | 2 +- testsuite/buildok/syscalls-arch-detailed.stp | 2 +- testsuite/buildok/syscalls-detailed.stp | 2 +- testsuite/buildok/syscalls2-detailed.stp | 2 +- testsuite/buildok/vfs-detailed.stp | 2 +- testsuite/buildok/vfs-embedded.stp | 2 +- 23 files changed, 36 insertions(+), 36 deletions(-) diff --git a/tapset/linux/i386/syscalls.stp b/tapset/linux/i386/syscalls.stp index 6278c3955..ab69d8dd8 100644 --- a/tapset/linux/i386/syscalls.stp +++ b/tapset/linux/i386/syscalls.stp @@ -142,7 +142,7 @@ probe syscall.sigaltstack = kernel.function("sys_sigaltstack") if (@defined($regs)) { uss_uaddr = @choose_defined($uss, $regs->bx) uoss_uaddr = @choose_defined($uoss, $regs->cx) -%(systemtap_v <= "2.2" %? +%(systemtap_v < "2.3" %? regs = $regs %) } @@ -150,7 +150,7 @@ probe syscall.sigaltstack = kernel.function("sys_sigaltstack") uss_uaddr = $bx # Make sure the register value didn't get sign extended. uoss_uaddr = __ulong(@cast(&$bx, "pt_regs", "kernel")->cx) -%(systemtap_v <= "2.2" %? +%(systemtap_v < "2.3" %? regs = &$bx %) } @@ -158,7 +158,7 @@ probe syscall.sigaltstack = kernel.function("sys_sigaltstack") uss_uaddr = $ebx # Make sure the register value didn't get sign extended. uoss_uaddr = __ulong(@cast(&$ebx, "pt_regs", "kernel")->ecx) -%(systemtap_v <= "2.2" %? +%(systemtap_v < "2.3" %? regs = &$ebx %) } diff --git a/tapset/linux/ia64/syscalls.stp b/tapset/linux/ia64/syscalls.stp index c97bd865b..2d6a98331 100644 --- a/tapset/linux/ia64/syscalls.stp +++ b/tapset/linux/ia64/syscalls.stp @@ -67,7 +67,7 @@ probe syscall.sigaltstack = kernel.function("sys_sigaltstack") %) uss_uaddr = $uss uoss_uaddr = $uoss -%(systemtap_v <= "2.2" %? +%(systemtap_v < "2.3" %? regs = &$regs %) argstr = sprintf("%p, %p", $uss, $uoss) diff --git a/tapset/linux/nd_syscalls.stp b/tapset/linux/nd_syscalls.stp index 0e68d51fb..2c0b2fb47 100644 --- a/tapset/linux/nd_syscalls.stp +++ b/tapset/linux/nd_syscalls.stp @@ -1372,14 +1372,14 @@ probe nd_syscall.fork = kprobe.function("do_fork") clone_flags = ulong_arg(1) stack_start = ulong_arg(2) %(kernel_v >= "3.8.0" %? -%(systemtap_v <= "2.2" %? +%(systemtap_v < "2.3" %? regs = 0 %) stack_size = ulong_arg(3) parent_tid_uaddr = pointer_arg(4) child_tid_uaddr = pointer_arg(5) %: -%(systemtap_v <= "2.2" %? +%(systemtap_v < "2.3" %? regs = pointer_arg(3) %) stack_size = ulong_arg(4) diff --git a/tapset/linux/nd_syscalls2.stp b/tapset/linux/nd_syscalls2.stp index 16597522c..01def262e 100644 --- a/tapset/linux/nd_syscalls2.stp +++ b/tapset/linux/nd_syscalls2.stp @@ -2793,7 +2793,7 @@ probe nd_syscall.compat_sys_shmat = kprobe.function("compat_sys_shmat") ? // _shmat_flags_str(shmflg)) // no asmlinkage -%( systemtap_v <= "2.2" %? +%( systemtap_v < "2.3" %? first = int_arg(1) second = int_arg(2) third = u32_arg(3) diff --git a/tapset/linux/nfs.stp b/tapset/linux/nfs.stp index 718c2ef31..0587bd9c4 100644 --- a/tapset/linux/nfs.stp +++ b/tapset/linux/nfs.stp @@ -262,7 +262,7 @@ probe nfs.fop.llseek = kernel.function ("nfs_file_llseek") !, maxbyte = __file_maxbytes($filp) offset = $offset -%(systemtap_v <= "2.2" %? +%(systemtap_v < "2.3" %? origin = @choose_defined($whence, $origin) %) whence = @choose_defined($whence, $origin) diff --git a/tapset/linux/powerpc/nd_syscalls.stp b/tapset/linux/powerpc/nd_syscalls.stp index 62705f27e..678d87ab5 100644 --- a/tapset/linux/powerpc/nd_syscalls.stp +++ b/tapset/linux/powerpc/nd_syscalls.stp @@ -364,7 +364,7 @@ probe nd_syscall.sigaltstack = kprobe.function("sys_sigaltstack") asmlinkage() uss_uaddr = pointer_arg(1) uoss_uaddr = pointer_arg(2) -%(systemtap_v <= "2.2" %? +%(systemtap_v < "2.3" %? regs = pointer_arg(7) %) argstr = sprintf("%p, %p", uss_uaddr, uoss_uaddr) diff --git a/tapset/linux/powerpc/syscalls.stp b/tapset/linux/powerpc/syscalls.stp index 3d5ab88ba..48c15d263 100644 --- a/tapset/linux/powerpc/syscalls.stp +++ b/tapset/linux/powerpc/syscalls.stp @@ -309,7 +309,7 @@ probe syscall.sigaltstack = kernel.function("sys_sigaltstack") name = "sigaltstack" uss_uaddr = $uss uoss_uaddr = $uoss -%(systemtap_v <= "2.2" %? +%(systemtap_v < "2.3" %? regs = $regs %) argstr = sprintf("%p, %p", $uss, $uoss) diff --git a/tapset/linux/s390/nd_syscalls.stp b/tapset/linux/s390/nd_syscalls.stp index 24d65586a..041816de3 100644 --- a/tapset/linux/s390/nd_syscalls.stp +++ b/tapset/linux/s390/nd_syscalls.stp @@ -127,7 +127,7 @@ probe nd_syscall.sigaltstack = kprobe.function("sys_sigaltstack") asmlinkage() uss_uaddr = pointer_arg(1) uoss_uaddr = pointer_arg(2) -%(systemtap_v <= "2.2" %? +%(systemtap_v < "2.3" %? regs = %{ _stp_current_pt_regs() %} %) argstr = sprintf("%p, %p", uss_uaddr, uoss_uaddr) diff --git a/tapset/linux/s390/syscalls.stp b/tapset/linux/s390/syscalls.stp index 47649b28a..e39a21527 100644 --- a/tapset/linux/s390/syscalls.stp +++ b/tapset/linux/s390/syscalls.stp @@ -149,7 +149,7 @@ probe syscall.sigaltstack = kernel.function("sys_sigaltstack") name = "sigaltstack" uss_uaddr = $uss uoss_uaddr = $uoss -%(systemtap_v <= "2.2" %? +%(systemtap_v < "2.3" %? regs = %{ _stp_current_pt_regs() %} %) argstr = sprintf("%p, %p", $uss, $uoss) diff --git a/tapset/linux/syscalls.stp b/tapset/linux/syscalls.stp index af36d35b5..037c694f9 100644 --- a/tapset/linux/syscalls.stp +++ b/tapset/linux/syscalls.stp @@ -1035,7 +1035,7 @@ probe syscall.fork = kernel.function("do_fork").call child_tid_uaddr = $child_tidptr if (@defined($regs)) { -%(systemtap_v <= "2.2" %? +%(systemtap_v < "2.3" %? regs = $regs %) if (!__is_user_regs($regs)) { @@ -1050,7 +1050,7 @@ probe syscall.fork = kernel.function("do_fork").call name = "fork" } } else { -%(systemtap_v <= "2.2" %? +%(systemtap_v < "2.3" %? regs = 0 %) if ($clone_flags & %{ CLONE_VM | CLONE_UNTRACED %}) { diff --git a/tapset/linux/syscalls2.stp b/tapset/linux/syscalls2.stp index f800e1205..e01f61948 100644 --- a/tapset/linux/syscalls2.stp +++ b/tapset/linux/syscalls2.stp @@ -2307,7 +2307,7 @@ probe syscall.shmat.return = kernel.function("sys_shmat").return ? probe syscall.compat_sys_shmat = kernel.function("compat_sys_shmat").call ? { name = "compat_sys_shmat" -%( systemtap_v <= "2.2" %? +%( systemtap_v < "2.3" %? first = @choose_defined($shmid, $first) second = @choose_defined($shmflg, $second) third = @choose_defined($third, 0) diff --git a/tapset/linux/vfs.stp b/tapset/linux/vfs.stp index 3021106d9..f1e346f18 100644 --- a/tapset/linux/vfs.stp +++ b/tapset/linux/vfs.stp @@ -25,7 +25,7 @@ function __find_bdevname:string(dev:long, bdev:long) return bdevname(bdev) } -%(systemtap_v <= "2.2" %? +%(systemtap_v < "2.3" %? /* deprecated */ function ppos_pos:long (ppos:long) { @@ -128,7 +128,7 @@ function _get_fopv_size:long (iovp:long, nr_segs:long) return -1 } -%(systemtap_v <= "2.2" %? +%(systemtap_v < "2.3" %? /* deprecated */ function _dev_minor:long (dev:long) { @@ -150,7 +150,7 @@ probe generic.fop.llseek = kernel.function("generic_file_llseek") file = $file offset = $offset -%(systemtap_v <= "2.2" %? +%(systemtap_v < "2.3" %? origin = @choose_defined($whence, $origin) %) whence = @choose_defined($whence, $origin) @@ -167,7 +167,7 @@ probe generic.fop.llseek.return = kernel.function("generic_file_llseek").return retstr = sprintf("%d", $return) file = $file offset = $offset -%(systemtap_v <= "2.2" %? +%(systemtap_v < "2.3" %? origin = @choose_defined($whence, $origin) %) whence = @choose_defined($whence, $origin) @@ -611,7 +611,7 @@ probe vfs.block_sync_page = kernel.function("block_sync_page") ? devname = __find_bdevname(dev, __page_bdev($page)) ino = __page_ino($page) -%(systemtap_v <= "2.2" %? +%(systemtap_v < "2.3" %? # 'page_index' is deprecated page_index = __page_index($page) %) @@ -635,7 +635,7 @@ probe vfs.buffer_migrate_page = kernel.function("buffer_migrate_page") ? ino = __page_ino($page) devname = __find_bdevname(dev,__page_bdev($page)) -%(systemtap_v <= "2.2" %? +%(systemtap_v < "2.3" %? # 'page_index' is deprecated page_index = __page_index($page) %) @@ -954,7 +954,7 @@ probe _vfs.block_prepare_write = kernel.function("__block_write_begin") !, _inode = __page_ino($page) from = $pos & (%{ PAGE_CACHE_SIZE %} - 1) to = from + $len -%(systemtap_v <= "2.2" %? +%(systemtap_v < "2.3" %? # write_from and write_upto are deprecated write_from = from write_upto = to @@ -962,7 +962,7 @@ probe _vfs.block_prepare_write = kernel.function("__block_write_begin") !, } else { _inode = $inode -%(systemtap_v <= "2.2" %? +%(systemtap_v < "2.3" %? # write_from and write_upto are deprecated write_from = $from write_upto = $to @@ -987,7 +987,7 @@ probe _vfs.block_prepare_write.return = _inode = __page_ino($page) from = $pos & (%{ PAGE_CACHE_SIZE %} - 1) to = from + $len -%(systemtap_v <= "2.2" %? +%(systemtap_v < "2.3" %? # write_from and write_upto are deprecated write_from = from write_upto = to @@ -995,7 +995,7 @@ probe _vfs.block_prepare_write.return = } else { _inode = $inode -%(systemtap_v <= "2.2" %? +%(systemtap_v < "2.3" %? # write_from and write_upto are deprecated write_from = $from write_upto = $to diff --git a/tapset/linux/x86_64/nd_syscalls.stp b/tapset/linux/x86_64/nd_syscalls.stp index efce72981..65becaddb 100644 --- a/tapset/linux/x86_64/nd_syscalls.stp +++ b/tapset/linux/x86_64/nd_syscalls.stp @@ -58,7 +58,7 @@ probe nd_syscall.sigaltstack = kprobe.function("sys_sigaltstack") asmlinkage() uss_uaddr = pointer_arg(1) uoss_uaddr = pointer_arg(2) -%(systemtap_v <= "2.2" %? +%(systemtap_v < "2.3" %? regs_uaddr = pointer_arg(3) regs = pointer_arg(3) %) diff --git a/tapset/linux/x86_64/syscalls.stp b/tapset/linux/x86_64/syscalls.stp index a32bf4026..f75717840 100644 --- a/tapset/linux/x86_64/syscalls.stp +++ b/tapset/linux/x86_64/syscalls.stp @@ -51,7 +51,7 @@ probe syscall.sigaltstack = kernel.function("sys_sigaltstack") %(systemtap_v <= "1.4" %? regs_uaddr = $regs %) -%(systemtap_v <= "2.2" %? +%(systemtap_v < "2.3" %? regs = $regs %) argstr = sprintf("%p, %p", $uss, $uoss) diff --git a/testsuite/buildok/nd_syscalls-arch-detailed.stp b/testsuite/buildok/nd_syscalls-arch-detailed.stp index 08b41e628..addf0d063 100755 --- a/testsuite/buildok/nd_syscalls-arch-detailed.stp +++ b/testsuite/buildok/nd_syscalls-arch-detailed.stp @@ -35,7 +35,7 @@ probe nd_syscall.sigaltstack ? { printf("%s, %s\n", name, argstr) printf("%p, %p\n", uss_uaddr, uoss_uaddr) -%(systemtap_v <= "2.2" %? +%(systemtap_v < "2.3" %? printf("%p\n", regs) %) } diff --git a/testsuite/buildok/nd_syscalls-detailed.stp b/testsuite/buildok/nd_syscalls-detailed.stp index c146c379b..10c634b01 100755 --- a/testsuite/buildok/nd_syscalls-detailed.stp +++ b/testsuite/buildok/nd_syscalls-detailed.stp @@ -441,7 +441,7 @@ probe nd_syscall.fork printf("%s, %s\n", name, argstr) printf("%d, %d, %d, %p, %p\n", clone_flags, stack_start, stack_size, parent_tid_uaddr, child_tid_uaddr) -%(systemtap_v <= "2.2" %? +%(systemtap_v < "2.3" %? printf("%p\n", regs) %) } diff --git a/testsuite/buildok/nd_syscalls2-detailed.stp b/testsuite/buildok/nd_syscalls2-detailed.stp index 0fd4e10a7..a97fa01e9 100755 --- a/testsuite/buildok/nd_syscalls2-detailed.stp +++ b/testsuite/buildok/nd_syscalls2-detailed.stp @@ -852,7 +852,7 @@ probe nd_syscall.shmat.return ? probe nd_syscall.compat_sys_shmat ? { printf("%s, %s\n", name, argstr) -%( systemtap_v <= "2.2" %? +%( systemtap_v < "2.3" %? printf("%d, %d, %d, %p\n", first, second, third, uptr_uaddr) %) printf("%d, %p, %d\n", shmid, shmaddr_uaddr, shmflg) diff --git a/testsuite/buildok/nfs-detailed.stp b/testsuite/buildok/nfs-detailed.stp index 14818020e..cc0b01bbe 100755 --- a/testsuite/buildok/nfs-detailed.stp +++ b/testsuite/buildok/nfs-detailed.stp @@ -7,7 +7,7 @@ probe nfs.fop.llseek { printf("%s(%s)\n", name, argstr) printf("%d %d %d %s %d\n", dev, ino, s_id, devname, maxbyte) -%(systemtap_v <= "2.2" %? +%(systemtap_v < "2.3" %? printf("%d\n", origin) %) printf("%d %d %s\n", offset, whence, whence_str); diff --git a/testsuite/buildok/syscalls-arch-detailed.stp b/testsuite/buildok/syscalls-arch-detailed.stp index 76cad7761..0769a29cc 100755 --- a/testsuite/buildok/syscalls-arch-detailed.stp +++ b/testsuite/buildok/syscalls-arch-detailed.stp @@ -35,7 +35,7 @@ probe syscall.sigaltstack { printf("%s, %s\n", name, argstr) printf("%p, %p\n", uss_uaddr, uoss_uaddr) -%(systemtap_v <= "2.2" %? +%(systemtap_v < "2.3" %? printf("%p\n", regs) %) } diff --git a/testsuite/buildok/syscalls-detailed.stp b/testsuite/buildok/syscalls-detailed.stp index a7a92df96..e23ad50a7 100755 --- a/testsuite/buildok/syscalls-detailed.stp +++ b/testsuite/buildok/syscalls-detailed.stp @@ -441,7 +441,7 @@ probe syscall.fork printf("%s, %s\n", name, argstr) printf("%d, %d, %d, %p, %p\n", clone_flags, stack_start, stack_size, parent_tid_uaddr, child_tid_uaddr) -%(systemtap_v <= "2.2" %? +%(systemtap_v < "2.3" %? printf("%p\n", regs) %) } diff --git a/testsuite/buildok/syscalls2-detailed.stp b/testsuite/buildok/syscalls2-detailed.stp index 2a805be34..0521ea8a2 100755 --- a/testsuite/buildok/syscalls2-detailed.stp +++ b/testsuite/buildok/syscalls2-detailed.stp @@ -849,7 +849,7 @@ probe syscall.shmat.return ? probe syscall.compat_sys_shmat ? { printf("%s, %s\n", name, argstr) -%( systemtap_v <= "2.2" %? +%( systemtap_v < "2.3" %? printf("%d, %d, %d, %p\n", first, second, third, uptr_uaddr) %) printf("%d, %p, %d\n", shmid, shmaddr_uaddr, shmflg) diff --git a/testsuite/buildok/vfs-detailed.stp b/testsuite/buildok/vfs-detailed.stp index 00c867217..ceb448ce2 100755 --- a/testsuite/buildok/vfs-detailed.stp +++ b/testsuite/buildok/vfs-detailed.stp @@ -5,7 +5,7 @@ probe generic.fop.llseek printf("%s %s\n", name, argstr) printf("%p %s %d %p\n", dev, devname, ino, file) printf("%d %d\n", offset, maxbyte) -%(systemtap_v <= "2.2" %? +%(systemtap_v < "2.3" %? printf("%d\n", origin) %) printf("%d %s\n", whence, whence_str) diff --git a/testsuite/buildok/vfs-embedded.stp b/testsuite/buildok/vfs-embedded.stp index 34cb2d1d9..9241ef679 100755 --- a/testsuite/buildok/vfs-embedded.stp +++ b/testsuite/buildok/vfs-embedded.stp @@ -2,7 +2,7 @@ probe begin { print( -%(systemtap_v <= "2.2" %? +%(systemtap_v < "2.3" %? ppos_pos (0) + %) __address_inode(0) + -- 2.43.5