diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | tapsets.cxx | 11 |
2 files changed, 16 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2008-10-10 Frank Ch. Eigler <fche@elastic.org> + + PR6749 + * tapsets.cxx (dwarf_derived_probe_group::emit_module_init): Tolerate + failed register_*kprobe during initialization; warn instead. + 2008-10-10 Kent Sebastian <ksebasti@redhat.com> * cache.cxx (cache_clean): New group of functions implementing cache diff --git a/tapsets.cxx b/tapsets.cxx index 3a70936f..bed27967 100644 --- a/tapsets.cxx +++ b/tapsets.cxx @@ -5062,7 +5062,14 @@ dwarf_derived_probe_group::emit_module_init (systemtap_session& s) s.op->newline() << "rc = register_kprobe (& kp->u.kp);"; s.op->newline() << "#endif"; s.op->newline(-1) << "}"; - s.op->newline() << "if (rc) {"; + s.op->newline() << "if (rc) {"; // PR6749: tolerate a failed register_*probe. + s.op->newline(1) << "sdp->registered_p = 0;"; + s.op->newline() << "_stp_warn (\"probe %s registration error (rc %d)\", probe_point, rc);"; + s.op->newline() << "rc = 0;"; // continue with other probes + // XXX: shall we increment numskipped? + s.op->newline(-1) << "}"; + +#if 0 /* pre PR 6749; XXX consider making an option */ s.op->newline(1) << "for (j=i-1; j>=0; j--) {"; // partial rollback s.op->newline(1) << "struct stap_dwarf_probe *sdp2 = & stap_dwarf_probes[j];"; s.op->newline() << "struct stap_dwarf_kprobe *kp2 = & stap_dwarf_kprobes[j];"; @@ -5076,6 +5083,8 @@ dwarf_derived_probe_group::emit_module_init (systemtap_session& s) s.op->newline(-1) << "}"; s.op->newline() << "break;"; // don't attempt to register any more probes s.op->newline(-1) << "}"; +#endif + s.op->newline() << "else sdp->registered_p = 1;"; s.op->newline(-1) << "}"; // for loop } |