From 396afcee5ada2d207b7a6691d4b7ce473e7b2a65 Mon Sep 17 00:00:00 2001 From: fche Date: Mon, 2 Apr 2007 21:17:35 +0000 Subject: [PATCH] 2007-04-02 Frank Ch. Eigler * tapsets.cxx (query_dwarf_func): Skip non-inlined functions for .function().inline case. 2007-04-02 Frank Ch. Eigler * socket-trace.stp, small_demos/prof.stp, top.stp: Adapt to .inline -> .function change. * semko/twentyone.stp: Ditto. --- ChangeLog | 5 +++++ examples/ChangeLog | 5 +++++ examples/small_demos/prof.stp | 2 +- examples/small_demos/top.stp | 2 +- examples/socket-trace.stp | 2 +- tapsets.cxx | 2 +- testsuite/ChangeLog | 1 + testsuite/semko/twentyone.stp | 6 +++--- 8 files changed, 18 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index c5356b029..5ab7d2aba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-04-02 Frank Ch. Eigler + + * tapsets.cxx (query_dwarf_func): Skip non-inlined functions + for .function().inline case. + 2007-03-30 Frank Ch. Eigler PR 1570 diff --git a/examples/ChangeLog b/examples/ChangeLog index 0d32fe3aa..5ee73c565 100644 --- a/examples/ChangeLog +++ b/examples/ChangeLog @@ -1,3 +1,8 @@ +2007-04-02 Frank Ch. Eigler + + * socket-trace.stp, small_demos/prof.stp, top.stp: Adapt to + .inline -> .function change. + 2007-01-30 Frank Ch. Eigler * socket-trace.stp: Added from the tutorial. diff --git a/examples/small_demos/prof.stp b/examples/small_demos/prof.stp index 986be65ef..e08aa21cb 100755 --- a/examples/small_demos/prof.stp +++ b/examples/small_demos/prof.stp @@ -11,7 +11,7 @@ # Will profile pid 3323 until it ^c is hit. # -probe kernel.function("sys_*") { +probe kernel.function("sys_*").call { if (target() == tid()) calltime[tid()] = gettimeofday_us() } diff --git a/examples/small_demos/top.stp b/examples/small_demos/top.stp index ed6589076..69931ab1d 100755 --- a/examples/small_demos/top.stp +++ b/examples/small_demos/top.stp @@ -13,7 +13,7 @@ function print_top () { delete syscalls } -probe kernel.function("sys_*") { +probe kernel.function("sys_*").call { syscalls[probefunc()]++ } diff --git a/examples/socket-trace.stp b/examples/socket-trace.stp index 53b69ecc6..a34a33a8c 100644 --- a/examples/socket-trace.stp +++ b/examples/socket-trace.stp @@ -1,4 +1,4 @@ -probe kernel.function("*@net/socket.c") { +probe kernel.function("*@net/socket.c").call { printf ("%s -> %s\n", thread_indent(1), probefunc()) } probe kernel.function("*@net/socket.c").return { diff --git a/tapsets.cxx b/tapsets.cxx index f71f6df5f..ba2ffd874 100644 --- a/tapsets.cxx +++ b/tapsets.cxx @@ -2624,7 +2624,7 @@ query_dwarf_func (Dwarf_Die * func, void * arg) << "\n"; q->dw.iterate_over_inline_instances (query_dwarf_inline_instance, arg); } - else if (!q->dw.func_is_inline ()) + else if (!q->dw.func_is_inline () && (! q->has_inline)) { bool record_this_function = false; diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index 9d1c2cc31..bf9bfae66 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -3,6 +3,7 @@ * systemtap.samples/poll_map.stp, profile.stp, syscalls.stp: Continue adopting to .inline -> .function change. * systemtap.samples/topsys.stp, systemtap.stress/current.stp: Ditto. + * semko/twentyone.stp: Ditto. 2007-03-30 Frank Ch. Eigler diff --git a/testsuite/semko/twentyone.stp b/testsuite/semko/twentyone.stp index c01725e2c..910fc2c96 100755 --- a/testsuite/semko/twentyone.stp +++ b/testsuite/semko/twentyone.stp @@ -1,8 +1,8 @@ #! stap -p2 # tests that an inline function is *not* matched using -# the function() pattern +# the function().call pattern -probe kernel.function("context_switch") { - log ("found an inline via function()") +probe kernel.function("context_switch").call { + log ("found an inline via function().call") } -- 2.43.5