summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--examples/ChangeLog5
-rwxr-xr-xexamples/small_demos/prof.stp2
-rwxr-xr-xexamples/small_demos/top.stp2
-rw-r--r--examples/socket-trace.stp2
-rw-r--r--tapsets.cxx2
-rw-r--r--testsuite/ChangeLog1
-rwxr-xr-xtestsuite/semko/twentyone.stp6
8 files changed, 18 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index c5356b02..5ab7d2ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-02 Frank Ch. Eigler <fche@elastic.org>
+
+ * tapsets.cxx (query_dwarf_func): Skip non-inlined functions
+ for .function().inline case.
+
2007-03-30 Frank Ch. Eigler <fche@redhat.com>
PR 1570
diff --git a/examples/ChangeLog b/examples/ChangeLog
index 0d32fe3a..5ee73c56 100644
--- a/examples/ChangeLog
+++ b/examples/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-02 Frank Ch. Eigler <fche@elastic.org>
+
+ * socket-trace.stp, small_demos/prof.stp, top.stp: Adapt to
+ .inline -> .function change.
+
2007-01-30 Frank Ch. Eigler <fche@elastic.org>
* socket-trace.stp: Added from the tutorial.
diff --git a/examples/small_demos/prof.stp b/examples/small_demos/prof.stp
index 986be65e..e08aa21c 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 ed658907..69931ab1 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 53b69ecc..a34a33a8 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 f71f6df5..ba2ffd87 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 9d1c2cc3..bf9bfae6 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 <fche@elastic.org>
diff --git a/testsuite/semko/twentyone.stp b/testsuite/semko/twentyone.stp
index c01725e2..910fc2c9 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")
}