Ver código fonte

Allow to change & reset memory limits

Stefan Siegl 10 anos atrás
pai
commit
8945357d76
2 arquivos alterados com 55 adições e 0 exclusões
  1. 46 0
      tests/set_memory_limit_002.phpt
  2. 9 0
      v8js.cc

+ 46 - 0
tests/set_memory_limit_002.phpt

@@ -0,0 +1,46 @@
+--TEST--
+Test V8::setMemoryLimit() : Memory limit can be changed
+--SKIPIF--
+<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
+--FILE--
+<?php
+
+$JS = <<< EOT
+var jsfunc = function() {
+    PHP.incrMemoryLimit();
+    var text = "abcdefghijklmnopqrstuvwyxz0123456789";
+    var memory = "";
+    for (var i = 0; i < 100; ++i) {
+	for (var j = 0; j < 10000; ++j) {
+            memory += text;
+	}
+	sleep(0);
+    }
+};
+jsfunc;
+EOT;
+
+$v8 = new V8Js();
+$v8->setMemoryLimit(1000000);
+
+$v8->incrMemoryLimit = function() use ($v8) {
+    $v8->setMemoryLimit(10000000);
+};
+
+$func = $v8->executeString($JS);
+var_dump($func);
+
+try {
+    $func();
+} catch (V8JsMemoryLimitException $e) {
+    print get_class($e); print PHP_EOL;
+    print $e->getMessage(); print PHP_EOL;
+}
+?>
+===EOF===
+--EXPECTF--
+object(V8Function)#%d (0) {
+}
+V8JsMemoryLimitException
+Script memory limit of 10000000 bytes exceeded
+===EOF===

+ 9 - 0
v8js.cc

@@ -1575,6 +1575,15 @@ static PHP_METHOD(V8Js, setMemoryLimit)
 
 	c = (php_v8js_ctx *) zend_object_store_get_object(getThis() TSRMLS_CC);
 	c->memory_limit = memory_limit;
+
+	V8JSG(timer_mutex).lock();
+	for (std::deque< php_v8js_timer_ctx* >::iterator it = V8JSG(timer_stack).begin();
+		 it != V8JSG(timer_stack).end(); it ++) {
+		if((*it)->v8js_ctx == c && !(*it)->killed) {
+			(*it)->memory_limit = memory_limit;
+		}
+	}
+	V8JSG(timer_mutex).unlock();
 }
 /* }}} */