sq_mini_racer 0.2.3.sqreen5 → 0.2.4.sqreen1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e471112864a46981c92918e92e0d7ad379fa8c4e4df9ddf5f6ae613d73e701fc
-  data.tar.gz: 64cbea24b213cbccfa8538082e69fb48136c195c60b669f31bfe23c4be8ed2f1
+  metadata.gz: bea40e4059a89f323b790b547c1def910b62bc1d053e16cdb7a1723647640354
+  data.tar.gz: dfcec9eefde7e0d2875e0fe65d36e500a43502e60c3d3e6fd201d9ef398fbe59
 SHA512:
-  metadata.gz: 1244ff11d07359cda9ba590abff65b134386759a5cfe23620c34185fa7ffd8e509721bd67d8b60d4ccc900f1f1eb0ef6e52cf211bf1f629aa530ea8a48bab21b
-  data.tar.gz: 6e76f61f8b5cdbdd0deef5bf2d8cedcea92bd81a5a67fd7dd8f38032eaf936f7d48f973f8016b13f3789eb99dc851dc52165cc35e3229464c1cf9a38a2ec408b
+  metadata.gz: 146ebbd3f0edd5777adb092eeee08eab299ba4794e3904d18ef94422a742f5f5e26faa3abb7fcaf7dab5821c50defb57c0b22efa27658e3b0c7e39bcfcebc727
+  data.tar.gz: 3e417b55e52b2513b54d1a30b9dff96196f8c3592957bea7ad386e205f5d9fcd2e3f5d72bf44e1f99192e6f5ddb40ac87cd3cd533c838b746a8fdc90afe51054

data/CHANGELOG

@@ -1,3 +1,10 @@
+- 02-11-2018
+
+- 0.2.4
+
+  - FIX: deadlock releasing context when shared isolates are used
+  - FEATURE: include js backtrace when snapshots do not compile
+
 - 28-09-2018
 
 - 0.2.3

data/ext/mini_racer_extension/mini_racer_extension.cc

@@ -81,6 +81,10 @@ public:
         }
     }
 
+    int refs() {
+	return refs_count;
+    }
+
     static void* operator new(size_t size) {
         return ruby_xmalloc(size);
     }
