diff options
| author | Frank Ch. Eigler <fche@redhat.com> | 2010-01-09 13:48:11 -0500 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2010-01-09 13:48:11 -0500 |
| commit | 392e08b73a6febb831fa73454466e8aba4237a6d (patch) | |
| tree | 2228db859d59ab75589fd678df333a5a4d2e2deb | |
| parent | 318410fb053615fefb0eb3f360f1f1b8c0096b27 (diff) | |
| download | systemtap-steved-392e08b73a6febb831fa73454466e8aba4237a6d.tar.gz systemtap-steved-392e08b73a6febb831fa73454466e8aba4237a6d.tar.xz systemtap-steved-392e08b73a6febb831fa73454466e8aba4237a6d.zip | |
tracepoints build fix
* tapsets.cxx (emit_module_decls): #undef TRACE_INCLUDE_FILE
in front of each #include'd trace/event header, to prevent
macro redefinition.
(init_dw): Respect pending_interrupts in traceprobe module
compilation loop.
| -rw-r--r-- | tapsets.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tapsets.cxx b/tapsets.cxx index 4c15c5ac..a5717d16 100644 --- a/tapsets.cxx +++ b/tapsets.cxx @@ -6105,6 +6105,7 @@ tracepoint_derived_probe_group::emit_module_decls (systemtap_session& s) // emit a separate entry function for each probe, since tracepoints // don't provide any sort of context pointer. + s.op->newline() << "#undef TRACE_INCLUDE_FILE"; s.op->newline() << "#include <" << p->header << ">"; s.op->newline() << "static void enter_tracepoint_probe_" << i << "("; if (p->args.size() == 0) @@ -6431,6 +6432,8 @@ tracepoint_builder::init_dw(systemtap_session& s) // Otherwise try to do them one at a time (PR10424) for (size_t i = 0; i < system_headers.size(); ++i) { + if (pending_interrupts) return false; + vector<string> one_header(1, system_headers[i]); tracequery_path = get_tracequery_module(s, one_header); if (get_file_size(tracequery_path)) |