From 4ddb6dd03ee4364bdb36bc32888846faad48a080 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Thu, 17 Sep 2009 16:37:36 -0700 Subject: Map std semaphores from probe->addr Each probe needs to know the associated semaphore address, rather than the other way around. * session.h (sdt_semaphore_addr): Reverse the key-value types. * tapsets.cxx (record_semaphore): Take an index to only record the semaphore for newly added results. (sdt_query::handle_query_module): Adjust accordingly. (uprobe_derived_probe_group::emit_module_decls): Now it's a simple map lookup for sdt_sem_address. * tapset-utrace.cxx (utrace_derived_probe_group::emit_probe_decl): Ditto. --- tapset-utrace.cxx | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'tapset-utrace.cxx') diff --git a/tapset-utrace.cxx b/tapset-utrace.cxx index 639f0c20..9e5ce939 100644 --- a/tapset-utrace.cxx +++ b/tapset-utrace.cxx @@ -716,20 +716,14 @@ utrace_derived_probe_group::emit_probe_decl (systemtap_session& s, break; } s.op->line() << " .engine_attached=0,"; - map::iterator its; - if (s.sdt_semaphore_addr.empty()) + + map::iterator its = s.sdt_semaphore_addr.find(p); + if (its == s.sdt_semaphore_addr.end()) 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 == ((struct utrace_derived_probe*)(its->second))) - { - s.op->line() << " .sdt_sem_address=(unsigned long)0x" << hex << its->first << dec << "ULL,"; - break; - } - } + s.op->line() << " .sdt_sem_address=(unsigned long)0x" + << hex << its->second << dec << "ULL,"; + s.op->line() << " .tsk=0,"; s.op->line() << " },"; } -- cgit