Fix a bug that caused the runtime profiler to sample huge amounts of stack frames in programs with recursively called optimized functions.

Review URL: http://codereview.chromium.org/5786001

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@5961 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
karlklose@chromium.org 2010-12-10 12:00:26 +00:00
parent c0df3f0a23
commit f2ec8be178

View File

@ -272,9 +272,10 @@ void RuntimeProfiler::OptimizeNow() {
// have a sample of the function, we mark it for optimizations
// (eagerly or lazily).
JSFunction* samples[kSamplerFrameCount];
int count = 0;
int sample_count = 0;
int frame_count = 0;
for (JavaScriptFrameIterator it;
count < kSamplerFrameCount && !it.done();
frame_count++ < kSamplerFrameCount && !it.done();
it.Advance()) {
JavaScriptFrame* frame = it.frame();
JSFunction* function = JSFunction::cast(frame->function());
@ -304,7 +305,7 @@ void RuntimeProfiler::OptimizeNow() {
// Do not record non-optimizable functions.
if (!IsOptimizable(function)) continue;
samples[count++] = function;
samples[sample_count++] = function;
int function_size = function->shared()->SourceSize();
int threshold_size_factor = (function_size > kSizeLimit)
@ -335,7 +336,7 @@ void RuntimeProfiler::OptimizeNow() {
// Add the collected functions as samples. It's important not to do
// this as part of collecting them because this will interfere with
// the sample lookup in case of recursive functions.
for (int i = 0; i < count; i++) {
for (int i = 0; i < sample_count; i++) {
AddSample(samples[i], kSamplerFrameWeight[i]);
}
}