summaryrefslogtreecommitdiffstats
path: root/tapsets.cxx
diff options
context:
space:
mode:
authorDave Brolley <brolley@redhat.com>2009-04-23 14:16:36 -0400
committerDave Brolley <brolley@redhat.com>2009-04-23 14:16:36 -0400
commitfb6d28283bd7ea63364a008d32c53687a694642f (patch)
treeaa2d8faf381be8ba016cf4fb18a4d01da464ac60 /tapsets.cxx
parente8aa2f848123598fa8c2110804b250cba1286271 (diff)
parent819ec23db74427d0249596959c938673f424f831 (diff)
downloadsystemtap-steved-fb6d28283bd7ea63364a008d32c53687a694642f.tar.gz
systemtap-steved-fb6d28283bd7ea63364a008d32c53687a694642f.tar.xz
systemtap-steved-fb6d28283bd7ea63364a008d32c53687a694642f.zip
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Conflicts: Makefile.in
Diffstat (limited to 'tapsets.cxx')
-rw-r--r--tapsets.cxx11
1 files changed, 10 insertions, 1 deletions
diff --git a/tapsets.cxx b/tapsets.cxx
index 40d4e901..fd991787 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -668,6 +668,15 @@ enum line_t { ABSOLUTE, RELATIVE, RANGE, WILDCARD };
typedef vector<inline_instance_info> inline_instance_map_t;
typedef vector<func_info> func_info_map_t;
+
+// PR 9941 introduces the need for a predicate
+
+int dwfl_report_offline_predicate (const char* modname, const char* filename)
+{
+ if (pending_interrupts) { return -1; }
+ return 1;
+}
+
struct dwflpp
{
systemtap_session & sess;
@@ -946,7 +955,7 @@ struct dwflpp
int rc = dwfl_linux_kernel_report_offline (dwfl,
elfutils_kernel_path.c_str(),
- NULL);
+ &dwfl_report_offline_predicate);
if (debuginfo_needed)
dwfl_assert (string("missing ") + sess.architecture +