diff options
| author | Frank Ch. Eigler <fche@elastic.org> | 2008-04-25 14:52:44 -0400 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2008-04-25 14:52:44 -0400 |
| commit | 9f99b110fbee8a6935ca60c152cc3c7cd809461b (patch) | |
| tree | e13eaa14af0205f482673aeada1c14f779ed6d48 | |
| parent | eec2d7f43b36dff4460771576044fcc9f077d11d (diff) | |
| parent | a53c9645aeb7a97a122e161aaa4359152802d5f7 (diff) | |
| download | systemtap-steved-9f99b110fbee8a6935ca60c152cc3c7cd809461b.tar.gz systemtap-steved-9f99b110fbee8a6935ca60c152cc3c7cd809461b.tar.xz systemtap-steved-9f99b110fbee8a6935ca60c152cc3c7cd809461b.zip | |
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
* 'master' of ssh://sources.redhat.com/git/systemtap:
Handles markers with no format string.
Fixed task_finder.c kernel 2.6.25 change.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | runtime/ChangeLog | 5 | ||||
| -rw-r--r-- | runtime/task_finder.c | 2 | ||||
| -rw-r--r-- | tapsets.cxx | 5 |
4 files changed, 17 insertions, 1 deletions
@@ -2,6 +2,12 @@ * systemtap.spec.in: Simplify configuration defaults. +2008-04-25 David Smith <dsmith@redhat.com> + + PR 6455. + * tapsets.cxx (mark_builder::build): Handles markers with no + format string. + 2008-04-24 Frank Ch. Eigler <fche@elastic.org> PR 6454. diff --git a/runtime/ChangeLog b/runtime/ChangeLog index 9197f4ec..a2e49822 100644 --- a/runtime/ChangeLog +++ b/runtime/ChangeLog @@ -1,3 +1,8 @@ +2008-04-25 David Smith <dsmith@redhat.com> + + From Srinivasa <srinivasa@in.ibm.com> + * task_finder.c (__stp_get_mm_path): Fixed kernel 2.6.25 change. + 2008-04-24 David Smith <dsmith@redhat.com> * task_finder.c (__stp_get_mm_path): Made kernel 2.6.25 changes. diff --git a/runtime/task_finder.c b/runtime/task_finder.c index ffbc3d0c..aafe9c32 100644 --- a/runtime/task_finder.c +++ b/runtime/task_finder.c @@ -157,7 +157,7 @@ __stp_get_mm_path(struct mm_struct *mm, char *buf, int buflen) rc = d_path(vma->vm_file->f_dentry, vma->vm_file->f_vfsmnt, buf, buflen); #else - rc = d_path(vma->vm_file, buf, buflen); + rc = d_path(&(vma->vm_file->f_path), buf, buflen); #endif } else { diff --git a/tapsets.cxx b/tapsets.cxx index c0a090e2..23e85a0e 100644 --- a/tapsets.cxx +++ b/tapsets.cxx @@ -6488,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; |