diff options
author | Josh Stone <jistone@redhat.com> | 2009-10-06 20:01:13 -0700 |
---|---|---|
committer | Josh Stone <jistone@redhat.com> | 2009-10-06 20:01:13 -0700 |
commit | 038c38c6119e29189be83c3a214c635c0d02ee58 (patch) | |
tree | 52dcb2eccaee50dc4ab6684b4aec80f8b6a4663d /tapsets.cxx | |
parent | 47f025139d1c2e75781cdab40dc9195396133754 (diff) | |
download | systemtap-steved-038c38c6119e29189be83c3a214c635c0d02ee58.tar.gz systemtap-steved-038c38c6119e29189be83c3a214c635c0d02ee58.tar.xz systemtap-steved-038c38c6119e29189be83c3a214c635c0d02ee58.zip |
Remove the global derived_probe->semaphore map
Instead just make the semaphore address a member of derived_probe.
* session.h (systemtap_session): Remove the map sdt_semaphore_addr.
* elaborate.h (derived_probe): Add sdt_semaphore_addr directly.
* tapsets.cxx (sdt_query::record_semaphore): Write the addr directly.
(uprobe_derived_probe_group::emit_module_decls): Read it directly.
* tapset-utrace.cxx (utrace_derived_probe_group::emit_probe_decl): Ditto
Diffstat (limited to 'tapsets.cxx')
-rw-r--r-- | tapsets.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tapsets.cxx b/tapsets.cxx index 6267f314..09ead991 100644 --- a/tapsets.cxx +++ b/tapsets.cxx @@ -3699,7 +3699,7 @@ sdt_query::record_semaphore (vector<derived_probe *> & results, unsigned start) if (dwfl_module_relocations (dw.module) > 0) dwfl_module_relocate_address (dw.module, &addr); for (unsigned i = start; i < results.size(); ++i) - sess.sdt_semaphore_addr.insert(make_pair(results[i], addr)); + results[i]->sdt_semaphore_addr = addr; } } @@ -4447,10 +4447,9 @@ uprobe_derived_probe_group::emit_module_decls (systemtap_session& s) s.op->line() << " .pp=" << lex_cast_qstring (*p->sole_location()) << ","; s.op->line() << " .ph=&" << p->name << ","; - map<derived_probe*, Dwarf_Addr>::iterator its = s.sdt_semaphore_addr.find(p); - if (its != s.sdt_semaphore_addr.end()) + if (p->sdt_semaphore_addr != 0) s.op->line() << " .sdt_sem_address=(unsigned long)0x" - << hex << its->second << dec << "ULL,"; + << hex << p->sdt_semaphore_addr << dec << "ULL,"; if (p->has_return) s.op->line() << " .return_p=1,"; |