1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Embed rb_gc_function_map_t in rb_vm_t

Browse Source 
Avoids a pointer indirection and memory allocation.
This commit is contained in:
Peter Zhu 2024-04-24 12:18:48 -04:00
parent b50e1e68b6
commit f248e1008a
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gc.c
View File

@ -1890,9 +1890,6 @@ static void *rb_gc_impl_objspace_alloc(void);
void void
ruby_external_gc_init() ruby_external_gc_init()
{ {
rb_gc_function_map_t *map = malloc(sizeof(rb_gc_function_map_t));
rb_gc_functions = map;
char *gc_so_path = getenv("RUBY_GC_LIBRARY_PATH"); char *gc_so_path = getenv("RUBY_GC_LIBRARY_PATH");
void *handle = NULL; void *handle = NULL;
if (gc_so_path) { if (gc_so_path) {
@ -1905,13 +1902,13 @@ ruby_external_gc_init()
# define load_external_gc_func(name) do { \ # define load_external_gc_func(name) do { \
if (handle) { \ if (handle) { \
map->name = dln_symbol(handle, "rb_gc_impl_" #name); \ rb_gc_functions->name = dln_symbol(handle, "rb_gc_impl_" #name); \
if (!map->name) { \ if (!rb_gc_functions->name) { \
rb_bug("ruby_external_gc_init: " #name " func not exported by library %s", gc_so_path); \ rb_bug("ruby_external_gc_init: " #name " func not exported by library %s", gc_so_path); \
} \ } \
} \ } \
else { \ else { \
map->name = rb_gc_impl_##name; \ rb_gc_functions->name = rb_gc_impl_##name; \
} \ } \
} while (0) } while (0)

4
vm_core.h
View File

@ -111,7 +111,7 @@ typedef struct gc_function_map {
void *(*objspace_alloc)(void); void *(*objspace_alloc)(void);
} rb_gc_function_map_t; } rb_gc_function_map_t;
#define rb_gc_functions (GET_VM()->gc_functions_map) #define rb_gc_functions (&GET_VM()->gc_functions_map)
#endif #endif
/* /*
@ -761,7 +761,7 @@ typedef struct rb_vm_struct {
struct rb_objspace *objspace; struct rb_objspace *objspace;
#if USE_SHARED_GC #if USE_SHARED_GC
rb_gc_function_map_t *gc_functions_map; rb_gc_function_map_t gc_functions_map;
#endif #endif
rb_at_exit_list *at_exit; rb_at_exit_list *at_exit;