h8 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d6df45a0dbe1bfe8a588edcdc1e89a1fe46d1f2
-  data.tar.gz: 5462860d000512adda74a47ae151765f3ac67fe5
+  metadata.gz: 3f57dd0c74b95006a890c9cf0369c125cef269f5
+  data.tar.gz: f3d4718d58ff97858d8b6eba3d24153b1cda7c92
 SHA512:
-  metadata.gz: ba6bf36d6e8c17edc4ab93c38f773afdad6ce33f4210ef81aa7e60a9644f46e6ec2c981867d78e31bce7a0e8d2472ef14b048220d5ef61e1544482cc540bc1c5
-  data.tar.gz: 90ca1c17c7d87fca3ccd06255cc71f175f68864067bfbd8a078bac375ac376bead0190343be66703f6f3463994106ec9dfceceb92a156f06bc411eb900364acb
+  metadata.gz: c27679efadcb3972abbfee520b177455387b21263e7541e32d6e16ecf98bff1d701c2670f5590843936a1afed0f131bc4d8210ed9eb7bf65321a0d941726df7a
+  data.tar.gz: 0a4f4b5733f65efd133b7e5323c4c172685879cd44b84690c1ec80ff1978bd4d86d66c91df59a76ecbe4b16248f385472fde76adb5655beb128c605c11411edc

data/ext/h8/extconf.rb

@@ -37,7 +37,7 @@ begin
       v8_path = ENV['V8_3_31_ROOT'] or raise "Please give me export V8_3_31_ROOT=..."
       # dir_config('v8', '/Users/sergeych/dev/v8', '/Users/sergeych/dev/v8/out/native')
       dir_config('v8', v8_path, v8_path+'/out/native')
-      CONFIG['CXXFLAGS'] += ' --std=c++11'
+      CONFIG['CXXFLAGS'] += ' --std=c++11 -O6'
     else
       # example linux package https://github.com/porzione/v8-git-debian
       dir_config('v8', '/usr/include/libv8-3.31', '/usr/lib/libv8-3.31')

data/ext/h8/h8.cpp

@@ -27,7 +27,8 @@ void h8::JsError::raise() {
 				ruby_exception = ruby_exception = rb_exc_new2(js_exception,
 						*res ? *res : "unknown javascript exception");
 				rb_iv_set(ruby_exception, "@message", h8->to_ruby(s));
-				rb_iv_set(ruby_exception, "@javascript_error", h8->to_ruby(jsx));
+				rb_iv_set(ruby_exception, "@javascript_error",
+						h8->to_ruby(jsx));
 			}
 		}
 		rb_exc_raise(ruby_exception);
@@ -60,7 +61,7 @@ void h8::H8::ruby_mark_gc() const {
 		((AllocatedResource*) x)->rb_mark_gc();
 }
 
