Skip to content

Commit 64c1b85

Browse files
byrootbyroot
committed
Make RClass.cc_table a managed object
For now this doesn't change anything, but now that the table is managed by GC, it opens the door to use RCU when in multi-ractor mode, hence allow unsynchornized reads.
1 parent 72ee25f commit 64c1b85

10 files changed

Lines changed: 187 additions & 159 deletions

File tree

‎gc.c‎

Lines changed: 4 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -1213,7 +1213,6 @@ classext_free(rb_classext_t *ext, bool is_prime, VALUE namespace, void *arg)
12131213
struct classext_foreach_args *args = (struct classext_foreach_args *)arg;
12141214

12151215
rb_id_table_free(RCLASSEXT_M_TBL(ext));
1216-
rb_cc_tbl_free(RCLASSEXT_CC_TBL(ext), args->klass);
12171216

12181217
if (!RCLASSEXT_SHARED_CONST_TBL(ext) && (tbl = RCLASSEXT_CONST_TBL(ext)) != NULL) {
12191218
rb_free_const_table(tbl);
@@ -1244,7 +1243,6 @@ classext_iclass_free(rb_classext_t *ext, bool is_prime, VALUE namespace, void *a
12441243
if (RCLASSEXT_CALLABLE_M_TBL(ext) != NULL) {
12451244
rb_id_table_free(RCLASSEXT_CALLABLE_M_TBL(ext));
12461245
}
1247-
rb_cc_tbl_free(RCLASSEXT_CC_TBL(ext), args->klass);
12481246

12491247
rb_class_classext_free_subclasses(ext, args->klass);
12501248

@@ -2271,24 +2269,6 @@ rb_gc_after_updating_jit_code(void)
22712269
#endif
22722270
}
22732271

2274-
static enum rb_id_table_iterator_result
2275-
cc_table_memsize_i(VALUE ccs_ptr, void *data_ptr)
2276-
{
2277-
size_t *total_size = data_ptr;
2278-
struct rb_class_cc_entries *ccs = (struct rb_class_cc_entries *)ccs_ptr;
2279-
*total_size += sizeof(*ccs);
2280-
*total_size += sizeof(ccs->entries[0]) * ccs->capa;
2281-
return ID_TABLE_CONTINUE;
2282-
}
2283-
2284-
static size_t
2285-
cc_table_memsize(struct rb_id_table *cc_table)
2286-
{
2287-
size_t total = rb_id_table_memsize(cc_table);
2288-
rb_id_table_foreach_values(cc_table, cc_table_memsize_i, &total);
2289-
return total;
2290-
}
2291-
22922272
static void
22932273
classext_memsize(rb_classext_t *ext, bool prime, VALUE namespace, void *arg)
22942274
{
@@ -2304,9 +2284,6 @@ classext_memsize(rb_classext_t *ext, bool prime, VALUE namespace, void *arg)
23042284
if (RCLASSEXT_CONST_TBL(ext)) {
23052285
s += rb_id_table_memsize(RCLASSEXT_CONST_TBL(ext));
23062286
}
2307-
if (RCLASSEXT_CC_TBL(ext)) {
2308-
s += cc_table_memsize(RCLASSEXT_CC_TBL(ext));
2309-
}
23102287
if (RCLASSEXT_SUPERCLASSES_WITH_SELF(ext)) {
23112288
s += (RCLASSEXT_SUPERCLASS_DEPTH(ext) + 1) * sizeof(VALUE);
23122289
}
@@ -2357,9 +2334,6 @@ rb_obj_memsize_of(VALUE obj)
23572334
size += rb_id_table_memsize(RCLASS_M_TBL(obj));
23582335
}
23592336
}
2360-
if (RCLASS_WRITABLE_CC_TBL(obj)) {
2361-
size += cc_table_memsize(RCLASS_WRITABLE_CC_TBL(obj));
2362-
}
23632337
break;
23642338
case T_STRING:
23652339
size += rb_str_memsize(obj);
@@ -2844,47 +2818,6 @@ mark_const_tbl(rb_objspace_t *objspace, struct rb_id_table *tbl)
28442818
rb_id_table_foreach_values(tbl, mark_const_entry_i, objspace);
28452819
}
28462820

