diff options
| author | Josh Stone <jistone@redhat.com> | 2009-08-18 10:54:11 -0700 |
|---|---|---|
| committer | Josh Stone <jistone@redhat.com> | 2009-08-18 10:58:49 -0700 |
| commit | 66671fd8e5bccd2b15ffe50299c81e964d7e7dbe (patch) | |
| tree | c62bbc3308ae3e7b2eae28a03a8e344a2d025b13 | |
| parent | 18e5ffd4405633ea2cef102d01890dfbb159b363 (diff) | |
| download | systemtap-steved-66671fd8e5bccd2b15ffe50299c81e964d7e7dbe.tar.gz systemtap-steved-66671fd8e5bccd2b15ffe50299c81e964d7e7dbe.tar.xz systemtap-steved-66671fd8e5bccd2b15ffe50299c81e964d7e7dbe.zip | |
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.
| -rw-r--r-- | tapsets.cxx | 2 | ||||
| -rw-r--r-- | testsuite/systemtap.base/tracepoints.exp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tapsets.cxx b/tapsets.cxx index d350715c..e12ff6bd 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 cd033908..a4e38c05 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" |