Reviewers: Søren Gjesse, Description: Merge r5721 into 2.4 branch. Suppress reporting of nested DOM calls in CPU profiler.
Please review this at http://codereview.chromium.org/4172006/show SVN Base: http://v8.googlecode.com/svn/branches/2.4/ Affected files: M src/log.cc M src/version.cc Index: src/log.cc =================================================================== --- src/log.cc (revision 5724) +++ src/log.cc (working copy) @@ -164,7 +164,10 @@ int i = 0; const Address callback = VMState::external_callback(); - if (callback != NULL) { + // Surprisingly, PC can point _exactly_ to callback start, with good + // probability, and this will result in reporting fake nested + // callback call. + if (callback != NULL && callback != sample->pc) { sample->stack[i++] = callback; } Index: src/version.cc =================================================================== --- src/version.cc (revision 5724) +++ src/version.cc (working copy) @@ -35,7 +35,7 @@ #define MAJOR_VERSION 2 #define MINOR_VERSION 4 #define BUILD_NUMBER 9 -#define PATCH_LEVEL 9 +#define PATCH_LEVEL 10 #define CANDIDATE_VERSION false // Define SONAME to have the SCons build the put a specific SONAME into the -- v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev
