summaryrefslogtreecommitdiffstats
path: root/tapsets.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'tapsets.cxx')
-rw-r--r--tapsets.cxx263
1 files changed, 187 insertions, 76 deletions
diff --git a/tapsets.cxx b/tapsets.cxx
index 977a92fa..53f8ace5 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -591,8 +591,9 @@ struct dwarf_query : public base_query
enum dbinfo_reqt dbinfo_reqt;
enum dbinfo_reqt assess_dbinfo_reqt();
- function_spec_type parse_function_spec(string & spec);
+ void parse_function_spec(const string & spec);
function_spec_type spec_type;
+ vector<string> scopes;
string function;
string file;
line_t line_type;
@@ -697,9 +698,9 @@ dwarf_query::dwarf_query(probe * base_probe,
has_mark = false;
if (has_function_str)
- spec_type = parse_function_spec(function_str_val);
+ parse_function_spec(function_str_val);
else if (has_statement_str)
- spec_type = parse_function_spec(statement_str_val);
+ parse_function_spec(statement_str_val);
dbinfo_reqt = assess_dbinfo_reqt();
query_done = false;
@@ -869,93 +870,124 @@ dwarf_query::handle_query_module()
}
-function_spec_type
-dwarf_query::parse_function_spec(string & spec)
+void
+dwarf_query::parse_function_spec(const string & spec)
{
- string::const_iterator i = spec.begin(), e = spec.end();
+ size_t src_pos, line_pos, dash_pos, scope_pos, next_scope_pos;
- function.clear();
- file.clear();
- line[0] = 0;
- line[1] = 0;
-
- while (i != e && *i != '@')
+ // look for named scopes
+ scope_pos = 0;
+ next_scope_pos = spec.find("::");
+ while (next_scope_pos != string::npos)
{
- if (*i == ':' || *i == '+')
- goto bad;
- function += *i++;
+ scopes.push_back(spec.substr(scope_pos, next_scope_pos - scope_pos));
+ scope_pos = next_scope_pos + 2;
+ next_scope_pos = spec.find("::", scope_pos);
}
- if (i == e)
+ // look for a source separator
+ src_pos = spec.find('@', scope_pos);
+ if (src_pos == string::npos)
{
- if (sess.verbose>2)
- clog << "parsed '" << spec
- << "' -> func '" << function
- << "'\n";
- return function_alone;
+ function = spec.substr(scope_pos);
+ spec_type = function_alone;
}
-
- if (i++ == e)
- goto bad;
-
- while (i != e && *i != ':' && *i != '+')
- file += *i++;
- if (*i == ':')
+ else
{
- if (*(i + 1) == '*')
- line_type = WILDCARD;
+ function = spec.substr(scope_pos, src_pos - scope_pos);
+
+ // look for a line-number separator
+ line_pos = spec.find_first_of(":+", src_pos);
+ if (line_pos == string::npos)
+ {
+ file = spec.substr(src_pos + 1);
+ spec_type = function_and_file;
+ }
else
- line_type = ABSOLUTE;
- }
- else if (*i == '+')
- line_type = RELATIVE;
+ {
+ file = spec.substr(src_pos + 1, line_pos - src_pos - 1);
+
+ // classify the line spec
+ spec_type = function_file_and_line;
+ if (spec[line_pos] == '+')
+ line_type = RELATIVE;
+ else if (spec[line_pos + 1] == '*' &&
+ spec.length() == line_pos + 2)
+ line_type = WILDCARD;
+ else
+ line_type = ABSOLUTE;
- if (i == e)
- {
- if (sess.verbose>2)
- clog << "parsed '" << spec
- << "' -> func '"<< function
- << "', file '" << file
- << "'\n";
- return function_and_file;
+ if (line_type != WILDCARD)
+ try
+ {
+ // try to parse either N or N-M
+ dash_pos = spec.find('-', line_pos + 1);
+ if (dash_pos == string::npos)
+ line[0] = line[1] = lex_cast<int>(spec.substr(line_pos + 1));
+ else
+ {
+ line_type = RANGE;
+ line[0] = lex_cast<int>(spec.substr(line_pos + 1,
+ dash_pos - line_pos - 1));
+ line[1] = lex_cast<int>(spec.substr(dash_pos + 1));
+ }
+ }
+ catch (runtime_error & exn)
+ {
+ goto bad;
+ }
+ }
}
- if (i++ == e)
+ if (function.empty() ||
+ (spec_type != function_alone && file.empty()))
goto bad;
- try
+ if (sess.verbose > 2)
{
- if (line_type != WILDCARD)
- {
- string::const_iterator dash = i;
+ clog << "parsed '" << spec << "'";
- while (dash != e && *dash != '-')
- dash++;
- if (dash == e)
- line[0] = line[1] = lex_cast<int>(string(i, e));
- else
- {
- line_type = RANGE;
- line[0] = lex_cast<int>(string(i, dash));
- line[1] = lex_cast<int>(string(dash + 1, e));
- }
- }
+ if (!scopes.empty())
+ clog << ", scope '" << scopes[0] << "'";
+ for (unsigned i = 1; i < scopes.size(); ++i)
+ clog << "::'" << scopes[i] << "'";
- if (sess.verbose>2)
- clog << "parsed '" << spec
- << "' -> func '"<< function
- << "', file '" << file
- << "', line " << line << "\n";
- return function_file_and_line;
- }
- catch (runtime_error & exn)
- {
- goto bad;
+ clog << ", func '" << function << "'";
+
+ if (spec_type != function_alone)
+ clog << ", file '" << file << "'";
+
+ if (spec_type == function_file_and_line)
+ {
+ clog << ", line ";
+ switch (line_type)
+ {
+ case ABSOLUTE:
+ clog << line[0];
+ break;
+
+ case RELATIVE:
+ clog << "+" << line[0];
+ break;
+
+ case RANGE:
+ clog << line[0] << " - " << line[1];
+ break;
+
+ case WILDCARD:
+ clog << "*";
+ break;
+ }
+ }
+
+ clog << endl;
}
- bad:
- throw semantic_error("malformed specification '" + spec + "'",
- base_probe->tok);
+ return;
+
+bad:
+ throw semantic_error("malformed specification '" + spec + "'",
+ base_probe->tok);
}
@@ -1335,6 +1367,9 @@ query_dwarf_func (Dwarf_Die * func, base_query * bq)
{
q->dw.focus_on_function (func);
+ if (!q->dw.function_scope_matches(q->scopes))
+ return DWARF_CB_OK;
+
// make sure that this function address hasn't
// already been matched under an aliased name
Dwarf_Addr addr;
@@ -3458,6 +3493,7 @@ private:
probe * base_probe;
probe_point * base_loc;
+ literal_map_t const & params;
vector<derived_probe *> & results;
string mark_name;
@@ -3473,6 +3509,7 @@ private:
bool get_next_probe();
void convert_probe(probe *base);
+ void record_semaphore(vector<derived_probe *> & results);
void convert_location(probe *base, probe_point *location);
};
@@ -3481,7 +3518,7 @@ sdt_query::sdt_query(probe * base_probe, probe_point * base_loc,
dwflpp & dw, literal_map_t const & params,
vector<derived_probe *> & results):
base_query(dw, params), base_probe(base_probe),
- base_loc(base_loc), results(results)
+ base_loc(base_loc), params(params), results(results)
{
assert(get_string_param(params, TOK_MARK, mark_name));
}
@@ -3523,7 +3560,11 @@ sdt_query::handle_query_module()
unsigned i = results.size();
if (probe_type == kprobe_type || probe_type == utrace_type)
- derive_probes(sess, new_base, results);
+ {
+ derive_probes(sess, new_base, results);
+ record_semaphore(results);
+ }
+
else
{
literal_map_t params;
@@ -3536,6 +3577,7 @@ sdt_query::handle_query_module()
dwarf_query q(new_base, new_location, dw, params, results);
q.has_mark = true; // enables mid-statement probing
dw.iterate_over_modules(&query_module, &q);
+ record_semaphore(results);
}
if (sess.listing_mode)
@@ -3667,6 +3709,28 @@ sdt_query::get_next_probe()
void
+sdt_query::record_semaphore (vector<derived_probe *> & results)
+{
+ int sym_count = dwfl_module_getsymtab(dw.module);
+ assert (sym_count >= 0);
+ for (int i = 0; i < sym_count; i++)
+ {
+ GElf_Sym sym;
+ GElf_Word shndxp;
+ char *sym_str = (char*)dwfl_module_getsym (dw.module, i, &sym, &shndxp);
+ if (strcmp(sym_str, string(probe_name + "_semaphore").c_str()) == 0)
+ {
+ string process_name;
+ derived_probe_builder::get_param(params, TOK_PROCESS, process_name);
+ for (unsigned int i = 0; i < results.size(); ++i)
+ sess.sdt_semaphore_addr.insert(make_pair(sym.st_value, results[i]));
+ break;
+ }
+ }
+}
+
+
+void
sdt_query::convert_probe (probe *base)
{
block *b = new block;
@@ -4392,6 +4456,8 @@ uprobe_derived_probe_group::emit_module_decls (systemtap_session& s)
s.op->newline() << "unsigned long address;";
s.op->newline() << "const char *pp;";
s.op->newline() << "void (*ph) (struct context*);";
+ s.op->newline() << "unsigned long sdt_sem_address;";
+ s.op->newline() << "struct task_struct *tsk;";
s.op->newline() << "unsigned return_p:1;";
s.op->newline(-1) << "} stap_uprobe_specs [] = {";
s.op->indent(1);
@@ -4405,6 +4471,21 @@ uprobe_derived_probe_group::emit_module_decls (systemtap_session& s)
s.op->line() << " .address=(unsigned long)0x" << hex << p->addr << dec << "ULL,";
s.op->line() << " .pp=" << lex_cast_qstring (*p->sole_location()) << ",";
s.op->line() << " .ph=&" << p->name << ",";
+ map<Dwarf_Addr, derived_probe*>::iterator its;
+ if (s.sdt_semaphore_addr.empty())
+ s.op->line() << " .sdt_sem_address=(unsigned long)0x0,";
+ else
+ for (its = s.sdt_semaphore_addr.begin();
+ its != s.sdt_semaphore_addr.end();
+ its++)
+ {
+ if (p->module == ((struct uprobe_derived_probe*)(its->second))->module
+ && p->addr == ((struct uprobe_derived_probe*)(its->second))->addr)
+ {
+ s.op->line() << " .sdt_sem_address=(unsigned long)0x" << hex << its->first << dec << "ULL,";
+ break;
+ }
+ }
if (p->has_return) s.op->line() << " .return_p=1,";
s.op->line() << " },";
}
@@ -4478,7 +4559,7 @@ uprobe_derived_probe_group::emit_module_decls (systemtap_session& s)
s.op->newline() << "for (spec_index=0; spec_index<sizeof(stap_uprobe_specs)/sizeof(stap_uprobe_specs[0]); spec_index++) {";
s.op->newline(1) << "int handled_p = 0;";
s.op->newline() << "int slotted_p = 0;";
- s.op->newline() << "const struct stap_uprobe_spec *sups = &stap_uprobe_specs [spec_index];";
+ s.op->newline() << "struct stap_uprobe_spec *sups = (struct stap_uprobe_spec*) &stap_uprobe_specs [spec_index];";
s.op->newline() << "int rc = 0;";
s.op->newline() << "int i;";
@@ -4558,6 +4639,16 @@ uprobe_derived_probe_group::emit_module_decls (systemtap_session& s)
s.op->newline(-1) << "}";
s.op->newline(-1) << "}";
+ //----------
+ s.op->newline() << "if (sups->sdt_sem_address != 0) {";
+ s.op->newline(1) << "size_t sdt_semaphore;";
+ s.op->newline() << "sups->tsk = tsk;";
+ s.op->newline() << "__access_process_vm (tsk, relocation + sups->sdt_sem_address, &sdt_semaphore, sizeof (sdt_semaphore), 0);";
+ s.op->newline() << "sdt_semaphore += 1;";
+ s.op->newline() << "__access_process_vm (tsk, relocation + sups->sdt_sem_address, &sdt_semaphore, sizeof (sdt_semaphore), 1);";
+ s.op->newline(-1) << "}";
+ //----------
+
// close iteration over stap_uprobe_spec[]
s.op->newline(-1) << "}";
@@ -4580,9 +4671,9 @@ uprobe_derived_probe_group::emit_module_decls (systemtap_session& s)
s.op->newline() << "for (i=0; i<MAXUPROBES; i++) {"; // XXX: slow linear search
s.op->newline(1) << "struct stap_uprobe *sup = & stap_uprobes[i];";
- s.op->newline() << "const struct stap_uprobe_spec *sups;";
+ s.op->newline() << "struct stap_uprobe_spec *sups;";
s.op->newline() << "if (sup->spec_index < 0) continue;"; // skip free uprobes slot
- s.op->newline() << "sups = & stap_uprobe_specs[sup->spec_index];";
+ s.op->newline() << "sups = (struct stap_uprobe_spec*) & stap_uprobe_specs[sup->spec_index];";
s.op->newline() << "mutex_lock (& stap_uprobes_lock);";
@@ -4642,6 +4733,16 @@ uprobe_derived_probe_group::emit_module_decls (systemtap_session& s)
s.op->newline() << "mutex_unlock (& stap_uprobes_lock);";
+ //----------
+ s.op->newline() << "if (sups->sdt_sem_address != 0) {";
+ s.op->newline(1) << "size_t sdt_semaphore;";
+ s.op->newline() << "sups->tsk = tsk;";
+ s.op->newline() << "__access_process_vm (tsk, sups->sdt_sem_address, &sdt_semaphore, sizeof (sdt_semaphore), 0);";
+ s.op->newline() << "sdt_semaphore += 1;";
+ s.op->newline() << "__access_process_vm (tsk, sups->sdt_sem_address, &sdt_semaphore, sizeof (sdt_semaphore), 1);";
+ s.op->newline(-1) << "}";
+ //----------
+
// close iteration over stap_uprobes[]
s.op->newline(-1) << "}";
@@ -4765,6 +4866,16 @@ uprobe_derived_probe_group::emit_module_exit (systemtap_session& s)
s.op->newline() << "const struct stap_uprobe_spec *sups = &stap_uprobe_specs [sup->spec_index];";
s.op->newline() << "if (sup->spec_index < 0) continue;"; // free slot
+ //----------
+ s.op->newline() << "if (sups->sdt_sem_address != 0) {";
+ s.op->newline(1) << "size_t sdt_semaphore;";
+ s.op->newline() << "__access_process_vm (sups->tsk, sups->sdt_sem_address, &sdt_semaphore, sizeof (sdt_semaphore), 0);";
+ s.op->newline() << "sdt_semaphore -= 1;";
+ s.op->newline() << "__access_process_vm (sups->tsk, sups->sdt_sem_address, &sdt_semaphore, sizeof (sdt_semaphore), 1);";
+ s.op->newline(-1) << "}";
+ //----------
+
+
s.op->newline() << "if (sups->return_p) {";
s.op->newline(1) << "#ifdef DEBUG_UPROBES";
s.op->newline() << "_stp_dbug (__FUNCTION__,__LINE__, \"-uretprobe spec %d index %d pid %d addr %p\\n\", sup->spec_index, j, sup->up.pid, (void*) sup->up.vaddr);";
generated by cgit (git 2.34.1) at 2025-08-05 02:58:49 +0000