diff options
| author | Frank Ch. Eigler <fche@elastic.org> | 2008-04-25 16:33:24 -0400 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2008-04-25 16:33:24 -0400 |
| commit | 76d647dc1fdf1d6bb4397f4a3b819003492dfda6 (patch) | |
| tree | 51b9d7a1f0ee75a41c487828d5e62c6a70b7fd28 /tapsets.cxx | |
| parent | c47ccf304e6560cb50c86c2a5213c8de56678449 (diff) | |
| parent | 9f99b110fbee8a6935ca60c152cc3c7cd809461b (diff) | |
| download | systemtap-steved-76d647dc1fdf1d6bb4397f4a3b819003492dfda6.tar.gz systemtap-steved-76d647dc1fdf1d6bb4397f4a3b819003492dfda6.tar.xz systemtap-steved-76d647dc1fdf1d6bb4397f4a3b819003492dfda6.zip | |
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap into pr6429-comp-unwindsyms
* 'master' of ssh://sources.redhat.com/git/systemtap:
simplify systemtap.spec configuration vars
Handles markers with no format string.
Fixed task_finder.c kernel 2.6.25 change.
PR6454: fix "stap -l" listing of space-laden probe point names
Move examples to testsuite/systemtap.examples.
PR6451: avoid one class of staprun shutdown deadlock (module/.ctl filehandle = 0)
Made kernel 2.6.25 changes in task_finder.c.
Move examples to testsuite/systemtap.examples
PR6416: extend probing blacklist with more init/exit sections
Diffstat (limited to 'tapsets.cxx')
| -rw-r--r-- | tapsets.cxx | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/tapsets.cxx b/tapsets.cxx index 6e776a58..23e85a0e 100644 --- a/tapsets.cxx +++ b/tapsets.cxx @@ -2618,7 +2618,13 @@ dwarf_query::blacklisted_p(const string& funcname, Dwarf_Addr addr) { if (section.substr(0, 6) == string(".init.") || - section.substr(0, 6) == string(".exit.")) + section.substr(0, 6) == string(".exit.") || + section.substr(0, 9) == string(".devinit.") || + section.substr(0, 9) == string(".devexit.") || + section.substr(0, 9) == string(".cpuinit.") || + section.substr(0, 9) == string(".cpuexit.") || + section.substr(0, 9) == string(".meminit.") || + section.substr(0, 9) == string(".memexit.")) { // NB: module .exit. routines could be probed in theory: // if the exit handler in "struct module" is diverted, @@ -6482,6 +6488,11 @@ mark_builder::build(systemtap_session & sess, string::size_type notwhite = format.find_first_not_of(" \t"); format.erase(0, notwhite); + // If the format is empty, make sure we add back a space + // character, which is what MARK_NOARGS expands to. + if (format.length() == 0) + format = " "; + if (sess.verbose>3) clog << "'" << name << "' '" << module << "' '" << format << "'" << endl; |