Reviewers: Mads Ager,

Description:
Patch trunk to version 2.2.4.2, pulling in change 4464.


Please review this at http://codereview.chromium.org/1730003/show

SVN Base: http://v8.googlecode.com/svn/trunk/

Affected files:
  M     src/cpu-profiler.cc
  M     src/version.cc


Index: src/cpu-profiler.cc
===================================================================
--- src/cpu-profiler.cc (revision 4464)
+++ src/cpu-profiler.cc (working copy)
@@ -420,6 +420,10 @@
     generator_ = new ProfileGenerator(profiles_);
     processor_ = new ProfilerEventsProcessor(generator_);
     processor_->Start();
+    // Enable stack sampling.
+    // It is important to have it started prior to logging, see issue 683:
+    // http://code.google.com/p/v8/issues/detail?id=683
+    reinterpret_cast<Sampler*>(Logger::ticker_)->Start();
     // Enumerate stuff we already have in the heap.
     if (Heap::HasBeenSetup()) {
       Logger::LogCodeObjects();
@@ -427,8 +431,6 @@
       Logger::LogFunctionObjects();
       Logger::LogAccessorCallbacks();
     }
-    // Enable stack sampling.
-    reinterpret_cast<Sampler*>(Logger::ticker_)->Start();
   }
 }

Index: src/version.cc
===================================================================
--- src/version.cc      (revision 4464)
+++ src/version.cc      (working copy)
@@ -35,7 +35,7 @@
 #define MAJOR_VERSION     2
 #define MINOR_VERSION     2
 #define BUILD_NUMBER      4
-#define PATCH_LEVEL       1
+#define PATCH_LEVEL       2
 #define CANDIDATE_VERSION false

 // Define SONAME to have the SCons build the put a specific SONAME into the


--
v8-dev mailing list
v8-dev@googlegroups.com
http://groups.google.com/group/v8-dev

Reply via email to