From c1d5f3f6338b04f3a1f5892f2a90baeb752de8d9 Mon Sep 17 00:00:00 2001 From: fche Date: Thu, 18 May 2006 23:11:22 +0000 Subject: 2006-05-18 Frank Ch. Eigler 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. --- elaborate.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'elaborate.h') diff --git a/elaborate.h b/elaborate.h index 2255037e..ed8570f3 100644 --- a/elaborate.h +++ b/elaborate.h @@ -112,12 +112,7 @@ struct derived_probe: public probe derived_probe (probe* b); derived_probe (probe* b, probe_point* l); probe* base; // the original parsed probe - -private: - static unsigned last_probeidx; - -public: - std::string name; + virtual probe* basest () { return base->basest(); } virtual ~derived_probe () {} -- cgit