diff options
| author | Dave Brolley <brolley@redhat.com> | 2009-10-13 11:55:11 -0400 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2009-10-13 11:55:11 -0400 |
| commit | f990359bd63bd4fc21e600e71c6a513d5b5b2ccb (patch) | |
| tree | 16fb7638f2089476b2994ec7d8b2131e4a7b0b69 /tapset-utrace.cxx | |
| parent | 8f6d8c2bd3e5c1d2881e2ebe1c7ad5deb389e581 (diff) | |
| parent | ba9abf303e1bed196668f103b2a17c48e3df70aa (diff) | |
| download | systemtap-steved-f990359bd63bd4fc21e600e71c6a513d5b5b2ccb.tar.gz systemtap-steved-f990359bd63bd4fc21e600e71c6a513d5b5b2ccb.tar.xz systemtap-steved-f990359bd63bd4fc21e600e71c6a513d5b5b2ccb.zip | |
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
Diffstat (limited to 'tapset-utrace.cxx')
| -rw-r--r-- | tapset-utrace.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tapset-utrace.cxx b/tapset-utrace.cxx index a8500493..b731293c 100644 --- a/tapset-utrace.cxx +++ b/tapset-utrace.cxx @@ -121,6 +121,9 @@ utrace_derived_probe::utrace_derived_probe (systemtap_session &s, has_path(hp), path(pn), pid(pd), flags(f), target_symbol_seen(false) { + if (s.kernel_config["CONFIG_UTRACE"] != string("y")) + throw semantic_error ("process probes not available without kernel CONFIG_UTRACE"); + // Expand local variables in the probe body utrace_var_expanding_visitor v (s, l, name, flags); v.replace (this->body); @@ -753,12 +756,9 @@ utrace_derived_probe_group::emit_probe_decl (systemtap_session& s, } s.op->line() << " .engine_attached=0,"; - map<derived_probe*, Dwarf_Addr>::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 + 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,"; s.op->line() << " .tsk=0,"; s.op->line() << " },"; |