summaryrefslogtreecommitdiffstats
path: root/tapsets.cxx
diff options
context:
space:
mode:
authorDave Brolley <brolley@redhat.com>2008-09-08 10:50:28 -0400
committerDave Brolley <brolley@redhat.com>2008-09-08 10:50:28 -0400
commite27cf4ed7ebf115a03fc29a639b72b983f5ddff2 (patch)
treeb07abb50bcb5c03e4d88af1b00ae0edc8223091c /tapsets.cxx
parent0bda97400ce6610899b3fbd7fd19f67030fedcc8 (diff)
parente6342ff8c11bbed1d2058507b918cf3c140e1322 (diff)
downloadsystemtap-steved-e27cf4ed7ebf115a03fc29a639b72b983f5ddff2.tar.gz
systemtap-steved-e27cf4ed7ebf115a03fc29a639b72b983f5ddff2.tar.xz
systemtap-steved-e27cf4ed7ebf115a03fc29a639b72b983f5ddff2.zip
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
Diffstat (limited to 'tapsets.cxx')
-rw-r--r--tapsets.cxx7
1 files changed, 6 insertions, 1 deletions
diff --git a/tapsets.cxx b/tapsets.cxx
index 4fa53a88..64fa9d34 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -2919,6 +2919,8 @@ dwarf_query::build_blacklist()
blfile += "kernel/kprobes.c"; // first alternative, no "|"
blfile += "|arch/.*/kernel/kprobes.c";
+ blfile += "|include/asm/io.h";
+ blfile += "|drivers/ide/ide-iops.c";
// XXX: it would be nice if these blacklisted functions were pulled
// in dynamically, instead of being statically defined here.
@@ -5868,8 +5870,11 @@ utrace_derived_probe::utrace_derived_probe (systemtap_session &s,
vector<probe_point::component*> comps;
if (hp)
comps.push_back (new probe_point::component(TOK_PROCESS, new literal_string(path)));
- else
+ else if (pid != 0)
comps.push_back (new probe_point::component(TOK_PROCESS, new literal_number(pid)));
+ else
+ comps.push_back (new probe_point::component(TOK_PROCESS));
+
switch (flags)
{
case UDPF_THREAD_BEGIN: