Revision: 7614 Author: [email protected] Date: Thu Apr 14 02:23:06 2011 Log: Merge r7612 from bleeding_edge into 3.2 branch.
Review URL: http://codereview.chromium.org/6851014 http://code.google.com/p/v8/source/detail?r=7614 Modified: /branches/3.2/src/platform-freebsd.cc /branches/3.2/src/platform-linux.cc /branches/3.2/src/version.cc ======================================= --- /branches/3.2/src/platform-freebsd.cc Wed Apr 13 01:46:07 2011 +++ /branches/3.2/src/platform-freebsd.cc Thu Apr 14 02:23:06 2011 @@ -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; ======================================= --- /branches/3.2/src/platform-linux.cc Wed Apr 13 01:46:07 2011 +++ /branches/3.2/src/platform-linux.cc Thu Apr 14 02:23:06 2011 @@ -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; ======================================= --- /branches/3.2/src/version.cc Wed Apr 13 01:46:07 2011 +++ /branches/3.2/src/version.cc Thu Apr 14 02:23:06 2011 @@ -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
