Uniformize indentation style to always using 4 spaces instead of the weird mix of 4 spaces and tabs 8 space wide (#127)
This commit is contained in:
Taiki
Sam
parent
94ac734556
commit
b3c9b35859
|
|
@ -71,7 +71,7 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
int refs() {
|
int refs() {
|
||||||
return refs_count;
|
return refs_count;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void* operator new(size_t size) {
|
static void* operator new(size_t size) {
|
||||||
|
|
@ -315,13 +315,13 @@ nogvl_context_eval(void* arg) {
|
||||||
MaybeLocal<Script> parsed_script;
|
MaybeLocal<Script> parsed_script;
|
||||||
|
|
||||||
if (eval_params->filename) {
|
if (eval_params->filename) {
|
||||||
origin = new v8::ScriptOrigin(*eval_params->filename);
|
origin = new v8::ScriptOrigin(*eval_params->filename);
|
||||||
}
|
}
|
||||||
|
|
||||||
parsed_script = Script::Compile(context, *eval_params->eval, origin);
|
parsed_script = Script::Compile(context, *eval_params->eval, origin);
|
||||||
|
|
||||||
if (origin) {
|
if (origin) {
|
||||||
delete origin;
|
delete origin;
|
||||||
}
|
}
|
||||||
|
|
||||||
result->parsed = !parsed_script.IsEmpty();
|
result->parsed = !parsed_script.IsEmpty();
|
||||||
|
|
@ -332,8 +332,8 @@ nogvl_context_eval(void* arg) {
|
||||||
|
|
||||||
MaybeLocal<Value> maybe_value;
|
MaybeLocal<Value> maybe_value;
|
||||||
if (!result->parsed) {
|
if (!result->parsed) {
|
||||||
result->message = new Persistent<Value>();
|
result->message = new Persistent<Value>();
|
||||||
result->message->Reset(isolate, trycatch.Exception());
|
result->message->Reset(isolate, trycatch.Exception());
|
||||||
} else {
|
} else {
|
||||||
// parsing successful
|
// parsing successful
|
||||||
if (eval_params->max_memory > 0) {
|
if (eval_params->max_memory > 0) {
|
||||||
|
|
@ -359,41 +359,41 @@ static VALUE convert_v8_to_ruby(Isolate* isolate, Local<Context> context,
|
||||||
HandleScope scope(isolate);
|
HandleScope scope(isolate);
|
||||||
|
|
||||||
if (value->IsNull() || value->IsUndefined()){
|
if (value->IsNull() || value->IsUndefined()){
|
||||||
return Qnil;
|
return Qnil;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (value->IsInt32()) {
|
if (value->IsInt32()) {
|
||||||
return INT2FIX(value->Int32Value());
|
return INT2FIX(value->Int32Value());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (value->IsNumber()) {
|
if (value->IsNumber()) {
|
||||||
return rb_float_new(value->NumberValue());
|
return rb_float_new(value->NumberValue());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (value->IsTrue()) {
|
if (value->IsTrue()) {
|
||||||
return Qtrue;
|
return Qtrue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (value->IsFalse()) {
|
if (value->IsFalse()) {
|
||||||
return Qfalse;
|
return Qfalse;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (value->IsArray()) {
|
if (value->IsArray()) {
|
||||||
VALUE rb_array = rb_ary_new();
|
VALUE rb_array = rb_ary_new();
|
||||||
Local<Array> arr = Local<Array>::Cast(value);
|
Local<Array> arr = Local<Array>::Cast(value);
|
||||||
for(uint32_t i=0; i < arr->Length(); i++) {
|
for(uint32_t i=0; i < arr->Length(); i++) {
|
||||||
Local<Value> element = arr->Get(i);
|
Local<Value> element = arr->Get(i);
|
||||||
VALUE rb_elem = convert_v8_to_ruby(isolate, context, element);
|
VALUE rb_elem = convert_v8_to_ruby(isolate, context, element);
|
||||||
if (rb_funcall(rb_elem, rb_intern("class"), 0) == rb_cFailedV8Conversion) {
|
if (rb_funcall(rb_elem, rb_intern("class"), 0) == rb_cFailedV8Conversion) {
|
||||||
return rb_elem;
|
return rb_elem;
|
||||||
}
|
}
|
||||||
rb_ary_push(rb_array, rb_elem);
|
rb_ary_push(rb_array, rb_elem);
|
||||||
}
|
}
|
||||||
return rb_array;
|
return rb_array;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (value->IsFunction()){
|
if (value->IsFunction()){
|
||||||
return rb_funcall(rb_cJavaScriptFunction, rb_intern("new"), 0);
|
return rb_funcall(rb_cJavaScriptFunction, rb_intern("new"), 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (value->IsDate()){
|
if (value->IsDate()){
|
||||||
|
|
@ -405,30 +405,30 @@ static VALUE convert_v8_to_ruby(Isolate* isolate, Local<Context> context,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (value->IsObject()) {
|
if (value->IsObject()) {
|
||||||
VALUE rb_hash = rb_hash_new();
|
VALUE rb_hash = rb_hash_new();
|
||||||
TryCatch trycatch(isolate);
|
TryCatch trycatch(isolate);
|
||||||
|
|
||||||
Local<Object> object = value->ToObject();
|
Local<Object> object = value->ToObject();
|
||||||
auto maybe_props = object->GetOwnPropertyNames(context);
|
auto maybe_props = object->GetOwnPropertyNames(context);
|
||||||
if (!maybe_props.IsEmpty()) {
|
if (!maybe_props.IsEmpty()) {
|
||||||
Local<Array> props = maybe_props.ToLocalChecked();
|
Local<Array> props = maybe_props.ToLocalChecked();
|
||||||
for(uint32_t i=0; i < props->Length(); i++) {
|
for(uint32_t i=0; i < props->Length(); i++) {
|
||||||
Local<Value> key = props->Get(i);
|
Local<Value> key = props->Get(i);
|
||||||
VALUE rb_key = convert_v8_to_ruby(isolate, context, key);
|
VALUE rb_key = convert_v8_to_ruby(isolate, context, key);
|
||||||
Local<Value> prop_value = object->Get(key);
|
Local<Value> prop_value = object->Get(key);
|
||||||
// this may have failed due to Get raising
|
// this may have failed due to Get raising
|
||||||
|
|
||||||
if (trycatch.HasCaught()) {
|
if (trycatch.HasCaught()) {
|
||||||
// TODO isolate code that translates execption to ruby
|
// TODO isolate code that translates execption to ruby
|
||||||
// exception so we can properly return it
|
// exception so we can properly return it
|
||||||
return rb_funcall(rb_cFailedV8Conversion, rb_intern("new"), 1, rb_str_new2(""));
|
return rb_funcall(rb_cFailedV8Conversion, rb_intern("new"), 1, rb_str_new2(""));
|
||||||
}
|
}
|
||||||
|
|
||||||
VALUE rb_value = convert_v8_to_ruby(isolate, context, prop_value);
|
VALUE rb_value = convert_v8_to_ruby(isolate, context, prop_value);
|
||||||
rb_hash_aset(rb_hash, rb_key, rb_value);
|
rb_hash_aset(rb_hash, rb_key, rb_value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return rb_hash;
|
return rb_hash;
|
||||||
}
|
}
|
||||||
|
|
||||||
Local<String> rstr = value->ToString();
|
Local<String> rstr = value->ToString();
|
||||||
|
|
@ -675,13 +675,13 @@ static VALUE rb_context_init_unsafe(VALUE self, VALUE isolate, VALUE snap) {
|
||||||
// the ruby lock is needed if this isn't a new isolate
|
// the ruby lock is needed if this isn't a new isolate
|
||||||
IsolateInfo::Lock ruby_lock(isolate_info->mutex);
|
IsolateInfo::Lock ruby_lock(isolate_info->mutex);
|
||||||
Locker lock(isolate_info->isolate);
|
Locker lock(isolate_info->isolate);
|
||||||
Isolate::Scope isolate_scope(isolate_info->isolate);
|
Isolate::Scope isolate_scope(isolate_info->isolate);
|
||||||
HandleScope handle_scope(isolate_info->isolate);
|
HandleScope handle_scope(isolate_info->isolate);
|
||||||
|
|
||||||
Local<Context> context = Context::New(isolate_info->isolate);
|
Local<Context> context = Context::New(isolate_info->isolate);
|
||||||
|
|
||||||
context_info->context = new Persistent<Context>();
|
context_info->context = new Persistent<Context>();
|
||||||
context_info->context->Reset(isolate_info->isolate, context);
|
context_info->context->Reset(isolate_info->isolate, context);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Qnil == rb_cDateTime && rb_funcall(rb_cObject, rb_intern("const_defined?"), 1, rb_str_new2("DateTime")) == Qtrue)
|
if (Qnil == rb_cDateTime && rb_funcall(rb_cObject, rb_intern("const_defined?"), 1, rb_str_new2("DateTime")) == Qtrue)
|
||||||
|
|
@ -803,42 +803,42 @@ static VALUE rb_context_eval_unsafe(VALUE self, VALUE str, VALUE filename) {
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
Locker lock(isolate);
|
Locker lock(isolate);
|
||||||
Isolate::Scope isolate_scope(isolate);
|
Isolate::Scope isolate_scope(isolate);
|
||||||
HandleScope handle_scope(isolate);
|
HandleScope handle_scope(isolate);
|
||||||
|
|
||||||
Local<String> eval = String::NewFromUtf8(isolate, RSTRING_PTR(str),
|
Local<String> eval = String::NewFromUtf8(isolate, RSTRING_PTR(str),
|
||||||
NewStringType::kNormal, (int)RSTRING_LEN(str)).ToLocalChecked();
|
NewStringType::kNormal, (int)RSTRING_LEN(str)).ToLocalChecked();
|
||||||
|
|
||||||
Local<String> local_filename;
|
Local<String> local_filename;
|
||||||
|
|
||||||
if (filename != Qnil) {
|
if (filename != Qnil) {
|
||||||
local_filename = String::NewFromUtf8(isolate, RSTRING_PTR(filename),
|
local_filename = String::NewFromUtf8(isolate, RSTRING_PTR(filename),
|
||||||
NewStringType::kNormal, (int)RSTRING_LEN(filename)).ToLocalChecked();
|
NewStringType::kNormal, (int)RSTRING_LEN(filename)).ToLocalChecked();
|
||||||
eval_params.filename = &local_filename;
|
eval_params.filename = &local_filename;
|
||||||
} else {
|
} else {
|
||||||
eval_params.filename = NULL;
|
eval_params.filename = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
eval_params.context_info = context_info;
|
eval_params.context_info = context_info;
|
||||||
eval_params.eval = &eval;
|
eval_params.eval = &eval;
|
||||||
eval_params.result = &eval_result;
|
eval_params.result = &eval_result;
|
||||||
eval_params.timeout = 0;
|
eval_params.timeout = 0;
|
||||||
eval_params.max_memory = 0;
|
eval_params.max_memory = 0;
|
||||||
VALUE timeout = rb_iv_get(self, "@timeout");
|
VALUE timeout = rb_iv_get(self, "@timeout");
|
||||||
if (timeout != Qnil) {
|
if (timeout != Qnil) {
|
||||||
eval_params.timeout = (useconds_t)NUM2LONG(timeout);
|
eval_params.timeout = (useconds_t)NUM2LONG(timeout);
|
||||||
}
|
}
|
||||||
|
|
||||||
VALUE mem_softlimit = rb_iv_get(self, "@max_memory");
|
VALUE mem_softlimit = rb_iv_get(self, "@max_memory");
|
||||||
if (mem_softlimit != Qnil) {
|
if (mem_softlimit != Qnil) {
|
||||||
eval_params.max_memory = (size_t)NUM2ULONG(mem_softlimit);
|
eval_params.max_memory = (size_t)NUM2ULONG(mem_softlimit);
|
||||||
}
|
}
|
||||||
|
|
||||||
eval_result.message = NULL;
|
eval_result.message = NULL;
|
||||||
eval_result.backtrace = NULL;
|
eval_result.backtrace = NULL;
|
||||||
|
|
||||||
rb_thread_call_without_gvl(nogvl_context_eval, &eval_params, unblock_eval, &eval_params);
|
rb_thread_call_without_gvl(nogvl_context_eval, &eval_params, unblock_eval, &eval_params);
|
||||||
}
|
}
|
||||||
|
|
||||||
return convert_result_to_ruby(self, eval_result);
|
return convert_result_to_ruby(self, eval_result);
|
||||||
|
|
@ -851,17 +851,16 @@ typedef struct {
|
||||||
bool failed;
|
bool failed;
|
||||||
} protected_callback_data;
|
} protected_callback_data;
|
||||||
|
|
||||||
static
|
static VALUE protected_callback(VALUE rdata) {
|
||||||
VALUE protected_callback(VALUE rdata) {
|
|
||||||
protected_callback_data* data = (protected_callback_data*)rdata;
|
protected_callback_data* data = (protected_callback_data*)rdata;
|
||||||
VALUE result;
|
VALUE result;
|
||||||
|
|
||||||
if (data->length > 0) {
|
if (data->length > 0) {
|
||||||
result = rb_funcall2(data->callback, rb_intern("call"), data->length,
|
result = rb_funcall2(data->callback, rb_intern("call"), data->length,
|
||||||
RARRAY_PTR(data->ruby_args));
|
RARRAY_PTR(data->ruby_args));
|
||||||
RB_GC_GUARD(data->ruby_args);
|
RB_GC_GUARD(data->ruby_args);
|
||||||
} else {
|
} else {
|
||||||
result = rb_funcall(data->callback, rb_intern("call"), 0);
|
result = rb_funcall(data->callback, rb_intern("call"), 0);
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
@ -898,16 +897,16 @@ gvl_ruby_callback(void* data) {
|
||||||
ContextInfo* context_info;
|
ContextInfo* context_info;
|
||||||
Data_Get_Struct(parent, ContextInfo, context_info);
|
Data_Get_Struct(parent, ContextInfo, context_info);
|
||||||
|
|
||||||
if (length > 0) {
|
if (length > 0) {
|
||||||
ruby_args = rb_ary_tmp_new(length);
|
ruby_args = rb_ary_tmp_new(length);
|
||||||
}
|
}
|
||||||
|
|
||||||
for (int i = 0; i < length; i++) {
|
for (int i = 0; i < length; i++) {
|
||||||
Local<Value> value = ((*args)[i]).As<Value>();
|
Local<Value> value = ((*args)[i]).As<Value>();
|
||||||
VALUE tmp = convert_v8_to_ruby(args->GetIsolate(),
|
VALUE tmp = convert_v8_to_ruby(args->GetIsolate(),
|
||||||
*context_info->context, value);
|
*context_info->context, value);
|
||||||
rb_ary_push(ruby_args, tmp);
|
rb_ary_push(ruby_args, tmp);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// may raise exception stay clear of handle scope
|
// may raise exception stay clear of handle scope
|
||||||
|
|
@ -918,31 +917,31 @@ gvl_ruby_callback(void* data) {
|
||||||
callback_data.failed = false;
|
callback_data.failed = false;
|
||||||
|
|
||||||
if ((bool)args->GetIsolate()->GetData(DO_TERMINATE) == true) {
|
if ((bool)args->GetIsolate()->GetData(DO_TERMINATE) == true) {
|
||||||
args->GetIsolate()->ThrowException(String::NewFromUtf8(args->GetIsolate(), "Terminated execution during transition from Ruby to JS"));
|
args->GetIsolate()->ThrowException(String::NewFromUtf8(args->GetIsolate(), "Terminated execution during transition from Ruby to JS"));
|
||||||
args->GetIsolate()->TerminateExecution();
|
args->GetIsolate()->TerminateExecution();
|
||||||
if (length > 0) {
|
if (length > 0) {
|
||||||
rb_ary_clear(ruby_args);
|
rb_ary_clear(ruby_args);
|
||||||
rb_gc_force_recycle(ruby_args);
|
rb_gc_force_recycle(ruby_args);
|
||||||
}
|
}
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
result = rb_rescue2((VALUE(*)(...))&protected_callback, (VALUE)(&callback_data),
|
result = rb_rescue2((VALUE(*)(...))&protected_callback, (VALUE)(&callback_data),
|
||||||
(VALUE(*)(...))&rescue_callback, (VALUE)(&callback_data), rb_eException, (VALUE)0);
|
(VALUE(*)(...))&rescue_callback, (VALUE)(&callback_data), rb_eException, (VALUE)0);
|
||||||
|
|
||||||
if(callback_data.failed) {
|
if(callback_data.failed) {
|
||||||
rb_iv_set(parent, "@current_exception", result);
|
rb_iv_set(parent, "@current_exception", result);
|
||||||
args->GetIsolate()->ThrowException(String::NewFromUtf8(args->GetIsolate(), "Ruby exception"));
|
args->GetIsolate()->ThrowException(String::NewFromUtf8(args->GetIsolate(), "Ruby exception"));
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
HandleScope scope(args->GetIsolate());
|
HandleScope scope(args->GetIsolate());
|
||||||
Handle<Value> v8_result = convert_ruby_to_v8(args->GetIsolate(), result);
|
Handle<Value> v8_result = convert_ruby_to_v8(args->GetIsolate(), result);
|
||||||
args->GetReturnValue().Set(v8_result);
|
args->GetReturnValue().Set(v8_result);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (length > 0) {
|
if (length > 0) {
|
||||||
rb_ary_clear(ruby_args);
|
rb_ary_clear(ruby_args);
|
||||||
rb_gc_force_recycle(ruby_args);
|
rb_gc_force_recycle(ruby_args);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((bool)args->GetIsolate()->GetData(DO_TERMINATE) == true) {
|
if ((bool)args->GetIsolate()->GetData(DO_TERMINATE) == true) {
|
||||||
|
|
@ -957,11 +956,11 @@ static void ruby_callback(const FunctionCallbackInfo<Value>& args) {
|
||||||
bool has_gvl = (bool)args.GetIsolate()->GetData(IN_GVL);
|
bool has_gvl = (bool)args.GetIsolate()->GetData(IN_GVL);
|
||||||
|
|
||||||
if(has_gvl) {
|
if(has_gvl) {
|
||||||
gvl_ruby_callback((void*)&args);
|
gvl_ruby_callback((void*)&args);
|
||||||
} else {
|
} else {
|
||||||
args.GetIsolate()->SetData(IN_GVL, (void*)true);
|
args.GetIsolate()->SetData(IN_GVL, (void*)true);
|
||||||
rb_thread_call_with_gvl(gvl_ruby_callback, (void*)(&args));
|
rb_thread_call_with_gvl(gvl_ruby_callback, (void*)(&args));
|
||||||
args.GetIsolate()->SetData(IN_GVL, (void*)false);
|
args.GetIsolate()->SetData(IN_GVL, (void*)false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -982,55 +981,55 @@ static VALUE rb_external_function_notify_v8(VALUE self) {
|
||||||
Isolate* isolate = context_info->isolate_info->isolate;
|
Isolate* isolate = context_info->isolate_info->isolate;
|
||||||
|
|
||||||
{
|
{
|
||||||
Locker lock(isolate);
|
Locker lock(isolate);
|
||||||
Isolate::Scope isolate_scope(isolate);
|
Isolate::Scope isolate_scope(isolate);
|
||||||
HandleScope handle_scope(isolate);
|
HandleScope handle_scope(isolate);
|
||||||
|
|
||||||
Local<Context> context = context_info->context->Get(isolate);
|
Local<Context> context = context_info->context->Get(isolate);
|
||||||
Context::Scope context_scope(context);
|
Context::Scope context_scope(context);
|
||||||
|
|
||||||
Local<String> v8_str = String::NewFromUtf8(isolate, RSTRING_PTR(name),
|
Local<String> v8_str = String::NewFromUtf8(isolate, RSTRING_PTR(name),
|
||||||
NewStringType::kNormal, (int)RSTRING_LEN(name)).ToLocalChecked();
|
NewStringType::kNormal, (int)RSTRING_LEN(name)).ToLocalChecked();
|
||||||
|
|
||||||
// copy self so we can access from v8 external
|
// copy self so we can access from v8 external
|
||||||
VALUE* self_copy;
|
VALUE* self_copy;
|
||||||
Data_Get_Struct(self, VALUE, self_copy);
|
Data_Get_Struct(self, VALUE, self_copy);
|
||||||
*self_copy = self;
|
*self_copy = self;
|
||||||
|
|
||||||
Local<Value> external = External::New(isolate, self_copy);
|
Local<Value> external = External::New(isolate, self_copy);
|
||||||
|
|
||||||
if (parent_object == Qnil) {
|
if (parent_object == Qnil) {
|
||||||
context->Global()->Set(v8_str, FunctionTemplate::New(isolate, ruby_callback, external)->GetFunction());
|
context->Global()->Set(v8_str, FunctionTemplate::New(isolate, ruby_callback, external)->GetFunction());
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
Local<String> eval = String::NewFromUtf8(isolate, RSTRING_PTR(parent_object_eval),
|
Local<String> eval = String::NewFromUtf8(isolate, RSTRING_PTR(parent_object_eval),
|
||||||
NewStringType::kNormal, (int)RSTRING_LEN(parent_object_eval)).ToLocalChecked();
|
NewStringType::kNormal, (int)RSTRING_LEN(parent_object_eval)).ToLocalChecked();
|
||||||
|
|
||||||
MaybeLocal<Script> parsed_script = Script::Compile(context, eval);
|
MaybeLocal<Script> parsed_script = Script::Compile(context, eval);
|
||||||
if (parsed_script.IsEmpty()) {
|
if (parsed_script.IsEmpty()) {
|
||||||
parse_error = true;
|
parse_error = true;
|
||||||
} else {
|
} else {
|
||||||
MaybeLocal<Value> maybe_value = parsed_script.ToLocalChecked()->Run(context);
|
MaybeLocal<Value> maybe_value = parsed_script.ToLocalChecked()->Run(context);
|
||||||
attach_error = true;
|
attach_error = true;
|
||||||
|
|
||||||
if (!maybe_value.IsEmpty()) {
|
if (!maybe_value.IsEmpty()) {
|
||||||
Local<Value> value = maybe_value.ToLocalChecked();
|
Local<Value> value = maybe_value.ToLocalChecked();
|
||||||
if (value->IsObject()){
|
if (value->IsObject()){
|
||||||
value.As<Object>()->Set(v8_str, FunctionTemplate::New(isolate, ruby_callback, external)->GetFunction());
|
value.As<Object>()->Set(v8_str, FunctionTemplate::New(isolate, ruby_callback, external)->GetFunction());
|
||||||
attach_error = false;
|
attach_error = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// always raise out of V8 context
|
// always raise out of V8 context
|
||||||
if (parse_error) {
|
if (parse_error) {
|
||||||
rb_raise(rb_eParseError, "Invalid object %" PRIsVALUE, parent_object);
|
rb_raise(rb_eParseError, "Invalid object %" PRIsVALUE, parent_object);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (attach_error) {
|
if (attach_error) {
|
||||||
rb_raise(rb_eParseError, "Was expecting %" PRIsVALUE" to be an object", parent_object);
|
rb_raise(rb_eParseError, "Was expecting %" PRIsVALUE" to be an object", parent_object);
|
||||||
}
|
}
|
||||||
|
|
||||||
return Qnil;
|
return Qnil;
|
||||||
|
|
@ -1050,19 +1049,19 @@ static VALUE rb_context_isolate_mutex(VALUE self) {
|
||||||
void free_isolate(IsolateInfo* isolate_info) {
|
void free_isolate(IsolateInfo* isolate_info) {
|
||||||
|
|
||||||
if (isolate_info->isolate) {
|
if (isolate_info->isolate) {
|
||||||
Locker lock(isolate_info->isolate);
|
Locker lock(isolate_info->isolate);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isolate_info->isolate) {
|
if (isolate_info->isolate) {
|
||||||
if (isolate_info->interrupted) {
|
if (isolate_info->interrupted) {
|
||||||
fprintf(stderr, "WARNING: V8 isolate was interrupted by Ruby, it can not be disposed and memory will not be reclaimed till the Ruby process exits.\n");
|
fprintf(stderr, "WARNING: V8 isolate was interrupted by Ruby, it can not be disposed and memory will not be reclaimed till the Ruby process exits.\n");
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
if (isolate_info->pid != getpid()) {
|
if (isolate_info->pid != getpid()) {
|
||||||
fprintf(stderr, "WARNING: V8 isolate was forked, it can not be disposed and memory will not be reclaimed till the Ruby process exits.\n");
|
fprintf(stderr, "WARNING: V8 isolate was forked, it can not be disposed and memory will not be reclaimed till the Ruby process exits.\n");
|
||||||
} else {
|
} else {
|
||||||
isolate_info->isolate->Dispose();
|
isolate_info->isolate->Dispose();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
isolate_info->isolate = NULL;
|
isolate_info->isolate = NULL;
|
||||||
}
|
}
|
||||||
|
|
@ -1105,17 +1104,17 @@ static void free_context(ContextInfo* context_info) {
|
||||||
context_info_copy->context = context_info->context;
|
context_info_copy->context = context_info->context;
|
||||||
|
|
||||||
if (isolate_info && isolate_info->refs() > 1) {
|
if (isolate_info && isolate_info->refs() > 1) {
|
||||||
pthread_t free_context_thread;
|
pthread_t free_context_thread;
|
||||||
if (pthread_create(&free_context_thread, NULL, free_context_raw, (void*)context_info_copy)) {
|
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");
|
fprintf(stderr, "WARNING failed to release memory in MiniRacer, thread to release could not be created, process will leak memory\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
free_context_raw(context_info_copy);
|
free_context_raw(context_info_copy);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (context_info->context && isolate_info && isolate_info->isolate) {
|
if (context_info->context && isolate_info && isolate_info->isolate) {
|
||||||
context_info->context = NULL;
|
context_info->context = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isolate_info) {
|
if (isolate_info) {
|
||||||
|
|
@ -1201,20 +1200,20 @@ rb_heap_stats(VALUE self) {
|
||||||
|
|
||||||
if (!isolate) {
|
if (!isolate) {
|
||||||
|
|
||||||
rb_hash_aset(rval, ID2SYM(rb_intern("total_physical_size")), ULONG2NUM(0));
|
rb_hash_aset(rval, ID2SYM(rb_intern("total_physical_size")), ULONG2NUM(0));
|
||||||
rb_hash_aset(rval, ID2SYM(rb_intern("total_heap_size_executable")), ULONG2NUM(0));
|
rb_hash_aset(rval, ID2SYM(rb_intern("total_heap_size_executable")), ULONG2NUM(0));
|
||||||
rb_hash_aset(rval, ID2SYM(rb_intern("total_heap_size")), ULONG2NUM(0));
|
rb_hash_aset(rval, ID2SYM(rb_intern("total_heap_size")), ULONG2NUM(0));
|
||||||
rb_hash_aset(rval, ID2SYM(rb_intern("used_heap_size")), ULONG2NUM(0));
|
rb_hash_aset(rval, ID2SYM(rb_intern("used_heap_size")), ULONG2NUM(0));
|
||||||
rb_hash_aset(rval, ID2SYM(rb_intern("heap_size_limit")), ULONG2NUM(0));
|
rb_hash_aset(rval, ID2SYM(rb_intern("heap_size_limit")), ULONG2NUM(0));
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
isolate->GetHeapStatistics(&stats);
|
isolate->GetHeapStatistics(&stats);
|
||||||
|
|
||||||
rb_hash_aset(rval, ID2SYM(rb_intern("total_physical_size")), ULONG2NUM(stats.total_physical_size()));
|
rb_hash_aset(rval, ID2SYM(rb_intern("total_physical_size")), ULONG2NUM(stats.total_physical_size()));
|
||||||
rb_hash_aset(rval, ID2SYM(rb_intern("total_heap_size_executable")), ULONG2NUM(stats.total_heap_size_executable()));
|
rb_hash_aset(rval, ID2SYM(rb_intern("total_heap_size_executable")), ULONG2NUM(stats.total_heap_size_executable()));
|
||||||
rb_hash_aset(rval, ID2SYM(rb_intern("total_heap_size")), ULONG2NUM(stats.total_heap_size()));
|
rb_hash_aset(rval, ID2SYM(rb_intern("total_heap_size")), ULONG2NUM(stats.total_heap_size()));
|
||||||
rb_hash_aset(rval, ID2SYM(rb_intern("used_heap_size")), ULONG2NUM(stats.used_heap_size()));
|
rb_hash_aset(rval, ID2SYM(rb_intern("used_heap_size")), ULONG2NUM(stats.used_heap_size()));
|
||||||
rb_hash_aset(rval, ID2SYM(rb_intern("heap_size_limit")), ULONG2NUM(stats.heap_size_limit()));
|
rb_hash_aset(rval, ID2SYM(rb_intern("heap_size_limit")), ULONG2NUM(stats.heap_size_limit()));
|
||||||
}
|
}
|
||||||
|
|
||||||
return rval;
|
return rval;
|
||||||
|
|
@ -1287,8 +1286,7 @@ static void unblock_function(void *args) {
|
||||||
call->context_info->isolate_info->interrupted = true;
|
call->context_info->isolate_info->interrupted = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static VALUE
|
static VALUE rb_context_call_unsafe(int argc, VALUE *argv, VALUE self) {
|
||||||
rb_context_call_unsafe(int argc, VALUE *argv, VALUE self) {
|
|
||||||
ContextInfo* context_info;
|
ContextInfo* context_info;
|
||||||
FunctionCall call;
|
FunctionCall call;
|
||||||
VALUE *call_argv = NULL;
|
VALUE *call_argv = NULL;
|
||||||
|
|
@ -1321,7 +1319,6 @@ rb_context_call_unsafe(int argc, VALUE *argv, VALUE self) {
|
||||||
}
|
}
|
||||||
|
|
||||||
bool missingFunction = false;
|
bool missingFunction = false;
|
||||||
|
|
||||||
{
|
{
|
||||||
Locker lock(isolate);
|
Locker lock(isolate);
|
||||||
Isolate::Scope isolate_scope(isolate);
|
Isolate::Scope isolate_scope(isolate);
|
||||||
|
|
@ -1332,35 +1329,34 @@ rb_context_call_unsafe(int argc, VALUE *argv, VALUE self) {
|
||||||
|
|
||||||
// examples of such usage can be found in
|
// examples of such usage can be found in
|
||||||
// https://github.com/v8/v8/blob/36b32aa28db5e993312f4588d60aad5c8330c8a5/test/cctest/test-api.cc#L15711
|
// https://github.com/v8/v8/blob/36b32aa28db5e993312f4588d60aad5c8330c8a5/test/cctest/test-api.cc#L15711
|
||||||
Local<String> fname = String::NewFromUtf8(isolate, call.function_name);
|
Local<String> fname = String::NewFromUtf8(isolate, call.function_name);
|
||||||
MaybeLocal<v8::Value> val = context->Global()->Get(fname);
|
MaybeLocal<v8::Value> val = context->Global()->Get(fname);
|
||||||
|
|
||||||
if (val.IsEmpty() || !val.ToLocalChecked()->IsFunction()) {
|
if (val.IsEmpty() || !val.ToLocalChecked()->IsFunction()) {
|
||||||
missingFunction = true;
|
missingFunction = true;
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
Local<v8::Function> fun = Local<v8::Function>::Cast(val.ToLocalChecked());
|
Local<v8::Function> fun = Local<v8::Function>::Cast(val.ToLocalChecked());
|
||||||
call.fun = fun;
|
call.fun = fun;
|
||||||
int fun_argc = call.argc;
|
int fun_argc = call.argc;
|
||||||
|
|
||||||
if (fun_argc > 0) {
|
if (fun_argc > 0) {
|
||||||
call.argv = (v8::Local<Value> *) malloc(sizeof(void *) * fun_argc);
|
call.argv = (v8::Local<Value> *) malloc(sizeof(void *) * fun_argc);
|
||||||
if (!call.argv) {
|
if (!call.argv) {
|
||||||
return Qnil;
|
return Qnil;
|
||||||
}
|
}
|
||||||
for(int i=0; i < fun_argc; i++) {
|
for(int i=0; i < fun_argc; i++) {
|
||||||
call.argv[i] = convert_ruby_to_v8(isolate, call_argv[i]);
|
call.argv[i] = convert_ruby_to_v8(isolate, call_argv[i]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
rb_thread_call_without_gvl(nogvl_context_call, &call, unblock_function, &call);
|
||||||
|
free(call.argv);
|
||||||
|
|
||||||
rb_thread_call_without_gvl(nogvl_context_call, &call, unblock_function, &call);
|
}
|
||||||
free(call.argv);
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (missingFunction) {
|
if (missingFunction) {
|
||||||
rb_raise(rb_eScriptRuntimeError, "Unknown JavaScript method invoked");
|
rb_raise(rb_eScriptRuntimeError, "Unknown JavaScript method invoked");
|
||||||
}
|
}
|
||||||
|
|
||||||
return convert_result_to_ruby(self, call.result);
|
return convert_result_to_ruby(self, call.result);
|
||||||
|
|
@ -1383,53 +1379,52 @@ extern "C" {
|
||||||
|
|
||||||
void Init_mini_racer_extension ( void )
|
void Init_mini_racer_extension ( void )
|
||||||
{
|
{
|
||||||
VALUE rb_mMiniRacer = rb_define_module("MiniRacer");
|
VALUE rb_mMiniRacer = rb_define_module("MiniRacer");
|
||||||
rb_cContext = rb_define_class_under(rb_mMiniRacer, "Context", rb_cObject);
|
rb_cContext = rb_define_class_under(rb_mMiniRacer, "Context", rb_cObject);
|
||||||
rb_cSnapshot = rb_define_class_under(rb_mMiniRacer, "Snapshot", rb_cObject);
|
rb_cSnapshot = rb_define_class_under(rb_mMiniRacer, "Snapshot", rb_cObject);
|
||||||
rb_cIsolate = rb_define_class_under(rb_mMiniRacer, "Isolate", rb_cObject);
|
rb_cIsolate = rb_define_class_under(rb_mMiniRacer, "Isolate", rb_cObject);
|
||||||
VALUE rb_cPlatform = rb_define_class_under(rb_mMiniRacer, "Platform", rb_cObject);
|
VALUE rb_cPlatform = rb_define_class_under(rb_mMiniRacer, "Platform", rb_cObject);
|
||||||
|
|
||||||
VALUE rb_eError = rb_define_class_under(rb_mMiniRacer, "Error", rb_eStandardError);
|
VALUE rb_eError = rb_define_class_under(rb_mMiniRacer, "Error", rb_eStandardError);
|
||||||
|
|
||||||
VALUE rb_eEvalError = rb_define_class_under(rb_mMiniRacer, "EvalError", rb_eError);
|
VALUE rb_eEvalError = rb_define_class_under(rb_mMiniRacer, "EvalError", rb_eError);
|
||||||
rb_eScriptTerminatedError = rb_define_class_under(rb_mMiniRacer, "ScriptTerminatedError", rb_eEvalError);
|
rb_eScriptTerminatedError = rb_define_class_under(rb_mMiniRacer, "ScriptTerminatedError", rb_eEvalError);
|
||||||
rb_eV8OutOfMemoryError = rb_define_class_under(rb_mMiniRacer, "V8OutOfMemoryError", 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_eParseError = rb_define_class_under(rb_mMiniRacer, "ParseError", rb_eEvalError);
|
||||||
rb_eScriptRuntimeError = rb_define_class_under(rb_mMiniRacer, "RuntimeError", rb_eEvalError);
|
rb_eScriptRuntimeError = rb_define_class_under(rb_mMiniRacer, "RuntimeError", rb_eEvalError);
|
||||||
|
|
||||||
rb_cJavaScriptFunction = rb_define_class_under(rb_mMiniRacer, "JavaScriptFunction", rb_cObject);
|
rb_cJavaScriptFunction = rb_define_class_under(rb_mMiniRacer, "JavaScriptFunction", rb_cObject);
|
||||||
rb_eSnapshotError = rb_define_class_under(rb_mMiniRacer, "SnapshotError", rb_eError);
|
rb_eSnapshotError = rb_define_class_under(rb_mMiniRacer, "SnapshotError", rb_eError);
|
||||||
rb_ePlatformAlreadyInitializedError = rb_define_class_under(rb_mMiniRacer, "PlatformAlreadyInitialized", rb_eError);
|
rb_ePlatformAlreadyInitializedError = rb_define_class_under(rb_mMiniRacer, "PlatformAlreadyInitialized", rb_eError);
|
||||||
rb_cFailedV8Conversion = rb_define_class_under(rb_mMiniRacer, "FailedV8Conversion", rb_cObject);
|
rb_cFailedV8Conversion = rb_define_class_under(rb_mMiniRacer, "FailedV8Conversion", rb_cObject);
|
||||||
rb_mJSON = rb_define_module("JSON");
|
rb_mJSON = rb_define_module("JSON");
|
||||||
|
|
||||||
VALUE rb_cExternalFunction = rb_define_class_under(rb_cContext, "ExternalFunction", rb_cObject);
|
VALUE rb_cExternalFunction = rb_define_class_under(rb_cContext, "ExternalFunction", rb_cObject);
|
||||||
|
|
||||||
rb_define_method(rb_cContext, "stop", (VALUE(*)(...))&rb_context_stop, 0);
|
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, "dispose_unsafe", (VALUE(*)(...))&rb_context_dispose, 0);
|
||||||
rb_define_method(rb_cContext, "heap_stats", (VALUE(*)(...))&rb_heap_stats, 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, "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, "eval_unsafe",(VALUE(*)(...))&rb_context_eval_unsafe, 2);
|
||||||
rb_define_private_method(rb_cContext, "call_unsafe", (VALUE(*)(...))&rb_context_call_unsafe, -1);
|
rb_define_private_method(rb_cContext, "call_unsafe", (VALUE(*)(...))&rb_context_call_unsafe, -1);
|
||||||
rb_define_private_method(rb_cContext, "isolate_mutex", (VALUE(*)(...))&rb_context_isolate_mutex, 0);
|
rb_define_private_method(rb_cContext, "isolate_mutex", (VALUE(*)(...))&rb_context_isolate_mutex, 0);
|
||||||
rb_define_private_method(rb_cContext, "init_unsafe",(VALUE(*)(...))&rb_context_init_unsafe, 2);
|
rb_define_private_method(rb_cContext, "init_unsafe",(VALUE(*)(...))&rb_context_init_unsafe, 2);
|
||||||
|
|
||||||
rb_define_alloc_func(rb_cContext, allocate);
|
rb_define_alloc_func(rb_cContext, allocate);
|
||||||
rb_define_alloc_func(rb_cSnapshot, allocate_snapshot);
|
rb_define_alloc_func(rb_cSnapshot, allocate_snapshot);
|
||||||
rb_define_alloc_func(rb_cIsolate, allocate_isolate);
|
rb_define_alloc_func(rb_cIsolate, allocate_isolate);
|
||||||
|
|
||||||
rb_define_private_method(rb_cExternalFunction, "notify_v8", (VALUE(*)(...))&rb_external_function_notify_v8, 0);
|
rb_define_private_method(rb_cExternalFunction, "notify_v8", (VALUE(*)(...))&rb_external_function_notify_v8, 0);
|
||||||
rb_define_alloc_func(rb_cExternalFunction, allocate_external_function);
|
rb_define_alloc_func(rb_cExternalFunction, allocate_external_function);
|
||||||
|
|
||||||
rb_define_method(rb_cSnapshot, "size", (VALUE(*)(...))&rb_snapshot_size, 0);
|
rb_define_method(rb_cSnapshot, "size", (VALUE(*)(...))&rb_snapshot_size, 0);
|
||||||
rb_define_method(rb_cSnapshot, "dump", (VALUE(*)(...))&rb_snapshot_dump, 0);
|
rb_define_method(rb_cSnapshot, "dump", (VALUE(*)(...))&rb_snapshot_dump, 0);
|
||||||
rb_define_method(rb_cSnapshot, "warmup_unsafe!", (VALUE(*)(...))&rb_snapshot_warmup_unsafe, 1);
|
rb_define_method(rb_cSnapshot, "warmup_unsafe!", (VALUE(*)(...))&rb_snapshot_warmup_unsafe, 1);
|
||||||
rb_define_private_method(rb_cSnapshot, "load", (VALUE(*)(...))&rb_snapshot_load, 1);
|
rb_define_private_method(rb_cSnapshot, "load", (VALUE(*)(...))&rb_snapshot_load, 1);
|
||||||
|
|
||||||
rb_define_method(rb_cIsolate, "idle_notification", (VALUE(*)(...))&rb_isolate_idle_notification, 1);
|
rb_define_method(rb_cIsolate, "idle_notification", (VALUE(*)(...))&rb_isolate_idle_notification, 1);
|
||||||
rb_define_private_method(rb_cIsolate, "init_with_snapshot",(VALUE(*)(...))&rb_isolate_init_with_snapshot, 1);
|
rb_define_private_method(rb_cIsolate, "init_with_snapshot",(VALUE(*)(...))&rb_isolate_init_with_snapshot, 1);
|
||||||
|
|
||||||
rb_define_singleton_method(rb_cPlatform, "set_flag_as_str!", (VALUE(*)(...))&rb_platform_set_flag_as_str, 1);
|
rb_define_singleton_method(rb_cPlatform, "set_flag_as_str!", (VALUE(*)(...))&rb_platform_set_flag_as_str, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue