mini_racer 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53d1807f65d860a1321d3a7f67a619ac19eb85b2
-  data.tar.gz: b2cd4481d6f6e83bd53d197b5e59d9725d2b2e89
+  metadata.gz: d6c94af48c76bdd1d4ce6744e81cf812192498d8
+  data.tar.gz: dd14708bbca74f0845ce37310fb4a7679326e7cb
 SHA512:
-  metadata.gz: 4f8da52c573d97113036a15c754bf633aad04f45d5cf5ca5273e9be032ca0048c39fbddf0bc8065514364c5517e2d39c0a78dc8dc9289b24eb8bd6b4027b471a
-  data.tar.gz: 83c98e5c6b95a439be8b33048991b83c7d9cbc4f00b6102a04b37318fdb22ab97582289f1ef4c518340250d2325d584a045f6a70c1de2616bfc8532535ee7f70
+  metadata.gz: 8982f3a4a7aa6c9f89a581099c48a2e694930f9e4f48beaf88cfaf38f9a21004b32fd5093937ffa0096ac4ebb725c7f99402928a0ab4b54153114fa81267d21b
+  data.tar.gz: f9219565baccdea2ce89be3e50012b204e4482296f83084517db0e996a4a6147050230f6afcebc4ba79e1b127aa3dcbe845962c3087c5dd3ec3b2e16970537f0

data/CHANGELOG

@@ -1,3 +1,10 @@
+
+23-08-2017
+
+- 0.1.15
+
+  - bump dependency of libv8 to 6.3
+
 23-08-2017
 
 - 0.1.14

data/ext/mini_racer_extension/mini_racer_extension.cc

@@ -53,9 +53,16 @@ typedef struct {
     Local<String>* filename;
     useconds_t timeout;
     EvalResult* result;
-    long max_memory;
+    size_t max_memory;
 } EvalParams;
 
+enum IsolateFlags {
+    IN_GVL,
+    DO_TERMINATE,
+    MEM_SOFTLIMIT_VALUE,
+    MEM_SOFTLIMIT_REACHED,
+};
+
 static VALUE rb_eScriptTerminatedError;
 static VALUE rb_eV8OutOfMemoryError;
 static VALUE rb_eParseError;
@@ -109,16 +116,16 @@ static void init_v8() {
 }
 
 static void gc_callback(Isolate *isolate, GCType type, GCCallbackFlags flags) {
-    if((bool)isolate->GetData(3)) return;
+    if((bool)isolate->GetData(MEM_SOFTLIMIT_REACHED)) return;
 
-    long softlimit = *(long*) isolate->GetData(2);
+    size_t softlimit = *(size_t*) isolate->GetData(MEM_SOFTLIMIT_VALUE);
 
     HeapStatistics* stats = new HeapStatistics();
     isolate->GetHeapStatistics(stats);
-    long used = stats->used_heap_size();
+    size_t used = stats->used_heap_size();
 
     if(used > softlimit) {
-        isolate->SetData(3, (void*)true);
+        isolate->SetData(MEM_SOFTLIMIT_REACHED, (void*)true);
         V8::TerminateExecution(isolate);
     }
 }
