diff options
| author | fche <fche> | 2006-05-18 23:11:22 +0000 |
|---|---|---|
| committer | fche <fche> | 2006-05-18 23:11:22 +0000 |
| commit | c1d5f3f6338b04f3a1f5892f2a90baeb752de8d9 (patch) | |
| tree | 15ba83f67626c8632dbdd2dc0f2737bcc623d2e6 /tapsets.cxx | |
| parent | 1e6f6015ab7a5918fc3a84bbeef34876169f1ff9 (diff) | |
| download | systemtap-steved-c1d5f3f6338b04f3a1f5892f2a90baeb752de8d9.tar.gz systemtap-steved-c1d5f3f6338b04f3a1f5892f2a90baeb752de8d9.tar.xz systemtap-steved-c1d5f3f6338b04f3a1f5892f2a90baeb752de8d9.zip | |
2006-05-18 Frank Ch. Eigler <fche@elastic.org>
Organize "-t" output by script/parse level probes rather than
derived-probes.
* elaborate.cxx (derived_probe ctor): Remove name field setting.
(alias_derived_probe): New class.
(alias_expandion_builder::build): Create an instance of the above
instead of parse-tree-level plain probe.
* elaborate.h: Corresponding changes.
(derived_probe::basest): Define.
* staptree.cxx (probe ctor): Set new name field.
* staptree.h (probe): Corresponding changes.
(probe::basest): New field.
* tapsets.cxx (emit_probe_prologue, emit_probe_entries):
Switch to basest() probe name for Stat instance.
(dwarf_derived_probe ctor): Stash away base probe.
* translate.cxx (unparser::emit_probe): Remove index
operand, just use probe name to generate symbols.
(emit_module_init): Reorganize -t output in unregister functions.
(translate_pass): Remove unparser::current_probenum field and all
uses.
* translate.h: Corresponding changes.
Diffstat (limited to 'tapsets.cxx')
| -rw-r--r-- | tapsets.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tapsets.cxx b/tapsets.cxx index d562677b..9cb93e68 100644 --- a/tapsets.cxx +++ b/tapsets.cxx @@ -151,7 +151,7 @@ derived_probe::emit_probe_epilogue (translator_output* o) o->newline() << "int64_t cycles_elapsed = (cycles_atend > cycles_atstart)"; o->newline(1) << "? (int64_t) (cycles_atend - cycles_atstart)"; o->newline() << ": (int64_t) (~(cycles_t)0) - cycles_atstart + cycles_atend + 1;"; - o->newline() << "_stp_stat_add(time_" << name << ",cycles_elapsed);"; + o->newline() << "_stp_stat_add(time_" << basest()->name << ",cycles_elapsed);"; o->indent(-1); o->newline(-1) << "}"; o->newline() << "#endif"; @@ -215,7 +215,7 @@ void be_derived_probe::emit_probe_entries (translator_output* o) { o->newline() << "#ifdef STP_TIMING"; - o->newline() << "static __cacheline_aligned Stat " << "time_" << name << ";"; + o->newline() << "static __cacheline_aligned Stat " << "time_" << basest()->name << ";"; o->newline() << "#endif"; for (unsigned i=0; i<locations.size(); i++) @@ -2756,7 +2756,7 @@ dwarf_derived_probe::add_probe_point(string const & funcname, dwarf_derived_probe::dwarf_derived_probe (Dwarf_Die *scope_die, Dwarf_Addr addr, dwarf_query & q) - : derived_probe (NULL), + : derived_probe (q.base_probe, 0 /* location-less */), has_return (q.has_return) { string module_name(q.dw.module_name); @@ -3080,7 +3080,7 @@ dwarf_derived_probe::emit_probe_entries (translator_output* o) o->newline(); o->newline() << "#ifdef STP_TIMING"; - o->newline() << "static __cacheline_aligned Stat " << "time_" << name << ";"; + o->newline() << "static __cacheline_aligned Stat " << "time_" << basest()->name << ";"; o->newline() << "#endif"; // Construct a single entry function, and a struct kprobe pointing into |