From 392e08b73a6febb831fa73454466e8aba4237a6d Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Sat, 9 Jan 2010 13:48:11 -0500 Subject: [PATCH] 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. --- tapsets.cxx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tapsets.cxx b/tapsets.cxx index 4c15c5ac9..a5717d16c 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 one_header(1, system_headers[i]); tracequery_path = get_tracequery_module(s, one_header); if (get_file_size(tracequery_path)) -- 2.43.5