diff options
| author | dsmith <dsmith> | 2006-06-30 18:24:43 +0000 |
|---|---|---|
| committer | dsmith <dsmith> | 2006-06-30 18:24:43 +0000 |
| commit | b40af7ee2b7ec2a0bdabf4e1b2ecfceec1de33be (patch) | |
| tree | 46c20d503390c2e1de2de8f6a46622f2ec02fc57 /tapsets.cxx | |
| parent | 1a5293af69dfe577b04ac0abe366bd1c0434930b (diff) | |
| download | systemtap-steved-b40af7ee2b7ec2a0bdabf4e1b2ecfceec1de33be.tar.gz systemtap-steved-b40af7ee2b7ec2a0bdabf4e1b2ecfceec1de33be.tar.xz systemtap-steved-b40af7ee2b7ec2a0bdabf4e1b2ecfceec1de33be.zip | |
2006-06-30 David Smith <dsmith@redhat.com>
* tapsets.cxx (dwflpp::dwfl_assert): Added optional extra_msg
parameter to be able to print out extra error message.
(dwflpp::setup): Uses new 'extra_msg' parameter to dwfl_assert()
to ask user to install kernel-debuginfo when
dwfl_linux_kernel_report_kernel() or
dwfl_linux_kernel_report_modules() fails (Bugzilla #2669).
* buildrun.cxx (compile_pass): Checks to make sure module build
directory exists before trying to run make there (Bugzilla #2669).
Diffstat (limited to 'tapsets.cxx')
| -rw-r--r-- | tapsets.cxx | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/tapsets.cxx b/tapsets.cxx index 116464c4..afc430b2 100644 --- a/tapsets.cxx +++ b/tapsets.cxx @@ -722,13 +722,18 @@ dwflpp } - void dwfl_assert(string desc, int rc) // NB: "rc == 0" means OK in this case + // NB: "rc == 0" means OK in this case + void dwfl_assert(string desc, int rc, string extra_msg = "") { string msg = "libdwfl failure (" + desc + "): "; if (rc < 0) msg += dwfl_errmsg (rc); else if (rc > 0) msg += strerror (rc); if (rc != 0) - throw semantic_error (msg); + { + if (extra_msg.length() > 0) + msg += "\n" + extra_msg; + throw semantic_error (msg); + } } void dwarf_assert(string desc, int rc) // NB: "rc == 0" means OK in this case @@ -785,12 +790,11 @@ dwflpp // XXX: if we have only kernel.* probe points, we shouldn't waste time // looking for module debug-info (and vice versa). dwfl_assert ("dwfl_linux_kernel_report_kernel", - dwfl_linux_kernel_report_kernel (dwfl)); + dwfl_linux_kernel_report_kernel (dwfl), + "Ensure kernel debuginfo is installed"); dwfl_assert ("dwfl_linux_kernel_report_modules", - dwfl_linux_kernel_report_modules (dwfl)); - // NB: While RH bug #169672 prevents detection of -debuginfo absence - // here, the get_module_dwarf() function will throw an exception - // before long. + dwfl_linux_kernel_report_modules (dwfl), + "Ensure kernel debuginfo is installed"); } else { |