diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | translate.cxx | 63 |
2 files changed, 46 insertions, 24 deletions
@@ -1,3 +1,10 @@ +2007-02-17 Frank Ch. Eigler <fche@elastic.org> + + PR 4066. + * translate.cxx (var::init): Check stat scalar initialization, + just like is done for arrays. + (emit_module_exit): Check unlikely but possible null timing stat. + 2007-02-15 David Smith <dsmith@redhat.com> PR 3625. diff --git a/translate.cxx b/translate.cxx index 30fb21b8..83ee8815 100644 --- a/translate.cxx +++ b/translate.cxx @@ -348,29 +348,39 @@ public: else return qname() + " = 0;"; case pe_stats: - switch (sd.type) - { - case statistic_decl::none: - return (qname() - + " = _stp_stat_init (HIST_NONE);"); - break; - - case statistic_decl::linear: - return (qname() - + " = _stp_stat_init (HIST_LINEAR" - + ", " + stringify(sd.linear_low) - + ", " + stringify(sd.linear_high) - + ", " + stringify(sd.linear_step) - + ");"); - break; - - case statistic_decl::logarithmic: - return (qname() - + " = _stp_stat_init (HIST_LOG" - + ", " + stringify(sd.logarithmic_buckets) - + ");"); - break; - } + { + // See also mapvar::init(). + + string prefix = qname() + " = _stp_stat_init ("; + // Check for errors during allocation. + string suffix = "if (" + qname () + " == NULL) rc = -ENOMEM;"; + + switch (sd.type) + { + case statistic_decl::none: + prefix += "HIST_NONE"; + break; + + case statistic_decl::linear: + prefix += string("HIST_LINEAR") + + ", " + stringify(sd.linear_low) + + ", " + stringify(sd.linear_high) + + ", " + stringify(sd.linear_step); + break; + + case statistic_decl::logarithmic: + prefix += string("HIST_LOG") + + ", " + stringify(sd.logarithmic_buckets); + break; + + default: + throw semantic_error("unsupported stats type for " + qname()); + } + + prefix = prefix + "); "; + return string (prefix + suffix); + } + default: throw semantic_error("unsupported initializer for " + qname()); } @@ -601,6 +611,8 @@ struct mapvar string prefix = qname() + " = _stp_" + mtype + "_new_" + keysym() + " (" + (maxsize > 0 ? stringify(maxsize) : "MAXMAPENTRIES") ; + // See also var::init(). + // Check for errors during allocation. string suffix = "if (" + qname () + " == NULL) rc = -ENOMEM;"; @@ -1078,6 +1090,8 @@ c_unparser::emit_module_init () if (basest_names.find(nm) == basest_names.end()) { o->newline() << "time_" << nm << " = _stp_stat_init (HIST_NONE);"; + // NB: we don't check for null return here, but instead at + // passage to probe handlers and at final printing. basest_names.insert (nm); } } @@ -1209,7 +1223,8 @@ c_unparser::emit_module_exit () if (basest_names.find(nm) == basest_names.end()) { basest_names.insert (nm); - o->newline() << "{"; + // NB: check for null stat object + o->newline() << "if (likely (time_" << p->name << ")) {"; o->newline(1) << "const char *probe_point = " << lex_cast_qstring (* p->locations[0]) << (p->locations.size() > 1 ? "\"+\"" : "") |