LGTM On Fri, Apr 8, 2011 at 1:11 AM, <[email protected]> wrote: > Reviewers: antonm, > > Description: > Merge r7549 "Fix auto suspension of the sampler thread" to trunk. > > BUG=http://crbug.com/78267 > > Please review this at http://codereview.chromium.org/6810029/ > > SVN Base: http://v8.googlecode.com/svn/trunk/ > > Affected files: > M src/isolate.h > M src/version.cc > > > Index: src/isolate.h > =================================================================== > --- src/isolate.h (revision 7548) > +++ src/isolate.h (working copy) > @@ -897,13 +897,19 @@ > > void SetCurrentVMState(StateTag state) { > if (RuntimeProfiler::IsEnabled()) { > - if (state == JS) { > - // JS or non-JS -> JS transition. > + StateTag current_state = thread_local_top_.current_vm_state_; > + if (current_state != JS && state == JS) { > + // Non-JS -> JS transition. > RuntimeProfiler::IsolateEnteredJS(this); > - } else if (thread_local_top_.current_vm_state_ == JS) { > + } else if (current_state == JS && state != JS) { > // JS -> non-JS transition. > ASSERT(RuntimeProfiler::IsSomeIsolateInJS()); > RuntimeProfiler::IsolateExitedJS(this); > + } else { > + // Other types of state transitions are not interesting to the > + // runtime profiler, because they don't affect whether we're > + // in JS or not. > + ASSERT((current_state == JS) == (state == JS)); > } > } > thread_local_top_.current_vm_state_ = state; > Index: src/version.cc > =================================================================== > --- src/version.cc (revision 7548) > +++ src/version.cc (working copy) > @@ -35,7 +35,7 @@ > #define MAJOR_VERSION 3 > #define MINOR_VERSION 2 > #define BUILD_NUMBER 8 > -#define PATCH_LEVEL 2 > +#define PATCH_LEVEL 3 > // 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
