diff options
| author | Mark Wielaard <mjw@redhat.com> | 2009-03-22 20:36:13 +0100 |
|---|---|---|
| committer | Mark Wielaard <mjw@redhat.com> | 2009-03-22 20:36:13 +0100 |
| commit | c7ce415ebf181e818166644e572dfe04dbd7b6f6 (patch) | |
| tree | c182d43d83acf39ac78b3e614c9d272812ceb386 /translate.cxx | |
| parent | c9a05b1c5a3219dcc6b9f4060b98e76a67f5795b (diff) | |
| parent | 1fa23e70a939c20664d7ae6ee5ef66b51835e0ee (diff) | |
| download | systemtap-steved-c7ce415ebf181e818166644e572dfe04dbd7b6f6.tar.gz systemtap-steved-c7ce415ebf181e818166644e572dfe04dbd7b6f6.tar.xz systemtap-steved-c7ce415ebf181e818166644e572dfe04dbd7b6f6.zip | |
Merge branch 'master' into pr6866
Diffstat (limited to 'translate.cxx')
| -rw-r--r-- | translate.cxx | 7 |
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), " |