Revision: 21264
Author: [email protected]
Date: Mon May 12 11:52:44 2014 UTC
Log: Revert "Revert interrupt handling code changed in r21208."
This reverts commit r21252.
[email protected]
Review URL: https://codereview.chromium.org/284483002
http://code.google.com/p/v8/source/detail?r=21264
Modified:
/branches/bleeding_edge/src/execution.cc
/branches/bleeding_edge/src/execution.h
=======================================
--- /branches/bleeding_edge/src/execution.cc Mon May 12 07:43:47 2014 UTC
+++ /branches/bleeding_edge/src/execution.cc Mon May 12 11:52:44 2014 UTC
@@ -386,6 +386,18 @@
reset_limits(access);
}
}
+
+
+bool StackGuard::CheckAndClearInterrupt(InterruptFlag flag,
+ const ExecutionAccess& lock) {
+ int flagbit = 1 << flag;
+ bool result = (thread_local_.interrupt_flags_ & flagbit);
+ thread_local_.interrupt_flags_ &= ~flagbit;
+ if (!should_postpone_interrupts(lock) && !has_pending_interrupts(lock)) {
+ reset_limits(lock);
+ }
+ return result;
+}
char* StackGuard::ArchiveStackGuard(char* to) {
@@ -720,44 +732,37 @@
Object* StackGuard::HandleInterrupts() {
- { ExecutionAccess access(isolate_);
- if (should_postpone_interrupts(access)) {
- return isolate_->heap()->undefined_value();
- }
+ ExecutionAccess access(isolate_);
+ if (should_postpone_interrupts(access)) {
+ return isolate_->heap()->undefined_value();
}
- if (CheckApiInterrupt()) {
- ClearApiInterrupt();
+ if (CheckAndClearInterrupt(API_INTERRUPT, access)) {
isolate_->InvokeApiInterruptCallback();
}
- if (CheckGC()) {
+ if (CheckAndClearInterrupt(GC_REQUEST, access)) {
isolate_->heap()->CollectAllGarbage(Heap::kNoGCFlags, "GC interrupt");
- ClearGC();
}
if (CheckDebugBreak() || CheckDebugCommand()) {
Execution::DebugBreakHelper(isolate_);
}
- if (CheckTerminateExecution()) {
- ClearTerminateExecution();
+ if (CheckAndClearInterrupt(TERMINATE_EXECUTION, access)) {
return isolate_->TerminateExecution();
}
- if (CheckFullDeopt()) {
- ClearFullDeopt();
+ if (CheckAndClearInterrupt(FULL_DEOPT, access)) {
Deoptimizer::DeoptimizeAll(isolate_);
}
- if (CheckDeoptMarkedAllocationSites()) {
- ClearDeoptMarkedAllocationSites();
+ if (CheckAndClearInterrupt(DEOPT_MARKED_ALLOCATION_SITES, access)) {
isolate_->heap()->DeoptMarkedAllocationSites();
}
- if (CheckInstallCode()) {
+ if (CheckAndClearInterrupt(INSTALL_CODE, access)) {
ASSERT(isolate_->concurrent_recompilation_enabled());
- ClearInstallCode();
isolate_->optimizing_compiler_thread()->InstallOptimizedFunctions();
}
=======================================
--- /branches/bleeding_edge/src/execution.h Mon May 12 07:43:47 2014 UTC
+++ /branches/bleeding_edge/src/execution.h Mon May 12 11:52:44 2014 UTC
@@ -210,6 +210,7 @@
bool CheckInterrupt(int flagbit);
void RequestInterrupt(int flagbit);
void ClearInterrupt(int flagbit);
+ bool CheckAndClearInterrupt(InterruptFlag flag, const ExecutionAccess&
lock);
void InvokeApiInterruptCallback();
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
