Replacing circular queue by single buffer in CPU Profiler.

test/cctest/test-cpu-profiler.cc

 // Copyright 2010 the V8 project authors. All rights reserved.
 //
 // Tests of profiles generator and utilities.
 
 #include "v8.h"
 #include "cpu-profiler-inl.h"
 #include "cctest.h"
+#include "platform.h"
 #include "../include/v8-profiler.h"
 
 using i::CodeEntry;
 using i::CpuProfile;
 using i::CpuProfiler;
 using i::CpuProfilesCollection;
 using i::ProfileGenerator;
 using i::ProfileNode;
 using i::ProfilerEventsProcessor;
 using i::TokenEnumerator;
@@ skipping 13 matching lines @@
 static void InitializeVM() {
   if (env.IsEmpty()) env = v8::Context::New();
   v8::HandleScope scope;
   env->Enter();
 }
 
 static inline i::Address ToAddress(int n) {
   return reinterpret_cast<i::Address>(n);
 }
 
-static void EnqueueTickSampleEvent(ProfilerEventsProcessor* proc,
+static void AddTickSampleEvent(ProfilerEventsProcessor* processor,
                                    i::Address frame1,

[Jakob Kummerow, 2012/09/04 17:44:46]

indentation

                                    i::Address frame2 = NULL,
                                    i::Address frame3 = NULL) {
-  i::TickSample* sample = proc->TickSampleEvent();
+  i::TickSample* sample;
+  while ((sample = processor->StartTickSampleEvent()) == NULL) i::OS::Sleep(1);
   sample->pc = frame1;
   sample->tos = frame1;
   sample->frames_count = 0;
   if (frame2 != NULL) {
     sample->stack[0] = frame2;
     sample->frames_count = 1;
   }
   if (frame3 != NULL) {
     sample->stack[1] = frame3;
     sample->frames_count = 2;
   }
+  processor->FinishTickSampleEvent();
 }
 
 namespace {
 
 class TestSetup {
  public:
   TestSetup()
       : old_flag_prof_browser_mode_(i::FLAG_prof_browser_mode) {
     i::FLAG_prof_browser_mode = false;
   }
@@ skipping 34 matching lines @@
                             ToAddress(0x1200),
                             0x80);
   processor.CodeCreateEvent(i::Logger::STUB_TAG, 5, ToAddress(0x1300), 0x10);
   processor.CodeCreateEvent(i::Logger::BUILTIN_TAG,
                             "ddd",
                             ToAddress(0x1400),
                             0x80);
   processor.CodeMoveEvent(ToAddress(0x1400), ToAddress(0x1500));
   processor.CodeCreateEvent(i::Logger::STUB_TAG, 3, ToAddress(0x1600), 0x10);
   processor.CodeCreateEvent(i::Logger::STUB_TAG, 4, ToAddress(0x1605), 0x10);
-  // Enqueue a tick event to enable code events processing.
-  EnqueueTickSampleEvent(&processor, ToAddress(0x1000));
+  // Add a tick event to enable code events processing.
+  AddTickSampleEvent(&processor, ToAddress(0x1000));
 
   processor.Stop();
   processor.Join();
 
   // Check the state of profile generator.
   CodeEntry* entry1 = generator.code_map()->FindEntry(ToAddress(0x1000));
   CHECK_NE(NULL, entry1);
   CHECK_EQ(aaa_str, entry1->name());
   CodeEntry* entry2 = generator.code_map()->FindEntry(ToAddress(0x1200));
   CHECK_NE(NULL, entry2);
@@ skipping 24 matching lines @@
 
   processor.CodeCreateEvent(i::Logger::BUILTIN_TAG,
                             "bbb",
                             ToAddress(0x1200),
                             0x80);
   processor.CodeCreateEvent(i::Logger::STUB_TAG, 5, ToAddress(0x1300), 0x10);
   processor.CodeCreateEvent(i::Logger::BUILTIN_TAG,
                             "ddd",
                             ToAddress(0x1400),
                             0x80);
-  EnqueueTickSampleEvent(&processor, ToAddress(0x1210));
-  EnqueueTickSampleEvent(&processor, ToAddress(0x1305), ToAddress(0x1220));
-  EnqueueTickSampleEvent(&processor,
+  AddTickSampleEvent(&processor, ToAddress(0x1210));
+  AddTickSampleEvent(&processor, ToAddress(0x1305), ToAddress(0x1220));
+  AddTickSampleEvent(&processor,
                          ToAddress(0x1404),

[Jakob Kummerow, 2012/09/04 17:44:46]

indentation

                          ToAddress(0x1305),
                          ToAddress(0x1230));
 
   processor.Stop();
   processor.Join();
   CpuProfile* profile =
       profiles.StopProfiling(TokenEnumerator::kNoSecurityToken, "", 1);
   CHECK_NE(NULL, profile);
 
   // Check call trees.
@@ skipping 62 matching lines @@
   profiles.StartProfiling("", 1);
   ProfileGenerator generator(&profiles);
   ProfilerEventsProcessor processor(&generator, NULL, 1000);
   processor.Start();
 
   processor.CodeCreateEvent(i::Logger::BUILTIN_TAG,
                             "bbb",
                             ToAddress(0x1200),
                             0x80);
 
-  i::TickSample* sample = processor.TickSampleEvent();
+  i::TickSample* sample = processor.StartTickSampleEvent();
   sample->pc = ToAddress(0x1200);
   sample->tos = 0;
   sample->frames_count = i::TickSample::kMaxFramesCount;
   for (int i = 0; i < sample->frames_count; ++i) {
     sample->stack[i] = ToAddress(0x1200);
   }
+  processor.FinishTickSampleEvent();
 
   processor.Stop();
   processor.Join();
   CpuProfile* profile =
       profiles.StopProfiling(TokenEnumerator::kNoSecurityToken, "", 1);
   CHECK_NE(NULL, profile);
 
   int actual_depth = 0;
   const ProfileNode* node = profile->top_down()->root();
   while (node->children()->length() > 0) {
@@ skipping 130 matching lines @@
   CHECK_EQ(NULL, v8::CpuProfiler::FindProfile(uid2));
   CHECK_EQ(p3, v8::CpuProfiler::FindProfile(uid3));
   const_cast<v8::CpuProfile*>(p2)->Delete();
   CHECK_EQ(1, v8::CpuProfiler::GetProfilesCount());
   CHECK_EQ(NULL, v8::CpuProfiler::FindProfile(uid2));
   CHECK_EQ(p3, v8::CpuProfiler::FindProfile(uid3));
   const_cast<v8::CpuProfile*>(p3)->Delete();
   CHECK_EQ(0, CpuProfiler::GetProfilesCount());
   CHECK_EQ(NULL, v8::CpuProfiler::FindProfile(uid3));
 }