Add lock_file and lock_line to VM lock in debug mode

Author: luke-gruber

thread.c

@@ -1472,7 +1472,7 @@ rb_thread_sleep(int sec)
 static void
 rb_thread_schedule_limits(uint32_t limits_us)
 {
-    VM_ASSERT(GET_VM()->ractor.sync.lock_owner != GET_RACTOR());
+    ASSERT_vm_unlocking();
     if (!rb_thread_alone()) {
         rb_thread_t *th = GET_THREAD();
         RUBY_DEBUG_LOG("us:%u", (unsigned int)limits_us);
@@ -2596,6 +2596,7 @@ rb_threadptr_execute_interrupts(rb_thread_t *th, int blocking_timing)
     int ret = FALSE;
 
     VM_ASSERT(GET_THREAD() == th);
+    ASSERT_vm_unlocking();
 
     if (th->ec->raised_flag) return ret;
 

thread_pthread.c

@@ -1025,7 +1025,7 @@ thread_sched_to_waiting_common(struct rb_thread_sched *sched, rb_thread_t *th)
 static void
 thread_sched_to_waiting(struct rb_thread_sched *sched, rb_thread_t *th)
 {
-    VM_ASSERT(GET_VM()->ractor.sync.lock_owner != GET_RACTOR()); // never context switch with VM lock held
+    ASSERT_vm_unlocking();
     thread_sched_lock(sched, th);
     {
         thread_sched_to_waiting_common(sched, th);

vm.c

@@ -1675,7 +1675,7 @@ invoke_block_from_c_bh(rb_execution_context_t *ec, VALUE block_handler,
                        int kw_splat, VALUE passed_block_handler, const rb_cref_t *cref,
                        int is_lambda, int force_blockarg)
 {
-    VM_ASSERT(GET_VM()->ractor.sync.lock_owner != GET_RACTOR());
+    ASSERT_vm_unlocking();
   again:
     switch (vm_block_handler_type(block_handler)) {
       case block_handler_type_iseq:
@@ -1718,7 +1718,7 @@ check_block_handler(rb_execution_context_t *ec)
 static VALUE
 vm_yield_with_cref(rb_execution_context_t *ec, int argc, const VALUE *argv, int kw_splat, const rb_cref_t *cref, int is_lambda)
 {
-    VM_ASSERT(GET_VM()->ractor.sync.lock_owner != GET_RACTOR());
+    ASSERT_vm_unlocking();
     return invoke_block_from_c_bh(ec, check_block_handler(ec),
                                   argc, argv, kw_splat, VM_BLOCK_HANDLER_NONE,
                                   cref, is_lambda, FALSE);

vm_core.h

@@ -675,6 +675,10 @@ typedef struct rb_vm_struct {
             rb_nativethread_lock_t lock;
             struct rb_ractor_struct *lock_owner;
             unsigned int lock_rec;
+#if VM_CHECK_MODE > 0
+            const char *lock_file;
+            int lock_line;
+#endif
 
             // join at exit
             rb_nativethread_cond_t terminate_cond;
@@ -687,7 +691,7 @@ typedef struct rb_vm_struct {
             rb_nativethread_cond_t barrier_complete_cond;
             rb_nativethread_cond_t barrier_release_cond;
 #endif
-        } sync;
+        } sync; // VM lock
 
 #ifdef RUBY_THREAD_PTHREAD_H
         // ractor scheduling

vm_exec.c

@@ -129,7 +129,7 @@ rb_vm_get_insns_address_table(void)
 static VALUE
 vm_exec_core(rb_execution_context_t *ec)
 {
-    VM_ASSERT(GET_VM()->ractor.sync.lock_owner != GET_RACTOR());
+    ASSERT_vm_unlocking();
     register rb_control_frame_t *reg_cfp = ec->cfp;
     rb_thread_t *th;
 

vm_sync.c

@@ -27,7 +27,14 @@ void
 RUBY_ASSERT_vm_unlocking(void)
 {
     rb_vm_t *vm = GET_VM();
-    VM_ASSERT(!vm_locked(vm));
+    if (vm_locked(vm)) {
+        const char *file = vm->ractor.sync.lock_file;
+        int line = vm->ractor.sync.lock_line;
+        if (file) {
+            fprintf(stderr, "Last locked at %s:%d\n", file, line);
+        }
+        VM_ASSERT(!vm_locked(vm));
+    }
 }
 #endif
 
@@ -75,6 +82,11 @@ vm_lock_enter(rb_ractor_t *cr, rb_vm_t *vm, bool locked, bool no_barrier, unsign
         VM_ASSERT(vm->ractor.sync.lock_owner == NULL);
         VM_ASSERT(vm->ractor.sync.lock_rec == 0);
 
+#if VM_CHECK_MODE > 0
+        vm->ractor.sync.lock_file = file;
+        vm->ractor.sync.lock_line = line;
+#endif
+
         // barrier
         if (vm_need_barrier(no_barrier, cr, vm)) {
             rb_execution_context_t *ec = GET_EC();

vm_sync.h

@@ -4,7 +4,7 @@
 #include "vm_debug.h"
 #include "debug_counter.h"
 
-#if USE_RUBY_DEBUG_LOG
+#if USE_RUBY_DEBUG_LOG || RUBY_DEBUG > 0 || VM_CHECK_MODE > 0
 #define LOCATION_ARGS const char *file, int line
 #define LOCATION_PARAMS file, line
 #define APPEND_LOCATION_ARGS , const char *file, int line