AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Revert r16548 due to cpu profiler test falkiness

Browse Source 
The change made cctest/test-cpu-profiler/CollectCpuProfile and cctest/test-cpu-profiler/JsNative1JsNative2JsSample flaky.

BUG=v8:2871
TBR=bmeurer@chromium.org

Review URL: https://codereview.chromium.org/23615011

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@16553 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
yurys@chromium.org 2013-09-05 12:17:17 +00:00
parent d208d048ac
commit 3ea3308e04
2 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/cpu-profiler.cc
View File

@ -104,45 +104,49 @@ bool ProfilerEventsProcessor::ProcessCodeEvent() {
}
bool ProfilerEventsProcessor::ProcessOneSample() {
if (!ticks_from_vm_buffer_.IsEmpty()
&& ticks_from_vm_buffer_.Peek()->order ==
last_processed_code_event_id_) {
TickSampleEventRecord record;
ticks_from_vm_buffer_.Dequeue(&record);
generator_->RecordTickSample(record.sample);
return false;
}
bool ProfilerEventsProcessor::ProcessTicks() {
while (true) {
while (!ticks_from_vm_buffer_.IsEmpty()
&& ticks_from_vm_buffer_.Peek()->order ==
last_processed_code_event_id_) {
TickSampleEventRecord record;
ticks_from_vm_buffer_.Dequeue(&record);
generator_->RecordTickSample(record.sample);
}
const TickSampleEventRecord* record = ticks_buffer_.Peek();
if (record == NULL) return true;
if (record->order != last_processed_code_event_id_) return true;
generator_->RecordTickSample(record->sample);
ticks_buffer_.Remove();
return false;
const TickSampleEventRecord* record = ticks_buffer_.Peek();
if (record == NULL) return !ticks_from_vm_buffer_.IsEmpty();
if (record->order != last_processed_code_event_id_) return true;
generator_->RecordTickSample(record->sample);
ticks_buffer_.Remove();
}
}
void ProfilerEventsProcessor::ProcessEventsAndDoSample() {
ElapsedTimer timer;
timer.Start();
// Keep processing existing events until we need to do next sample.
while (!timer.HasExpired(period_)) {
if (ProcessTicks()) {
// All ticks of the current dequeue_order are processed,
// proceed to the next code event.
ProcessCodeEvent();
}
}
// Schedule next sample. sampler_ is NULL in tests.
if (sampler_) sampler_->DoSample();
}
void ProfilerEventsProcessor::Run() {
while (running_) {
ElapsedTimer timer;
timer.Start();
// Keep processing existing events until we need to do next sample.
do {
if (ProcessOneSample()) {
// All ticks of the current last_processed_code_event_id_ are
// processed, proceed to the next code event.
ProcessCodeEvent();
}
} while (!timer.HasExpired(period_));
// Schedule next sample. sampler_ is NULL in tests.
if (sampler_) sampler_->DoSample();
ProcessEventsAndDoSample();
}
// Process remaining tick events.
do {
while (!ProcessOneSample()) {}
ProcessTicks();
} while (ProcessCodeEvent());
}

4
src/cpu-profiler.h
View File

@ -161,7 +161,9 @@ class ProfilerEventsProcessor : public Thread {
private:
// Called from events processing thread (Run() method.)
bool ProcessCodeEvent();
bool ProcessOneSample();
bool ProcessTicks();
void ProcessEventsAndDoSample();
ProfileGenerator* generator_;
Sampler* sampler_;