@@ -207,9 +211,9 @@ static void gc_callback(Isolate *isolate, GCType type, GCCallbackFlags flags) {
 
     size_t softlimit = *(size_t*) isolate->GetData(MEM_SOFTLIMIT_VALUE);
 
-    HeapStatistics* stats = new HeapStatistics();
-    isolate->GetHeapStatistics(stats);
-    size_t used = stats->used_heap_size();
+    HeapStatistics stats;
+    isolate->GetHeapStatistics(&stats);
+    size_t used = stats.used_heap_size();
 
     if(used > softlimit) {
         isolate->SetData(MEM_SOFTLIMIT_REACHED, (void*)true);
@@ -271,8 +275,8 @@ static void prepare_result(MaybeLocal<Value> v8res,
                 Local<Message> message = trycatch.Message();
                 char buf[1000];
                 int len;
-                len = snprintf(buf, sizeof(buf), "%s at %s:%i:%i", *String::Utf8Value(message->Get()),
-                               *String::Utf8Value(message->GetScriptResourceName()->ToString()),
+                len = snprintf(buf, sizeof(buf), "%s at %s:%i:%i", *String::Utf8Value(isolate, message->Get()),
+                               *String::Utf8Value(isolate, message->GetScriptResourceName()->ToString()),
                                message->GetLineNumber(),
                                message->GetStartColumn());
                 if ((size_t) len >= sizeof(buf)) {
@@ -288,9 +292,9 @@ static void prepare_result(MaybeLocal<Value> v8res,
                 Local<String> tmp = String::NewFromUtf8(isolate, "JavaScript was terminated (either by timeout or explicitly)");
                 evalRes.message->Reset(isolate, tmp);
             }
-            if (!trycatch.StackTrace().IsEmpty()) {
+            if (!trycatch.StackTrace(context).IsEmpty()) {
                 evalRes.backtrace = new Persistent<Value>();
-                evalRes.backtrace->Reset(isolate, trycatch.StackTrace()->ToString());
+                evalRes.backtrace->Reset(isolate, trycatch.StackTrace(context).ToLocalChecked()->ToString());
             }
         }
     }
@@ -443,7 +447,7 @@ static VALUE convert_v8_to_ruby(Isolate* isolate, Local<Context> context,
     }
 
     Local<String> rstr = value->ToString();
-    return rb_enc_str_new(*String::Utf8Value(rstr), rstr->Utf8Length(), rb_enc_find("utf-8"));
+    return rb_enc_str_new(*String::Utf8Value(isolate, rstr), rstr->Utf8Length(), rb_enc_find("utf-8"));
 }
 
 static VALUE convert_v8_to_ruby(Isolate* isolate,
@@ -776,7 +780,7 @@ static VALUE convert_result_to_ruby(VALUE self /* context */,
 
         if (result.json) {
             Local<String> rstr = tmp->ToString();
-            VALUE json_string = rb_enc_str_new(*String::Utf8Value(rstr), rstr->Utf8Length(), rb_enc_find("utf-8"));
+            VALUE json_string = rb_enc_str_new(*String::Utf8Value(isolate, rstr), rstr->Utf8Length(), rb_enc_find("utf-8"));
             ret = rb_funcall(rb_mJSON, rb_intern("parse"), 1, json_string);
         } else {
             ret = convert_v8_to_ruby(isolate, *p_ctx, tmp);
@@ -1094,21 +1098,50 @@ void free_isolate(IsolateInfo* isolate_info) {
     delete isolate_info->allocator;
 }
 
+static void *free_context_raw(void* arg) {
+    ContextInfo* context_info = (ContextInfo*)arg;
+    IsolateInfo* isolate_info = context_info->isolate_info;
+    Persistent<Context>* context = context_info->context;
+
+    if (context && isolate_info && isolate_info->isolate) {
+        Locker lock(isolate_info->isolate);
+        v8::Isolate::Scope isolate_scope(isolate_info->isolate);
+        context->Reset();
+        delete context;
+    }
+
+    if (isolate_info) {
+        isolate_info->release();
+    }
+
+    xfree(context_info);
+    return NULL;
+}
+
 // destroys everything except freeing the ContextInfo struct (see deallocate())
 static void free_context(ContextInfo* context_info) {
 
     IsolateInfo* isolate_info = context_info->isolate_info;
 
+    ContextInfo* context_info_copy = ALLOC(ContextInfo);
+    context_info_copy->isolate_info = context_info->isolate_info;
+    context_info_copy->context = context_info->context;
+
+    if (isolate_info && isolate_info->refs() > 1) {
+	pthread_t free_context_thread;
+	if (pthread_create(&free_context_thread, NULL, free_context_raw, (void*)context_info_copy)) {
+            fprintf(stderr, "WARNING failed to release memory in MiniRacer, thread to release could not be created, process will leak memory\n");
+	}
+
+    } else {
+	free_context_raw(context_info_copy);
+    }
+
     if (context_info->context && isolate_info && isolate_info->isolate) {
-        Locker lock(isolate_info->isolate);
-        v8::Isolate::Scope isolate_scope(isolate_info->isolate);
-        context_info->context->Reset();
-        delete context_info->context;
 	context_info->context = NULL;
     }
 
     if (isolate_info) {
-        isolate_info->release();
         context_info->isolate_info = NULL;
     }
 }
@@ -1238,6 +1271,19 @@ rb_context_dispose(VALUE self) {
     return Qnil;
 }
 
+static VALUE
+rb_context_low_memory_notification(VALUE self) {
+
+    ContextInfo* context_info;
+    Data_Get_Struct(self, ContextInfo, context_info);
+
+    if (context_info->isolate_info && context_info->isolate_info->isolate) {
+        context_info->isolate_info->isolate->LowMemoryNotification();
+    }
+
+    return Qnil;
+}
+
 #if RUBY_API_VERSION_MAJOR > 1
 static void*
 #else
@@ -1405,7 +1451,8 @@ extern "C" {
 
 	rb_define_method(rb_cContext, "stop", (VALUE(*)(...))&rb_context_stop, 0);
 	rb_define_method(rb_cContext, "dispose_unsafe", (VALUE(*)(...))&rb_context_dispose, 0);
-	rb_define_method(rb_cContext, "heap_stats", (VALUE(*)(...))&rb_heap_stats, 0);
+       rb_define_method(rb_cContext, "low_memory_notification", (VALUE(*)(...))&rb_context_low_memory_notification, 0);
+       rb_define_method(rb_cContext, "heap_stats", (VALUE(*)(...))&rb_heap_stats, 0);
 	rb_define_private_method(rb_cContext, "create_isolate_value",(VALUE(*)(...))&rb_context_create_isolate_value, 0);
 	rb_define_private_method(rb_cContext, "eval_unsafe",(VALUE(*)(...))&rb_context_eval_unsafe, 2);
 	rb_define_private_method(rb_cContext, "call_unsafe", (VALUE(*)(...))&rb_context_call_unsafe, -1);

data/lib/sqreen/mini_racer.rb

@@ -331,7 +331,7 @@ module MiniRacer
         ctx = MiniRacer::Context.new
         ctx.eval(str)
       rescue MiniRacer::RuntimeError => e
-        raise MiniRacer::SnapshotError.new,  e.message
+        raise MiniRacer::SnapshotError.new, e.message, e.backtrace
       end
 
       @source = str
@@ -349,7 +349,7 @@ module MiniRacer
         ctx.eval(@source)
         ctx.eval(src)
       rescue MiniRacer::RuntimeError => e
-        raise MiniRacer::SnapshotError.new,  e.message
+        raise MiniRacer::SnapshotError.new, e.message, e.backtrace
       end
 
       warmup_unsafe!(src)

data/lib/sqreen/mini_racer/version.rb

@@ -2,6 +2,6 @@ module Sqreen
 module MiniRacer
   # part before qualifier is the number of the last upstream release
   # since we synced with it
-  VERSION = "0.2.3.sqreen5"
+  VERSION = "0.2.4.sqreen1"
 end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sq_mini_racer
 version: !ruby/object:Gem::Version
-  version: 0.2.3.sqreen5
+  version: 0.2.4.sqreen1
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-09 00:00:00.000000000 Z
+date: 2018-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler