mini_racer 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '08140e359a83fd1d2314fa1e0a23749753eae7de'
-  data.tar.gz: efaa86883c82dd935dddf541c55f22ae842ff27f
+  metadata.gz: 02fb924ef1736f4c3626fba401b25725bc70e99d
+  data.tar.gz: 15b87d9a11b8104204fc5def731360ae101c6eb7
 SHA512:
-  metadata.gz: cd13cd385c184e74ac5a5777d7ab5403c072a228521270f0312d64b72a7b362f23bc9c0daad2491df198079bc137aaa9c59cc363c5c3e87e9676e9ec096a7239
-  data.tar.gz: 5ca1c21d15528ed6a35da21e1997bfde523ce8920a13ad4d9ba52a84fd9bd9b58284a5685f6aef8a9a562771022b6a2369f37e9b3f478adda25de91f478df799
+  metadata.gz: 4d2c4dc1eade12fa0c6ba01b38d91366fa0edcab211fc2483014191cd00c685d16eb469f4f9dd5e93ac8263803f7570b40e19e525671be5d5f6fbd154ac8cdca
+  data.tar.gz: 10c2065a5eaa3a967a6109d7e67339e914125c047c9302ab4fedeeac9b058e827503f96936465cfe0465afe5757546ff14ba3ecc21714b6a2616af17b2b93623

data/CHANGELOG

@@ -1,3 +1,9 @@
+23-08-2017
+
+- 0.1.13
+
+  - Fix: amend array buffer allocator to use v8 6.0 compatible allocator @ignisf
+
 18-07-2017
 
 - 0.1.12

data/README.md

@@ -68,6 +68,17 @@ context.eval 'while(true){}'
 # => exception is raised
 ```
 
+### Memory softlimit support
+
+Contexts can specify a memory softlimit for scripts
+
+```ruby
+# terminates script if heap usage exceeds 200mb after V8 garbage collection has run
+context = MiniRacer::Context.new(max_memory: 200000000)
+context.eval 'var a = new Array(10000); while(true) {a = a.concat(new Array(10000)); print("loop " + a.length);}'
+# => V8OutOfMemoryError is raised
+```
+
 ### Rich debugging with "filename" support
 
 ```ruby

data/ext/mini_racer_extension/mini_racer_extension.cc

@@ -11,20 +11,6 @@
 
 using namespace v8;
 
