From 66671fd8e5bccd2b15ffe50299c81e964d7e7dbe Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Tue, 18 Aug 2009 10:54:11 -0700 Subject: [PATCH] Adapt tracepoints to the new probe_locals union * tapsets.cxx (tracepoint_derived_probe_group::emit_module_decls): Use probe_locals to set the tracepoint arguments for the probe. * testsuite/systemtap.base/tracepoints.exp: Include the arguments in the pass-4 tracepoint test. --- tapsets.cxx | 2 +- testsuite/systemtap.base/tracepoints.exp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tapsets.cxx b/tapsets.cxx index d350715ce..e12ff6bd1 100644 --- a/tapsets.cxx +++ b/tapsets.cxx @@ -5803,7 +5803,7 @@ tracepoint_derived_probe_group::emit_module_decls (systemtap_session& s) for (unsigned j = 0; j < p->args.size(); ++j) if (p->args[j].used) { - s.op->newline() << "c->locals[0]." << p->name << ".__tracepoint_arg_" + s.op->newline() << "c->probe_locals." << p->name << ".__tracepoint_arg_" << p->args[j].name << " = (int64_t)"; s.op->line() << p->args[j].typecast; s.op->line() << "__tracepoint_arg_" << p->args[j].name << ";"; diff --git a/testsuite/systemtap.base/tracepoints.exp b/testsuite/systemtap.base/tracepoints.exp index cd033908e..a4e38c057 100644 --- a/testsuite/systemtap.base/tracepoints.exp +++ b/testsuite/systemtap.base/tracepoints.exp @@ -13,7 +13,7 @@ catch {close}; catch { wait } foreach tp $tracepoints { set test "tracepoint $tp -p4" - if {[catch {exec stap -w -p4 -e "probe $tp {}"} res]} { + if {[catch {exec stap -w -p4 -e "probe $tp { println($\$name, $\$vars) }"} res]} { fail "$test $res" } else { pass "$test" -- 2.43.5