diff options
| author | Tim Moore <timoore@redhat.com> | 2009-12-07 12:47:32 +0100 |
|---|---|---|
| committer | Tim Moore <timoore@redhat.com> | 2009-12-07 12:47:32 +0100 |
| commit | 9156a0f81ec0316b11a7f5ad4db2bd92083e1614 (patch) | |
| tree | 633ebd7990b6c9c51ae5caf376695c173e972cfa | |
| parent | 5891de489db0e172162279247fb633a719fa3756 (diff) | |
| parent | 6da1ad4654842c7a2489e18b9acc94f2f68a6b24 (diff) | |
| download | systemtap-steved-9156a0f81ec0316b11a7f5ad4db2bd92083e1614.tar.gz systemtap-steved-9156a0f81ec0316b11a7f5ad4db2bd92083e1614.tar.xz systemtap-steved-9156a0f81ec0316b11a7f5ad4db2bd92083e1614.zip | |
Merge branch 'master' of ssh://sourceware.org/git/systemtap
| -rw-r--r-- | tapset/tcpmib.stp | 11 | ||||
| -rwxr-xr-x | testsuite/buildok/tcpmib-all-probes.stp | 7 |
2 files changed, 8 insertions, 10 deletions
diff --git a/tapset/tcpmib.stp b/tapset/tcpmib.stp index 497fb7dd..aba7837b 100644 --- a/tapset/tcpmib.stp +++ b/tapset/tcpmib.stp @@ -99,16 +99,6 @@ function tcpmib_remote_port:long(sk:long) CATCH_DEREF_FAULT(); %} -function tcpmib_filter_key:long (sk:long, op:long) { - // ensure all these functions will build - if ( tcpmib_get_state(sk) ) return 0 - if ( tcpmib_local_addr(sk) ) return 0 - if ( tcpmib_remote_addr(sk) ) return 0 - if ( tcpmib_local_port(sk) ) return 0 - if ( tcpmib_remote_port(sk) ) return 0 - return op -} - /** * probe tcpmib.ActiveOpens - Count an active opening of a socket. * @sk: Pointer to the struct sock being acted on. @@ -124,6 +114,7 @@ tcpmib.ActiveOpens=kernel.function("tcp_connect").return sk = $sk; op = 1; if ( $return ) next; + // definition in tcpipstat.stp key = tcpmib_filter_key(sk,op); if ( key ) ActiveOpens[key] += op; } diff --git a/testsuite/buildok/tcpmib-all-probes.stp b/testsuite/buildok/tcpmib-all-probes.stp index 8d1105e1..5b44a99a 100755 --- a/testsuite/buildok/tcpmib-all-probes.stp +++ b/testsuite/buildok/tcpmib-all-probes.stp @@ -4,6 +4,13 @@ probe tcpmib.* {} +// This function is just for test, the real one is +// in tcpipstat.stp +function tcpmib_filter_key:long (sk:long, op:long) { + if (!sk) return 0 + return op +} + probe begin{ print(tcpmib_get_state(0) + tcpmib_local_addr(0) + |