@@ -138,13 +145,13 @@ nogvl_context_eval(void* arg) {
     v8::ScriptOrigin *origin = NULL;
 
     // in gvl flag
-    isolate->SetData(0, (void*)false);
+    isolate->SetData(IN_GVL, (void*)false);
     // terminate ASAP
-    isolate->SetData(1, (void*)false);
+    isolate->SetData(DO_TERMINATE, (void*)false);
     // Memory softlimit
-    isolate->SetData(2, (void*)false);
+    isolate->SetData(MEM_SOFTLIMIT_VALUE, (void*)false);
     // Memory softlimit hit flag
-    isolate->SetData(3, (void*)false);
+    isolate->SetData(MEM_SOFTLIMIT_REACHED, (void*)false);
 
     MaybeLocal<Script> parsed_script;
 
@@ -170,7 +177,7 @@ nogvl_context_eval(void* arg) {
     } else {
 
     if(eval_params->max_memory > 0) {
-        isolate->SetData(2, &eval_params->max_memory);
+        isolate->SetData(MEM_SOFTLIMIT_VALUE, &eval_params->max_memory);
         isolate->AddGCEpilogueCallback(gc_callback);
     }
 
@@ -241,7 +248,7 @@ nogvl_context_eval(void* arg) {
 	}
     }
 
-    isolate->SetData(0, (void*)true);
+    isolate->SetData(IN_GVL, (void*)true);
 
 
     return NULL;
@@ -575,7 +582,7 @@ static VALUE rb_context_eval_unsafe(VALUE self, VALUE str, VALUE filename) {
 
 	VALUE mem_softlimit = rb_iv_get(self, "@max_memory");
 	if (mem_softlimit != Qnil) {
-    	eval_params.max_memory = (long)NUM2LONG(mem_softlimit);
+        eval_params.max_memory = (size_t)NUM2ULONG(mem_softlimit);
 	}
 
 	eval_result.message = NULL;
@@ -611,7 +618,7 @@ 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) {
-		bool mem_softlimit_reached = (bool)isolate->GetData(3);
+		bool mem_softlimit_reached = (bool)isolate->GetData(MEM_SOFTLIMIT_REACHED);
 		// 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;
@@ -725,7 +732,7 @@ gvl_ruby_callback(void* data) {
     callback_data.args = ruby_args;
     callback_data.failed = false;
 
-    if ((bool)args->GetIsolate()->GetData(1) == true) {
+    if ((bool)args->GetIsolate()->GetData(DO_TERMINATE) == true) {
 	args->GetIsolate()->ThrowException(String::NewFromUtf8(args->GetIsolate(), "Terminated execution during transition from Ruby to JS"));
 	V8::TerminateExecution(args->GetIsolate());
 	return NULL;
@@ -749,7 +756,7 @@ gvl_ruby_callback(void* data) {
 	xfree(ruby_args);
     }
 
-    if ((bool)args->GetIsolate()->GetData(1) == true) {
+    if ((bool)args->GetIsolate()->GetData(DO_TERMINATE) == true) {
       Isolate* isolate = args->GetIsolate();
       V8::TerminateExecution(isolate);
     }
@@ -759,12 +766,14 @@ gvl_ruby_callback(void* data) {
 
 static void ruby_callback(const FunctionCallbackInfo<Value>& args) {
 
-    bool has_gvl = (bool)args.GetIsolate()->GetData(0);
+    bool has_gvl = (bool)args.GetIsolate()->GetData(IN_GVL);
 
     if(has_gvl) {
 	gvl_ruby_callback((void*)&args);
     } else {
+    args.GetIsolate()->SetData(IN_GVL, (void*)true);
 	rb_thread_call_with_gvl(gvl_ruby_callback, (void*)(&args));
+    args.GetIsolate()->SetData(IN_GVL, (void*)false);
     }
 }
 
@@ -1022,7 +1031,7 @@ rb_context_stop(VALUE self) {
     Isolate* isolate = context_info->isolate_info->isolate;
 
     // flag for termination
-    isolate->SetData(1, (void*)true);
+    isolate->SetData(DO_TERMINATE, (void*)true);
 
     V8::TerminateExecution(isolate);
     rb_funcall(self, rb_intern("stop_attached"), 0);

data/lib/mini_racer.rb

@@ -148,7 +148,9 @@ module MiniRacer
       @max_memory = nil
       @current_exception = nil
       @timeout = options[:timeout]
-      @max_memory = options[:max_memory]
+      if options[:max_memory].is_a?(Numeric) && options[:max_memory] > 0
+        @max_memory = options[:max_memory]
+      end
       @isolate = options[:isolate] || Isolate.new(options[:snapshot])
       @disposed = false
 

data/lib/mini_racer/version.rb

@@ -1,3 +1,3 @@
 module MiniRacer
-  VERSION = "0.1.14"
+  VERSION = "0.1.15"
 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.3'
   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.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-24 00:00:00.000000000 Z
+date: 2017-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '6.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '6.3'
 description: Minimal embedded v8 engine for Ruby
 email:
 - sam.saffron@gmail.com
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Minimal embedded v8 for Ruby