kotovalexarian-likes-github/mini_racer
1
0
Fork 0
mirror of https://github.com/rubyjs/mini_racer synced 2023-03-27 23:21:28 -04:00
Code Releases Activity

Context: convert to TypedData

Browse source 
TypedData allows memsize reporting and adds some extra
type-safety checks.  Furthermore, TypedData_Make_Struct saves
us several lines of code in the allocate() function.
This commit is contained in:
Sam Saffron 2021-12-08 16:02:44 +11:00
parent 67c72acf7b
commit bae435c44f
No known key found for this signature in database
GPG key ID: B9606168D2FFD9F5
1 changed files with 27 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
ext/mini_racer_extension/mini_racer_extension.cc
View file

@ -299,6 +299,14 @@ static pthread_rwlock_t exit_lock = PTHREAD_RWLOCK_INITIALIZER;
static bool ruby_exiting = false; // guarded by exit_lock static bool ruby_exiting = false; // guarded by exit_lock
static bool single_threaded = false; static bool single_threaded = false;
static void mark_context(void *);
static void deallocate(void *);
static size_t context_memsize(const void *);
static const rb_data_type_t context_type = {
"mini_racer/context_info",
{ mark_context, deallocate, context_memsize }
};
static VALUE rb_platform_set_flag_as_str(VALUE _klass, VALUE flag_as_str) { static VALUE rb_platform_set_flag_as_str(VALUE _klass, VALUE flag_as_str) {
bool platform_already_initialized = false; bool platform_already_initialized = false;
@ -957,7 +965,7 @@ static VALUE rb_isolate_pump_message_loop(VALUE self) {
static VALUE rb_context_init_unsafe(VALUE self, VALUE isolate, VALUE snap) { static VALUE rb_context_init_unsafe(VALUE self, VALUE isolate, VALUE snap) {
ContextInfo* context_info; ContextInfo* context_info;
Data_Get_Struct(self, ContextInfo, context_info); TypedData_Get_Struct(self, ContextInfo, &context_type, context_info);
init_v8(); init_v8();
@ -1002,7 +1010,7 @@ static VALUE rb_context_init_unsafe(VALUE self, VALUE isolate, VALUE snap) {
static VALUE convert_result_to_ruby(VALUE self /* context */, static VALUE convert_result_to_ruby(VALUE self /* context */,
EvalResult& result) { EvalResult& result) {
ContextInfo *context_info; ContextInfo *context_info;
Data_Get_Struct(self, ContextInfo, context_info); TypedData_Get_Struct(self, ContextInfo, &context_type, context_info);
Isolate *isolate = context_info->isolate_info->isolate; Isolate *isolate = context_info->isolate_info->isolate;
Persistent<Context> *p_ctx = context_info->context; Persistent<Context> *p_ctx = context_info->context;
@ -1103,7 +1111,7 @@ static VALUE rb_context_eval_unsafe(VALUE self, VALUE str, VALUE filename) {
EvalResult eval_result; EvalResult eval_result;
ContextInfo* context_info; ContextInfo* context_info;
Data_Get_Struct(self, ContextInfo, context_info); TypedData_Get_Struct(self, ContextInfo, &context_type, context_info);
Isolate* isolate = context_info->isolate_info->isolate; Isolate* isolate = context_info->isolate_info->isolate;
if(TYPE(str) != T_STRING) { if(TYPE(str) != T_STRING) {
@ -1215,7 +1223,7 @@ gvl_ruby_callback(void* data) {
return NULL; return NULL;
} }
Data_Get_Struct(parent, ContextInfo, context_info); TypedData_Get_Struct(parent, ContextInfo, &context_type, context_info);
if (length > 0) { if (length > 0) {
ruby_args = rb_ary_tmp_new(length); ruby_args = rb_ary_tmp_new(length);
@ -1302,7 +1310,7 @@ static VALUE rb_external_function_notify_v8(VALUE self) {
bool parse_error = false; bool parse_error = false;
bool attach_error = false; bool attach_error = false;
Data_Get_Struct(parent, ContextInfo, context_info); TypedData_Get_Struct(parent, ContextInfo, &context_type, context_info);
Isolate* isolate = context_info->isolate_info->isolate; Isolate* isolate = context_info->isolate_info->isolate;
{ {
@ -1380,7 +1388,7 @@ static VALUE rb_external_function_notify_v8(VALUE self) {
static VALUE rb_context_isolate_mutex(VALUE self) { static VALUE rb_context_isolate_mutex(VALUE self) {
ContextInfo* context_info; ContextInfo* context_info;
Data_Get_Struct(self, ContextInfo, context_info); TypedData_Get_Struct(self, ContextInfo, &context_type, context_info);
if (!context_info->isolate_info) { if (!context_info->isolate_info) {
rb_raise(rb_eScriptRuntimeError, "Context has no Isolate available anymore"); rb_raise(rb_eScriptRuntimeError, "Context has no Isolate available anymore");
@ -1498,6 +1506,11 @@ static void deallocate(void* data) {
xfree(data); xfree(data);
} }
static size_t context_memsize(const void *ptr)
{
return sizeof(ContextInfo);
}
static void mark_context(void* data) { static void mark_context(void* data) {
ContextInfo* context_info = (ContextInfo*)data; ContextInfo* context_info = (ContextInfo*)data;
if (context_info->isolate_info) { if (context_info->isolate_info) {
@ -1521,11 +1534,8 @@ static VALUE allocate_external_function(VALUE klass) {
} }
static VALUE allocate(VALUE klass) { static VALUE allocate(VALUE klass) {
ContextInfo* context_info = ALLOC(ContextInfo); ContextInfo* context_info;
context_info->isolate_info = NULL; return TypedData_Make_Struct(klass, ContextInfo, &context_type, context_info);
context_info->context = NULL;
return Data_Wrap_Struct(klass, mark_context, deallocate, (void*)context_info);
} }
static VALUE allocate_snapshot(VALUE klass) { static VALUE allocate_snapshot(VALUE klass) {
@ -1546,7 +1556,7 @@ static VALUE
rb_heap_stats(VALUE self) { rb_heap_stats(VALUE self) {
ContextInfo* context_info; ContextInfo* context_info;
Data_Get_Struct(self, ContextInfo, context_info); TypedData_Get_Struct(self, ContextInfo, &context_type, context_info);
Isolate* isolate; Isolate* isolate;
v8::HeapStatistics stats; v8::HeapStatistics stats;
@ -1616,7 +1626,7 @@ rb_heap_snapshot(VALUE self, VALUE file) {
ContextInfo* context_info; ContextInfo* context_info;
Data_Get_Struct(self, ContextInfo, context_info); TypedData_Get_Struct(self, ContextInfo, &context_type, context_info);
Isolate* isolate; Isolate* isolate;
isolate = context_info->isolate_info ? context_info->isolate_info->isolate : NULL; isolate = context_info->isolate_info ? context_info->isolate_info->isolate : NULL;
@ -1644,7 +1654,7 @@ static VALUE
rb_context_stop(VALUE self) { rb_context_stop(VALUE self) {
ContextInfo* context_info; ContextInfo* context_info;
Data_Get_Struct(self, ContextInfo, context_info); TypedData_Get_Struct(self, ContextInfo, &context_type, context_info);
Isolate* isolate = context_info->isolate_info->isolate; Isolate* isolate = context_info->isolate_info->isolate;
@ -1661,7 +1671,7 @@ static VALUE
rb_context_dispose(VALUE self) { rb_context_dispose(VALUE self) {
ContextInfo* context_info; ContextInfo* context_info;
Data_Get_Struct(self, ContextInfo, context_info); TypedData_Get_Struct(self, ContextInfo, &context_type, context_info);
free_context(context_info); free_context(context_info);
@ -1724,7 +1734,7 @@ static VALUE rb_context_call_unsafe(int argc, VALUE *argv, VALUE self) {
FunctionCall call; FunctionCall call;
VALUE *call_argv = NULL; VALUE *call_argv = NULL;
Data_Get_Struct(self, ContextInfo, context_info); TypedData_Get_Struct(self, ContextInfo, &context_type, context_info);
Isolate* isolate = context_info->isolate_info->isolate; Isolate* isolate = context_info->isolate_info->isolate;
if (argc < 1) { if (argc < 1) {
@ -1814,7 +1824,7 @@ static VALUE rb_context_call_unsafe(int argc, VALUE *argv, VALUE self) {
static VALUE rb_context_create_isolate_value(VALUE self) { static VALUE rb_context_create_isolate_value(VALUE self) {
ContextInfo* context_info; ContextInfo* context_info;
Data_Get_Struct(self, ContextInfo, context_info); TypedData_Get_Struct(self, ContextInfo, &context_type, context_info);
IsolateInfo *isolate_info = context_info->isolate_info; IsolateInfo *isolate_info = context_info->isolate_info;
if (!isolate_info) { if (!isolate_info) {