-v8::Handle<v8::Value> h8::H8::eval(const char* script_utf,unsigned max_ms) {
+v8::Handle<v8::Value> h8::H8::eval(const char* script_utf, unsigned max_ms) {
 	v8::EscapableHandleScope escape(isolate);
 	Local<Value> result;
 
@@ -76,20 +77,20 @@ v8::Handle<v8::Value> h8::H8::eval(const char* script_utf,unsigned max_ms) {
 		result = Undefined(isolate);
 	} else {
 		result = Undefined(isolate);
-		if( max_ms > 0 ) {
+		if (max_ms > 0) {
 			std::mutex m;
 			std::condition_variable cv;
-			std::thread thr( [&] {
-				std::unique_lock<std::mutex> lock(m);
-				if( std::cv_status::timeout == cv.wait_for(lock, std::chrono::milliseconds(max_ms) ) ) {
-					isolate->TerminateExecution();
-				}
-			});
+			std::thread thr(
+					[&] {
+						std::unique_lock<std::mutex> lock(m);
+						if( std::cv_status::timeout == cv.wait_for(lock, std::chrono::milliseconds(max_ms) ) ) {
+							isolate->TerminateExecution();
+						}
+					});
 			script->Run();
 			cv.notify_all();
 			thr.join();
-		}
-		else {
+		} else {
 			result = script->Run();
 		}
 		try_catch.throwIfCaught();
@@ -98,9 +99,12 @@ v8::Handle<v8::Value> h8::H8::eval(const char* script_utf,unsigned max_ms) {
 }
 
 h8::H8::~H8() {
-	while (!resources.is_empty()) {
-		// this should also remove it from the list:
-		resources.peek_first<AllocatedResource>()->free();
+	{
+		Scope s(this);
+		while (!resources.is_empty()) {
+			// this should also remove it from the list:
+			resources.peek_first<AllocatedResource>()->free();
+		}
 	}
 
 	persistent_context.Reset();

data/ext/h8/h8.h

@@ -81,16 +81,22 @@ public:
 class H8 {
 public:
 
-	class Scope: public HandleScope {
-		v8::Isolate::Scope isolate_scope;
-		v8::Context::Scope context_scope;
+	class Scope {
+		Locker locker;
+		Isolate::Scope isolate_scope;
+		HandleScope handle_scope;
+		Context::Scope context_scope;
+
 		H8* rcontext;
 
 	public:
 		Scope(H8* cxt) :
-				HandleScope(cxt->getIsolate()), isolate_scope(
-						cxt->getIsolate()), context_scope(cxt->getContext()), rcontext(
-						cxt) {
+				locker(cxt->getIsolate()),
+				handle_scope(cxt->getIsolate()),
+				isolate_scope(cxt->getIsolate()),
+				context_scope(cxt->getContext()),
+				rcontext(cxt)
+		{
 		}
 	};
 
@@ -99,6 +105,7 @@ public:
 	H8() :
 			self(Qnil) {
 		isolate = Isolate::New();
+		Locker l(isolate);
 		Isolate::Scope isolate_scope(isolate);
 		HandleScope handle_scope(isolate);
 		isolate->SetCaptureStackTraceForUncaughtExceptions(true);
@@ -217,11 +224,9 @@ inline VALUE h8::H8::to_ruby(Handle<Value> value) {
 
 inline h8::JsError::JsError(H8* h8, Local<Message> message,
 		Local<Value> exception) :
-		h8(h8),
-		_message(h8->getIsolate(), message),
-		_exception(h8->getIsolate(), exception),
-		has_js_exception(true),
-		reason(NULL) {
+		h8(h8), _message(h8->getIsolate(), message), _exception(
+				h8->getIsolate(), exception), has_js_exception(true), reason(
+				NULL) {
 }
 
 inline Local<Message> h8::JsError::message() const {

data/ext/h8/js_gate.h

@@ -162,12 +162,12 @@ public:
 	 * Call this as function over global context
 	 */
 	VALUE call(VALUE args) const {
-		v8::HandleScope scope(h8->getIsolate());
+		H8::Scope scope(h8);
 		return apply(h8->getContext()->Global(), args);
 	}
 
 	VALUE apply(VALUE self, VALUE args) const {
-		v8::HandleScope scope(h8->getIsolate());
+		H8::Scope scope(h8);
 		return apply(h8->gateObject(self), args);
 	}
 

data/lib/h8/version.rb

@@ -1,3 +1,3 @@
 module H8
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/context_spec.rb

@@ -74,4 +74,30 @@ describe 'context' do
     cxt.eval('(last-start)/1000').should < 250
   end
 
+  it 'should work in many threads' do
+    sum = 0
+    valid = 0
+    n   = 10
+    contexts = []
+    tt  = n.times.map { |n|
+      valid += (n+1)*100 + 10
+      Thread.start {
+        cxt         = H8::Context.new
+        contexts << cxt
+        cxt[:array] = 100024.times.map { |x| x*(n+1) }
+        cxt[:n] = n+1
+        sum         += cxt.eval('result = array[100] + 10')
+      }
+    }
+    tt.each &:join
+    sum.should == valid
+    GC.start
+    # Cross-thread access
+    contexts.each { |cxt|
+      s, n = cxt.eval('data = [result,n]')
+      s.should == 100*n + 10
+    }
+  end
+
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: h8
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - sergeych
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-28 00:00:00.000000000 Z
+date: 2014-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Minimalistic and fast Ruby <--> V8 integration