summaryrefslogtreecommitdiffstats
path: root/translate.cxx
diff options
context:
space:
mode:
authorDave Brolley <brolley@redhat.com>2009-03-23 12:16:56 -0400
committerDave Brolley <brolley@redhat.com>2009-03-23 12:16:56 -0400
commitd171a9ff5fda69cab247d2afd06ec5952941969e (patch)
tree3127f0a0babb18e62bbe17754462d1366de7a0ad /translate.cxx
parentc11e62bef0f85147c96aeb7d0a7f9fd69da51db6 (diff)
parentd4db5608dbc31868a2041f20ea3f473eef3e61fd (diff)
downloadsystemtap-steved-d171a9ff5fda69cab247d2afd06ec5952941969e.tar.gz
systemtap-steved-d171a9ff5fda69cab247d2afd06ec5952941969e.tar.xz
systemtap-steved-d171a9ff5fda69cab247d2afd06ec5952941969e.zip
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Diffstat (limited to 'translate.cxx')
-rw-r--r--translate.cxx7
1 files changed, 3 insertions, 4 deletions
diff --git a/translate.cxx b/translate.cxx
index 377a11fb..40bb82c2 100644
--- a/translate.cxx
+++ b/translate.cxx
@@ -867,12 +867,10 @@ c_unparser::emit_common_header ()
o->newline() << "static atomic_t session_state = ATOMIC_INIT (STAP_SESSION_STARTING);";
o->newline() << "static atomic_t error_count = ATOMIC_INIT (0);";
o->newline() << "static atomic_t skipped_count = ATOMIC_INIT (0);";
- o->newline() << "#ifdef STP_TIMING";
o->newline() << "static atomic_t skipped_count_lowstack = ATOMIC_INIT (0);";
o->newline() << "static atomic_t skipped_count_reentrant = ATOMIC_INIT (0);";
o->newline() << "static atomic_t skipped_count_uprobe_reg = ATOMIC_INIT (0);";
o->newline() << "static atomic_t skipped_count_uprobe_unreg = ATOMIC_INIT (0);";
- o->newline() << "#endif";
o->newline();
o->newline() << "struct context {";
o->newline(1) << "atomic_t busy;";
@@ -1360,9 +1358,10 @@ c_unparser::emit_module_exit ()
o->newline() << "#endif";
}
- // print final error/reentrancy counts if non-zero
+ // print final error/skipped counts if non-zero
o->newline() << "if (atomic_read (& skipped_count) || "
- << "atomic_read (& error_count)) {";
+ << "atomic_read (& error_count) || "
+ << "atomic_read (& skipped_count_reentrant)) {"; // PR9967
o->newline(1) << "_stp_warn (\"Number of errors: %d, "
<< "skipped probes: %d\\n\", "
<< "(int) atomic_read (& error_count), "