Reviewers: Søren Gjesse, Description: Merge r7612 from bleeding_edge into 3.2 branch.
Please review this at http://codereview.chromium.org/6851014/ SVN Base: http://v8.googlecode.com/svn/branches/3.2/ Affected files: M src/platform-freebsd.cc M src/platform-linux.cc M src/version.cc Index: src/platform-freebsd.cc =================================================================== --- src/platform-freebsd.cc (revision 7612) +++ src/platform-freebsd.cc (working copy) @@ -642,6 +642,11 @@ // We require a fully initialized and entered isolate. return; } + if (v8::Locker::IsActive() && + !isolate->thread_manager()->IsLockedByCurrentThread()) { + return; + } + Sampler* sampler = isolate->logger()->sampler(); if (sampler == NULL || !sampler->IsActive()) return; Index: src/platform-linux.cc =================================================================== --- src/platform-linux.cc (revision 7612) +++ src/platform-linux.cc (working copy) @@ -853,6 +853,11 @@ // We require a fully initialized and entered isolate. return; } + if (v8::Locker::IsActive() && + !isolate->thread_manager()->IsLockedByCurrentThread()) { + return; + } + Sampler* sampler = isolate->logger()->sampler(); if (sampler == NULL || !sampler->IsActive()) return; Index: src/version.cc =================================================================== --- src/version.cc (revision 7612) +++ src/version.cc (working copy) @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 2 #define BUILD_NUMBER 10 -#define PATCH_LEVEL 0 +#define PATCH_LEVEL 1 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0 -- v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev
