Reviewers: Sven Panne,
Description:
Revert "Revert interrupt handling code changed in r21208."
This reverts commit r21252.
[email protected]
Please review this at https://codereview.chromium.org/284483002/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+22, -16 lines):
M src/execution.h
M src/execution.cc
Index: src/execution.cc
diff --git a/src/execution.cc b/src/execution.cc
index
ee359e722f68f45490778a6800e7e377c98328f7..ee6cb970cb8bd6d852f3e34a681e82d9f3efb686
100644
--- a/src/execution.cc
+++ b/src/execution.cc
@@ -388,6 +388,18 @@ void StackGuard::ClearInterrupt(int flagbit) {
}
+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) {
ExecutionAccess access(isolate_);
OS::MemCopy(to, reinterpret_cast<char*>(&thread_local_),
sizeof(ThreadLocal));
@@ -720,44 +732,37 @@ void Execution::ProcessDebugMessages(Isolate* isolate,
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();
}
Index: src/execution.h
diff --git a/src/execution.h b/src/execution.h
index
8aaa7b42288993b3bc0279d3302c2bc0f8df5e0c..6d0b15f214762a65082492ad7fe7af826893dd15
100644
--- a/src/execution.h
+++ b/src/execution.h
@@ -210,6 +210,7 @@ enum InterruptFlag {
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.
