diff options
| author | Dave Brolley <brolley@redhat.com> | 2009-11-03 16:22:36 -0500 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2009-11-03 16:22:36 -0500 |
| commit | 899b66209b0146560f0efc33efe58a4be3577df3 (patch) | |
| tree | 7b64764b917c359a99d0adcf6c68a2d73cd52be7 /tapset/syscalls.stp | |
| parent | d4ad7984018ff769cbb662342be7e501632c0bea (diff) | |
| parent | 89651893a8ec51ee4d77ddfd57019e350ad7b169 (diff) | |
| download | systemtap-steved-899b66209b0146560f0efc33efe58a4be3577df3.tar.gz systemtap-steved-899b66209b0146560f0efc33efe58a4be3577df3.tar.xz systemtap-steved-899b66209b0146560f0efc33efe58a4be3577df3.zip | |
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
Conflicts:
Makefile.in
configure
doc/Makefile.in
doc/SystemTap_Tapset_Reference/Makefile.in
grapher/Makefile.in
testsuite/configure
Diffstat (limited to 'tapset/syscalls.stp')
| -rw-r--r-- | tapset/syscalls.stp | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/tapset/syscalls.stp b/tapset/syscalls.stp index 825842a6..dde0ca9f 100644 --- a/tapset/syscalls.stp +++ b/tapset/syscalls.stp @@ -27,17 +27,29 @@ # accept _____________________________________________________ # long sys_accept(int fd, struct sockaddr __user *upeer_sockaddr, -# int __user *upeer_addrlen) -probe syscall.accept = kernel.function("SyS_accept").call !, - kernel.function("sys_accept").call ? +# int __user *upeer_addrlen, int flags) +probe syscall.accept = _syscall.accept4 !, _syscall.accept { name = "accept" sockfd = $fd addr_uaddr = $upeer_sockaddr addrlen_uaddr = $upeer_addrlen - argstr = sprintf("%d, %p, %p", $fd, $upeer_sockaddr, $upeer_addrlen) + argstr = sprintf("%d, %p, %p, %s", $fd, $upeer_sockaddr, + $upeer_addrlen, flags_str) } -probe syscall.accept.return = kernel.function("SyS_accept").return !, +probe _syscall.accept4 = kernel.function("sys_accept4").call +{ + flags = $flags + flags_str = _sock_flags_str($flags) +} +probe _syscall.accept = kernel.function("SyS_accept").call !, + kernel.function("sys_accept").call ? +{ + flags = 0 + flags_str = "0" +} +probe syscall.accept.return = kernel.function("sys_accept4").return !, + kernel.function("SyS_accept").return !, kernel.function("sys_accept").return ? { name = "accept" |