mirrors/phpv8
mirrors/phpv8
0
0
Fork 0
mirror of https://github.com/phpv8/v8js.git synced 2025-01-03 09:21:51 +00:00
Code Releases Activity

send LowMemoryNotification before imposing memory limit, fixes #217

Browse Source
This commit is contained in:
Stefan Siegl 2016-03-26 00:53:52 +01:00
parent 4faab8842c
commit b2eb89e49e
2 changed files with 38 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
v8js_timer.cc
View File

@ -40,27 +40,42 @@ static void v8js_timer_interrupt_handler(v8::Isolate *isolate, void *data) { /*
v8::Locker locker(isolate); v8::Locker locker(isolate);
v8::HeapStatistics hs; v8::HeapStatistics hs;
isolate->GetHeapStatistics(&hs); bool send_notification, has_sent_notification;
V8JSG(timer_mutex).lock(); do {
if (send_notification) {
for (std::deque< v8js_timer_ctx* >::iterator it = V8JSG(timer_stack).begin(); isolate->LowMemoryNotification();
it != V8JSG(timer_stack).end(); it ++) { has_sent_notification = true;
v8js_timer_ctx *timer_ctx = *it;
v8js_ctx *c = timer_ctx->ctx;
if(c->isolate != isolate || timer_ctx->killed) {
continue;
} }
if (timer_ctx->memory_limit > 0 && hs.used_heap_size() > timer_ctx->memory_limit) { isolate->GetHeapStatistics(&hs);
timer_ctx->killed = true;
v8::V8::TerminateExecution(c->isolate);
c->memory_limit_hit = true;
}
}
V8JSG(timer_mutex).unlock(); V8JSG(timer_mutex).lock();
for (std::deque< v8js_timer_ctx* >::iterator it = V8JSG(timer_stack).begin();
it != V8JSG(timer_stack).end(); it ++) {
v8js_timer_ctx *timer_ctx = *it;
v8js_ctx *c = timer_ctx->ctx;
if(c->isolate != isolate || timer_ctx->killed) {
continue;
}
if (timer_ctx->memory_limit > 0 && hs.used_heap_size() > timer_ctx->memory_limit) {
if (has_sent_notification) {
timer_ctx->killed = true;
v8::V8::TerminateExecution(c->isolate);
c->memory_limit_hit = true;
} else {
// force garbage collection, then check again
send_notification = true;
break;
}
}
}
V8JSG(timer_mutex).unlock();
} while(send_notification != has_sent_notification);
} }
/* }}} */ /* }}} */

7
v8js_v8.cc
View File

@ -210,7 +210,12 @@ void v8js_v8_call(v8js_ctx *c, zval **return_value,
isolate->GetHeapStatistics(&hs); isolate->GetHeapStatistics(&hs);
if (hs.used_heap_size() > memory_limit) { if (hs.used_heap_size() > memory_limit) {
c->memory_limit_hit = true; isolate->LowMemoryNotification();
isolate->GetHeapStatistics(&hs);
if (hs.used_heap_size() > memory_limit) {
c->memory_limit_hit = true;
}
} }
} }