added function

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@4766 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/src/cpu-profiler.cc b/src/cpu-profiler.cc
index 31c4658eebe48215d4c7d41ebfaa2d1287f8ecdc..ba2ec9cea7de26b96763630d1b2a0016da6c1df3 100644 (file)
--- a/src/cpu-profiler.cc
+++ b/src/cpu-profiler.cc
@@ -415,14 +415,13 @@ CpuProfiler::~CpuProfiler() {
 void CpuProfiler::StartCollectingProfile(const char* title) {
   if (profiles_->StartProfiling(title, next_profile_uid_++)) {
     StartProcessorIfNotStarted();
+    generator_->AddCurrentStack();
   }
 }
 
 
 void CpuProfiler::StartCollectingProfile(String* title) {
-  if (profiles_->StartProfiling(title, next_profile_uid_++)) {
-    StartProcessorIfNotStarted();
-  }
+  StartCollectingProfile(profiles_->GetName(title));
 }
 
 

diff --git a/src/profile-generator.cc b/src/profile-generator.cc
index 105c1a8435c3fbf4280b09ed2144318ee50f215e..6cb76ff082a398de6aa751092f58c691395099f7 100644 (file)
--- a/src/profile-generator.cc
+++ b/src/profile-generator.cc
@@ -28,6 +28,7 @@
 #ifdef ENABLE_LOGGING_AND_PROFILING
 
 #include "v8.h"
+#include "frames-inl.h"
 #include "global-handles.h"
 
 #include "profile-generator-inl.h"
@@ -807,6 +808,22 @@ void ProfileGenerator::RecordTickSample(const TickSample& sample) {
   profiles_->AddPathToCurrentProfiles(entries);
 }
 
+
+void ProfileGenerator::AddCurrentStack() {
+  TickSample sample;
+  sample.state = VMState::current_state();
+  sample.pc = reinterpret_cast<Address>(&sample);  // Not NULL.
+  sample.frames_count = 0;
+  for (StackTraceFrameIterator it;
+       !it.done() && sample.frames_count < TickSample::kMaxFramesCount;
+       it.Advance()) {
+    JavaScriptFrame* frame = it.frame();
+    sample.stack[sample.frames_count++] =
+        reinterpret_cast<Address>(frame->function());
+  }
+  RecordTickSample(sample);
+}
+
 } }  // namespace v8::internal
 
 #endif  // ENABLE_LOGGING_AND_PROFILING

diff --git a/src/profile-generator.h b/src/profile-generator.h
index 78307870247381d1c390d6587340ca3e47969ca6..71deedea08b5426bc81793f698d54ea2fc69664f 100644 (file)
--- a/src/profile-generator.h
+++ b/src/profile-generator.h
@@ -260,6 +260,7 @@ class CpuProfilesCollection {
   CpuProfile* GetProfile(int security_token_id, unsigned uid);
   inline bool is_last_profile();
 
+  const char* GetName(String* name);
   CodeEntry* NewCodeEntry(Logger::LogEventsAndTags tag,
                           String* name, String* resource_name, int line_number);
   CodeEntry* NewCodeEntry(Logger::LogEventsAndTags tag, const char* name);
@@ -274,7 +275,6 @@ class CpuProfilesCollection {
  private:
   INLINE(const char* GetFunctionName(String* name));
   INLINE(const char* GetFunctionName(const char* name));
-  const char* GetName(String* name);
   const char* GetName(int args_count);
   List<CpuProfile*>* GetProfilesList(int security_token_id);
   int TokenToIndex(int security_token_id);
@@ -381,6 +381,9 @@ class ProfileGenerator {
     return sample_rate_calc_.ticks_per_ms();
   }
 
+  // Samples stack and adds it to current profiles.
+  void AddCurrentStack();
+
   static const char* kAnonymousFunctionName;
   static const char* kProgramEntryName;
   static const char* kGarbageCollectorEntryName;