2847-
struct mark_cc_entry_args {
2848-
rb_objspace_t *objspace;
2849-
VALUE klass;
2850-
};
2851-
2852-
static enum rb_id_table_iterator_result
2853-
mark_cc_entry_i(VALUE ccs_ptr, void *data)
2854-
{
2855-
struct rb_class_cc_entries *ccs = (struct rb_class_cc_entries *)ccs_ptr;
2856-
2857-
VM_ASSERT(vm_ccs_p(ccs));
2858-
2859-
if (METHOD_ENTRY_INVALIDATED(ccs->cme)) {
2860-
rb_vm_ccs_free(ccs);
2861-
return ID_TABLE_DELETE;
2862-
}
2863-
else {
2864-
gc_mark_internal((VALUE)ccs->cme);
2865-
2866-
for (int i=0; i<ccs->len; i++) {
2867-
VM_ASSERT(((struct mark_cc_entry_args *)data)->klass == ccs->entries[i].cc->klass);
2868-
VM_ASSERT(vm_cc_check_cme(ccs->entries[i].cc, ccs->cme));
2869-
2870-
gc_mark_internal((VALUE)ccs->entries[i].cc);
2871-
}
2872-
return ID_TABLE_CONTINUE;
2873-
}
2874-
}
2875-
2876-
static void
2877-
mark_cc_tbl(rb_objspace_t *objspace, struct rb_id_table *tbl, VALUE klass)
2878-
{
2879-
struct mark_cc_entry_args args;
2880-
2881-
if (!tbl) return;
2882-
2883-
args.objspace = objspace;
2884-
args.klass = klass;
2885-
rb_id_table_foreach_values(tbl, mark_cc_entry_i, (void *)&args);
2886-
}
2887-
28882821
static enum rb_id_table_iterator_result
28892822
mark_cvc_tbl_i(VALUE cvc_entry, void *objspace)
28902823
{
@@ -3122,7 +3055,6 @@ gc_mark_classext_module(rb_classext_t *ext, bool prime, VALUE namespace, void *a
31223055
{
31233056
struct gc_mark_classext_foreach_arg *foreach_arg = (struct gc_mark_classext_foreach_arg *)arg;
31243057
rb_objspace_t *objspace = foreach_arg->objspace;
3125-
VALUE obj = foreach_arg->obj;
31263058

31273059
if (RCLASSEXT_SUPER(ext)) {
31283060
gc_mark_internal(RCLASSEXT_SUPER(ext));
@@ -3133,7 +3065,7 @@ gc_mark_classext_module(rb_classext_t *ext, bool prime, VALUE namespace, void *a
31333065
mark_const_tbl(objspace, RCLASSEXT_CONST_TBL(ext));
31343066
}
31353067
mark_m_tbl(objspace, RCLASSEXT_CALLABLE_M_TBL(ext));
3136-
mark_cc_tbl(objspace, RCLASSEXT_CC_TBL(ext), obj);
3068+
gc_mark_internal(RCLASSEXT_CC_TBL(ext));
31373069
mark_cvc_tbl(objspace, RCLASSEXT_CVC_TBL(ext));
31383070
gc_mark_internal(RCLASSEXT_CLASSPATH(ext));
31393071
}
@@ -3143,7 +3075,6 @@ gc_mark_classext_iclass(rb_classext_t *ext, bool prime, VALUE namespace, void *a
31433075
{
31443076
struct gc_mark_classext_foreach_arg *foreach_arg = (struct gc_mark_classext_foreach_arg *)arg;
31453077
rb_objspace_t *objspace = foreach_arg->objspace;
3146-
VALUE iclass = foreach_arg->obj;
31473078

31483079
if (RCLASSEXT_SUPER(ext)) {
31493080
gc_mark_internal(RCLASSEXT_SUPER(ext));
@@ -3155,7 +3086,7 @@ gc_mark_classext_iclass(rb_classext_t *ext, bool prime, VALUE namespace, void *a
31553086
gc_mark_internal(RCLASSEXT_INCLUDER(ext));
31563087
}
31573088
mark_m_tbl(objspace, RCLASSEXT_CALLABLE_M_TBL(ext));
3158-
mark_cc_tbl(objspace, RCLASSEXT_CC_TBL(ext), iclass);
3089+
gc_mark_internal(RCLASSEXT_CC_TBL(ext));
31593090
}
31603091

31613092
#define TYPED_DATA_REFS_OFFSET_LIST(d) (size_t *)(uintptr_t)RTYPEDDATA_TYPE(d)->function.dmark
@@ -3719,33 +3650,6 @@ update_m_tbl(void *objspace, struct rb_id_table *tbl)
37193650
}
37203651
}
37213652

3722-
static enum rb_id_table_iterator_result
3723-
update_cc_tbl_i(VALUE ccs_ptr, void *objspace)
3724-
{
3725-
struct rb_class_cc_entries *ccs = (struct rb_class_cc_entries *)ccs_ptr;
3726-
VM_ASSERT(vm_ccs_p(ccs));
3727-
3728-
if (rb_gc_impl_object_moved_p(objspace, (VALUE)ccs->cme)) {
3729-
ccs->cme = (const rb_callable_method_entry_t *)gc_location_internal(objspace, (VALUE)ccs->cme);
3730-
}
3731-
3732-
for (int i=0; i<ccs->len; i++) {
3733-
if (rb_gc_impl_object_moved_p(objspace, (VALUE)ccs->entries[i].cc)) {
3734-
ccs->entries[i].cc = (struct rb_callcache *)gc_location_internal(objspace, (VALUE)ccs->entries[i].cc);
3735-
}
3736-
}
3737-
3738-
// do not replace
3739-
return ID_TABLE_CONTINUE;
3740-
}
3741-
3742-
static void
3743-
update_cc_tbl(void *objspace, struct rb_id_table *tbl)
3744-
{
3745-
if (!tbl) return;
3746-
rb_id_table_foreach_values(tbl, update_cc_tbl_i, objspace);
3747-
}
3748-
37493653
static enum rb_id_table_iterator_result
37503654
update_cvc_tbl_i(VALUE cvc_entry, void *objspace)
37513655
{
@@ -3844,7 +3748,7 @@ update_classext(rb_classext_t *ext, bool is_prime, VALUE namespace, void *arg)
38443748
if (!RCLASSEXT_SHARED_CONST_TBL(ext)) {
38453749
update_const_tbl(objspace, RCLASSEXT_CONST_TBL(ext));
38463750
}
3847-
update_cc_tbl(objspace, RCLASSEXT_CC_TBL(ext));
3751+
UPDATE_IF_MOVED(objspace, RCLASSEXT_CC_TBL(ext));
38483752
update_cvc_tbl(objspace, RCLASSEXT_CVC_TBL(ext));
38493753
update_superclasses(objspace, ext);
38503754
update_subclasses(objspace, ext);
@@ -3863,7 +3767,7 @@ update_iclass_classext(rb_classext_t *ext, bool is_prime, VALUE namespace, void
38633767
}
38643768
update_m_tbl(objspace, RCLASSEXT_M_TBL(ext));
38653769
update_m_tbl(objspace, RCLASSEXT_CALLABLE_M_TBL(ext));
3866-
update_cc_tbl(objspace, RCLASSEXT_CC_TBL(ext));
3770+
UPDATE_IF_MOVED(objspace, RCLASSEXT_CC_TBL(ext));
38673771
update_subclasses(objspace, ext);
38683772

38693773
update_classext_values(objspace, ext, true);

‎id_table.c‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ struct rb_id_table {
4747

4848
#if SIZEOF_VALUE == 8
4949
#define ITEM_GET_KEY(tbl, i) ((tbl)->items[i].key)
50-
#define ITEM_KEY_ISSET(tbl, i) ((tbl)->items[i].key)
50+
#define ITEM_KEY_ISSET(tbl, i) ((tbl)->items && (tbl)->items[i].key)
5151
#define ITEM_COLLIDED(tbl, i) ((tbl)->items[i].collision)
5252
#define ITEM_SET_COLLIDED(tbl, i) ((tbl)->items[i].collision = 1)
5353
static inline void
@@ -345,7 +345,7 @@ managed_id_table_memsize(const void *data)
345345
return rb_id_table_memsize(tbl) - sizeof(struct rb_id_table);
346346
}
347347

348-
static const rb_data_type_t managed_id_table_type = {
348+
const rb_data_type_t rb_managed_id_table_type = {
349349
.wrap_struct_name = "VM/managed_id_table",
350350
.function = {
351351
.dmark = NULL, // Nothing to mark
@@ -359,20 +359,26 @@ static inline struct rb_id_table *
359359
managed_id_table_ptr(VALUE obj)
360360
{
361361
RUBY_ASSERT(RB_TYPE_P(obj, T_DATA));
362-
RUBY_ASSERT(rb_typeddata_inherited_p(RTYPEDDATA_TYPE(obj), &managed_id_table_type));
362+
RUBY_ASSERT(rb_typeddata_inherited_p(RTYPEDDATA_TYPE(obj), &rb_managed_id_table_type));
363363

364364
return RTYPEDDATA_GET_DATA(obj);
365365
}
366366

367367
VALUE
368-
rb_managed_id_table_new(size_t capa)
368+
rb_managed_id_table_create(const rb_data_type_t *type, size_t capa)
369369
{
370370
struct rb_id_table *tbl;
371-
VALUE obj = TypedData_Make_Struct(0, struct rb_id_table, &managed_id_table_type, tbl);
371+
VALUE obj = TypedData_Make_Struct(0, struct rb_id_table, type, tbl);
372372
rb_id_table_init(tbl, capa);
373373
return obj;
374374
}
375375

376+
VALUE
377+
rb_managed_id_table_new(size_t capa)
378+
{
379+
return rb_managed_id_table_create(&rb_managed_id_table_type, capa);
380+
}
381+
376382
static enum rb_id_table_iterator_result
377383
managed_id_table_dup_i(ID id, VALUE val, void *data)
378384
{
@@ -385,7 +391,7 @@ VALUE
385391
rb_managed_id_table_dup(VALUE old_table)
386392
{
387393
struct rb_id_table *new_tbl;
388-
VALUE obj = TypedData_Make_Struct(0, struct rb_id_table, &managed_id_table_type, new_tbl);
394+
VALUE obj = TypedData_Make_Struct(0, struct rb_id_table, &rb_managed_id_table_type, new_tbl);
389395
struct rb_id_table *old_tbl = managed_id_table_ptr(old_table);
390396
rb_id_table_init(new_tbl, old_tbl->num + 1);
391397
rb_id_table_foreach(old_tbl, managed_id_table_dup_i, new_tbl);
@@ -415,3 +421,15 @@ rb_managed_id_table_foreach(VALUE table, rb_id_table_foreach_func_t *func, void
415421
{
416422
rb_id_table_foreach(managed_id_table_ptr(table), func, data);
417423
}
424+
425+
void
426+
rb_managed_id_table_foreach_values(VALUE table, rb_id_table_foreach_values_func_t *func, void *data)
427+
{
428+
rb_id_table_foreach_values(managed_id_table_ptr(table), func, data);
429+
}
430+
431+
int
432+
rb_managed_id_table_delete(VALUE table, ID id)
433+
{
434+
return rb_id_table_delete(managed_id_table_ptr(table), id);
435+
}

‎id_table.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,17 @@ void rb_id_table_foreach(struct rb_id_table *tbl, rb_id_table_foreach_func_t *fu
3535
void rb_id_table_foreach_values(struct rb_id_table *tbl, rb_id_table_foreach_values_func_t *func, void *data);
3636
void rb_id_table_foreach_values_with_replace(struct rb_id_table *tbl, rb_id_table_foreach_values_func_t *func, rb_id_table_update_value_callback_func_t *replace, void *data);
3737

38+
VALUE rb_managed_id_table_create(const rb_data_type_t *type, size_t capa);
3839
VALUE rb_managed_id_table_new(size_t capa);
3940
VALUE rb_managed_id_table_dup(VALUE table);
4041
int rb_managed_id_table_insert(VALUE table, ID id, VALUE val);
4142
int rb_managed_id_table_lookup(VALUE table, ID id, VALUE *valp);
4243
size_t rb_managed_id_table_size(VALUE table);
4344
void rb_managed_id_table_foreach(VALUE table, rb_id_table_foreach_func_t *func, void *data);
45+
void rb_managed_id_table_foreach_values(VALUE table, rb_id_table_foreach_values_func_t *func, void *data);
46+
int rb_managed_id_table_delete(VALUE table, ID id);
47+
48+
extern const rb_data_type_t rb_managed_id_table_type;
4449

4550
RUBY_SYMBOL_EXPORT_BEGIN
4651
size_t rb_id_table_size(const struct rb_id_table *tbl);

‎imemo.c‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -551,26 +551,6 @@ rb_vm_ccs_free(struct rb_class_cc_entries *ccs)
551551
vm_ccs_free(ccs, true, Qundef);
552552
}
553553

554-
static enum rb_id_table_iterator_result
555-
cc_tbl_free_i(VALUE ccs_ptr, void *data)
556-
{
557-
struct rb_class_cc_entries *ccs = (struct rb_class_cc_entries *)ccs_ptr;
558-
VALUE klass = (VALUE)data;
559-
VM_ASSERT(vm_ccs_p(ccs));
560-
561-
vm_ccs_free(ccs, false, klass);
562-
563-
return ID_TABLE_CONTINUE;
564-
}
565-
566-
void
567-
rb_cc_tbl_free(struct rb_id_table *cc_tbl, VALUE klass)
568-
{
569-
if (!cc_tbl) return;
570-
rb_id_table_foreach_values(cc_tbl, cc_tbl_free_i, (void *)klass);
571-
rb_id_table_free(cc_tbl);
572-
}
573-
574554
static inline void
575555
imemo_fields_free(struct rb_fields *fields)
576556
{

‎internal/class.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ struct rb_classext_struct {
8383
struct rb_id_table *m_tbl;
8484
struct rb_id_table *const_tbl;
8585
struct rb_id_table *callable_m_tbl;
86-
struct rb_id_table *cc_tbl; /* ID -> [[ci1, cc1], [ci2, cc2] ...] */
86+
VALUE cc_tbl; /* { ID => { cme, [cc1, cc2, ...] }, ... } */
8787
struct rb_id_table *cvc_tbl;
8888
VALUE *superclasses;
8989
/**
@@ -262,7 +262,7 @@ static inline void RCLASS_WRITE_SUPER(VALUE klass, VALUE super);
262262
static inline void RCLASS_SET_CONST_TBL(VALUE klass, struct rb_id_table *table, bool shared);
263263
static inline void RCLASS_WRITE_CONST_TBL(VALUE klass, struct rb_id_table *table, bool shared);
264264
static inline void RCLASS_WRITE_CALLABLE_M_TBL(VALUE klass, struct rb_id_table *table);
265-
static inline void RCLASS_WRITE_CC_TBL(VALUE klass, struct rb_id_table *table);
265+
static inline void RCLASS_WRITE_CC_TBL(VALUE klass, VALUE table);
266266
static inline void RCLASS_SET_CVC_TBL(VALUE klass, struct rb_id_table *table);
267267
static inline void RCLASS_WRITE_CVC_TBL(VALUE klass, struct rb_id_table *table);
268268

@@ -628,9 +628,9 @@ RCLASS_WRITE_CALLABLE_M_TBL(VALUE klass, struct rb_id_table *table)
628628
}
629629

630630
static inline void
631-
RCLASS_WRITE_CC_TBL(VALUE klass, struct rb_id_table *table)
631+
RCLASS_WRITE_CC_TBL(VALUE klass, VALUE table)
632632
{
633-
RCLASSEXT_CC_TBL(RCLASS_EXT_WRITABLE(klass)) = table;
633+
RB_OBJ_WRITE(klass, &RCLASSEXT_CC_TBL(RCLASS_EXT_WRITABLE(klass)), table);
634634
}
635635

636636
static inline void

‎internal/imemo.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@ static inline void MEMO_V2_SET(struct MEMO *m, VALUE v);
148148

149149
size_t rb_imemo_memsize(VALUE obj);
150150
void rb_imemo_mark_and_move(VALUE obj, bool reference_updating);
151-
void rb_cc_tbl_free(struct rb_id_table *cc_tbl, VALUE klass);
152151
void rb_imemo_free(VALUE obj);
153152

154153
RUBY_SYMBOL_EXPORT_BEGIN

‎method.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,6 @@ void rb_vm_delete_cc_refinement(const struct rb_callcache *cc);
259259

260260
void rb_clear_method_cache(VALUE klass_or_module, ID mid);
261261
void rb_clear_all_refinement_method_cache(void);
262-
void rb_invalidate_method_caches(struct rb_id_table *cm_tbl, struct rb_id_table *cc_tbl);
262+
void rb_invalidate_method_caches(struct rb_id_table *cm_tbl, VALUE cc_tbl);
263263

264264
#endif /* RUBY_METHOD_H */

‎vm_callinfo.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,8 @@ cc_check_class(VALUE klass)
329329
return klass;
330330
}
331331

332+
VALUE rb_vm_cc_table_create(size_t capa);
333+
332334
static inline const struct rb_callcache *
333335
vm_cc_new(VALUE klass,
334336
const struct rb_callable_method_entry_struct *cme,

0 commit comments

Comments
 (0)