From 46ccda7cb16f72c380866bfad29a0bd22aad5554 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Mon, 10 Aug 2015 10:12:17 -0400 Subject: [PATCH] interned-string conversion: some more function parameters Saving some std::string round-trips. --- tapsets.cxx | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tapsets.cxx b/tapsets.cxx index d4c035a95..44632abaf 100644 --- a/tapsets.cxx +++ b/tapsets.cxx @@ -598,7 +598,7 @@ public: struct base_query { base_query(dwflpp & dw, literal_map_t const & params); - base_query(dwflpp & dw, const string & module_val); + base_query(dwflpp & dw, interned_string module_val); virtual ~base_query() {} systemtap_session & sess; @@ -700,7 +700,7 @@ base_query::base_query(dwflpp & dw, literal_map_t const & params): assert (has_kernel || has_process || has_module); } -base_query::base_query(dwflpp & dw, const string & module_val) +base_query::base_query(dwflpp & dw, interned_string module_val) : sess(dw.sess), dw(dw), has_library(false), has_plt(false), has_statement(false), module_val(module_val), pid_val(0) { @@ -5874,11 +5874,11 @@ struct sdt_uprobe_var_expanding_visitor: public var_expanding_visitor sdt_uprobe_var_expanding_visitor(systemtap_session& s, dwflpp& dw, int elf_machine, - const string & process_name, - const string & provider_name, - const string & probe_name, + interned_string process_name, + interned_string provider_name, + interned_string probe_name, stap_sdt_probe_type probe_type, - const string & arg_string, + interned_string arg_string, int ac): session (s), dw (dw), elf_machine (elf_machine), process_name (process_name), provider_name (provider_name), @@ -5905,9 +5905,9 @@ struct sdt_uprobe_var_expanding_visitor: public var_expanding_visitor systemtap_session& session; dwflpp& dw; int elf_machine; - const string & process_name; - const string & provider_name; - const string & probe_name; + interned_string process_name; + interned_string provider_name; + interned_string probe_name; stap_sdt_probe_type probe_type; unsigned arg_count; vector arg_tokens; @@ -6745,7 +6745,7 @@ sdt_uprobe_var_expanding_visitor::visit_target_symbol_arg (target_symbol *e) cast->tok = e->tok; cast->operand = argexpr; cast->components = e->components; - cast->type_name = probe_name + "_arg" + lex_cast(argno); + cast->type_name = (string)probe_name + "_arg" + lex_cast(argno); cast->module = process_name; cast->visit(this); } -- 2.43.5