summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Stone <jistone@redhat.com>2009-06-16 11:31:22 -0700
committerJosh Stone <jistone@redhat.com>2009-06-16 11:31:22 -0700
commitfc4a80b88ef35892b1727b683e6ccf18c67a6877 (patch)
tree056f5f7f812fd17812a9ec7fc712225130aa7ee2
parent96b190d404d24eb7349adae6e2d57eb5c9f6c26a (diff)
downloadsystemtap-steved-fc4a80b88ef35892b1727b683e6ccf18c67a6877.tar.gz
systemtap-steved-fc4a80b88ef35892b1727b683e6ccf18c67a6877.tar.xz
systemtap-steved-fc4a80b88ef35892b1727b683e6ccf18c67a6877.zip
Use the expanded value for sdt $$name
* tapsets.cxx (dwarf_builder::build): pass probe_table.probe_name into the sdt_var_expander instead of .mark_name, so wildcards are resolved.
-rw-r--r--tapsets.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/tapsets.cxx b/tapsets.cxx
index 843b6017..15dbeb81 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -3459,7 +3459,7 @@ dwarf_builder::build(systemtap_session & sess,
<< hex << probe_table.probe_arg << dec << endl;
// Now expand the local variables in the probe body
- sdt_var_expanding_visitor svv (module_name, probe_table.mark_name,
+ sdt_var_expanding_visitor svv (module_name, probe_table.probe_name,
probe_table.probe_arg, false);
new_base->body = svv.require (new_base->body);
@@ -3499,7 +3499,7 @@ dwarf_builder::build(systemtap_session & sess,
probe_table.convert_probe(new_base);
// Expand the local variables in the probe body
- sdt_var_expanding_visitor svv (module_name, probe_table.mark_name,
+ sdt_var_expanding_visitor svv (module_name, probe_table.probe_name,
probe_table.probe_arg, true);
new_base->body = svv.require (new_base->body);
probe_table.convert_location(new_base, new_location);