-class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
- public:
-  virtual void* Allocate(size_t length) {
-    void* data = AllocateUninitialized(length);
-    return data == NULL ? data : memset(data, 0, length);
-  }
-  virtual void* AllocateUninitialized(size_t length) {
-    return malloc(length);
-  }
-  virtual void Free(void* data, size_t) {
-     free(data);
-  }
-};
-
 typedef struct {
     const char* data;
     int raw_size;
@@ -32,7 +18,7 @@ typedef struct {
 
 typedef struct {
     Isolate* isolate;
-    ArrayBufferAllocator* allocator;
+    ArrayBuffer::Allocator* allocator;
     StartupData* startup_data;
     bool interrupted;
     bool disposed;
@@ -67,9 +53,11 @@ typedef struct {
     Local<String>* filename;
     useconds_t timeout;
     EvalResult* result;
+    long max_memory;
 } EvalParams;
 
 static VALUE rb_eScriptTerminatedError;
+static VALUE rb_eV8OutOfMemoryError;
 static VALUE rb_eParseError;
 static VALUE rb_eScriptRuntimeError;
 static VALUE rb_cJavaScriptFunction;
@@ -120,6 +108,21 @@ static void init_v8() {
     platform_lock.unlock();
 }
 
+static void gc_callback(Isolate *isolate, GCType type, GCCallbackFlags flags) {
+    if((bool)isolate->GetData(3)) return;
+
+    long softlimit = *(long*) isolate->GetData(2);
+
+    HeapStatistics* stats = new HeapStatistics();
+    isolate->GetHeapStatistics(stats);
+    long used = stats->used_heap_size();
+
+    if(used > softlimit) {
+        isolate->SetData(3, (void*)true);
+        V8::TerminateExecution(isolate);
+    }
+}
+
 void*
 nogvl_context_eval(void* arg) {
 
@@ -138,6 +141,10 @@ nogvl_context_eval(void* arg) {
     isolate->SetData(0, (void*)false);
     // terminate ASAP
     isolate->SetData(1, (void*)false);
+    // Memory softlimit
+    isolate->SetData(2, (void*)false);
+    // Memory softlimit hit flag
+    isolate->SetData(3, (void*)false);
 
     MaybeLocal<Script> parsed_script;
 
@@ -162,6 +169,11 @@ nogvl_context_eval(void* arg) {
 	result->message->Reset(isolate, trycatch.Exception());
     } else {
 
+    if(eval_params->max_memory > 0) {
+        isolate->SetData(2, &eval_params->max_memory);
+        isolate->AddGCEpilogueCallback(gc_callback);
+    }
+
 	MaybeLocal<Value> maybe_value = parsed_script.ToLocalChecked()->Run(context);
 
 	result->executed = !maybe_value.IsEmpty();
@@ -453,7 +465,7 @@ static VALUE rb_isolate_init_with_snapshot(VALUE self, VALUE snapshot) {
 
     init_v8();
 
-    isolate_info->allocator = new ArrayBufferAllocator();
+    isolate_info->allocator = v8::ArrayBuffer::Allocator::NewDefaultAllocator();
     isolate_info->interrupted = false;
     isolate_info->refs_count = 1;
 
@@ -555,11 +567,17 @@ static VALUE rb_context_eval_unsafe(VALUE self, VALUE str, VALUE filename) {
 	eval_params.eval = &eval;
 	eval_params.result = &eval_result;
 	eval_params.timeout = 0;
+	eval_params.max_memory = 0;
 	VALUE timeout = rb_iv_get(self, "@timeout");
 	if (timeout != Qnil) {
 	    eval_params.timeout = (useconds_t)NUM2LONG(timeout);
 	}
 
+	VALUE mem_softlimit = rb_iv_get(self, "@max_memory");
+	if (mem_softlimit != Qnil) {
+    	eval_params.max_memory = (long)NUM2LONG(mem_softlimit);
+	}
+
 	eval_result.message = NULL;
 	eval_result.backtrace = NULL;
 
@@ -593,7 +611,14 @@ static VALUE rb_context_eval_unsafe(VALUE self, VALUE str, VALUE filename) {
     if (!eval_result.executed) {
 	VALUE ruby_exception = rb_iv_get(self, "@current_exception");
 	if (ruby_exception == Qnil) {
-	    ruby_exception = eval_result.terminated ? rb_eScriptTerminatedError : rb_eScriptRuntimeError;
+		bool mem_softlimit_reached = (bool)isolate->GetData(3);
+		// If we were terminated or have the memory softlimit flag set
+		if(eval_result.terminated || mem_softlimit_reached) {
+	    	ruby_exception = mem_softlimit_reached ? rb_eV8OutOfMemoryError : rb_eScriptTerminatedError;
+		} else {
+	    	ruby_exception = rb_eScriptRuntimeError;
+		}
+
 	    // exception report about what happened
 	    if(TYPE(backtrace) == T_STRING) {
 		rb_raise(ruby_exception, "%s", RSTRING_PTR(backtrace));
@@ -701,7 +726,7 @@ gvl_ruby_callback(void* data) {
     callback_data.failed = false;
 
     if ((bool)args->GetIsolate()->GetData(1) == true) {
-	args->GetIsolate()->ThrowException(String::NewFromUtf8(args->GetIsolate(), "Terminated execution during tansition from Ruby to JS"));
+	args->GetIsolate()->ThrowException(String::NewFromUtf8(args->GetIsolate(), "Terminated execution during transition from Ruby to JS"));
 	V8::TerminateExecution(args->GetIsolate());
 	return NULL;
     }
@@ -1035,6 +1060,7 @@ extern "C" {
 
 	VALUE rb_eEvalError = rb_define_class_under(rb_mMiniRacer, "EvalError", rb_eError);
 	rb_eScriptTerminatedError = rb_define_class_under(rb_mMiniRacer, "ScriptTerminatedError", rb_eEvalError);
+	rb_eV8OutOfMemoryError = rb_define_class_under(rb_mMiniRacer, "V8OutOfMemoryError", rb_eEvalError);
 	rb_eParseError = rb_define_class_under(rb_mMiniRacer, "ParseError", rb_eEvalError);
 	rb_eScriptRuntimeError = rb_define_class_under(rb_mMiniRacer, "RuntimeError", rb_eEvalError);
 

data/lib/mini_racer.rb

@@ -14,6 +14,7 @@ module MiniRacer
   class EvalError < Error; end
   class ParseError < EvalError; end
   class ScriptTerminatedError < EvalError; end
+  class V8OutOfMemoryError < EvalError; end
 
   class FailedV8Conversion
     attr_reader :info
@@ -144,8 +145,10 @@ module MiniRacer
 
       @functions = {}
       @timeout = nil
+      @max_memory = nil
       @current_exception = nil
       @timeout = options[:timeout]
+      @max_memory = options[:max_memory]
       @isolate = options[:isolate] || Isolate.new(options[:snapshot])
       @disposed = false
 

data/lib/mini_racer/version.rb

@@ -1,3 +1,3 @@
 module MiniRacer
-  VERSION = "0.1.12"
+  VERSION = "0.1.13"
 end

data/mini_racer.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "rake-compiler"
 
-  spec.add_dependency 'libv8', '~> 5.9'
+  spec.add_dependency 'libv8', ' = 6.0.286.44.0beta1'
   spec.require_paths = ["lib", "ext"]
 
   spec.extensions = ["ext/mini_racer_extension/extconf.rb"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_racer
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-26 00:00:00.000000000 Z
+date: 2017-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,16 +70,16 @@ dependencies:
   name: libv8
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: 6.0.286.44.0beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: 6.0.286.44.0beta1
 description: Minimal embedded v8 engine for Ruby
 email:
 - sam.saffron@gmail.com