win32 debug

Author: yuyichao

src/jl_uv.c

@@ -54,11 +54,13 @@ static void jl_signal_async_cb(uv_async_t *hdl)
     // This should abort the current loop and the julia code it returns to
     // or the safepoint in the callers of `uv_run` should throw the exception.
     (void)hdl;
+    jl_debug_win32_sigint();
     uv_stop(jl_io_loop);
 }
 
 void jl_wake_libuv(void)
 {
+    jl_debug_win32_sigint();
     uv_async_send(&signal_async);
 }
 

src/julia_internal.h

@@ -638,6 +638,12 @@ jl_value_t *jl_lookup_match(jl_value_t *a, jl_value_t *b, jl_svec_t **penv, jl_s
 
 unsigned jl_special_vector_alignment(size_t nfields, jl_value_t *field_type);
 
+#ifdef _OS_WINDOWS_
+#define jl_debug_win32_sigint() jl_safe_printf("%d:%s\n", GetCurrentProcessId(), __func__);
+#else
+#define jl_debug_win32_sigint()
+#endif
+
 #ifdef __cplusplus
 }
 #endif

src/safepoint.c

@@ -173,6 +173,7 @@ void jl_safepoint_wait_gc(void)
 
 void jl_safepoint_enable_sigint(void)
 {
+    jl_debug_win32_sigint();
     jl_mutex_lock_nogc(&safepoint_lock);
     // Make sure both safepoints are enabled exactly once for SIGINT.
     switch (jl_signal_pending) {
@@ -194,6 +195,7 @@ void jl_safepoint_enable_sigint(void)
 
 void jl_safepoint_defer_sigint(void)
 {
+    jl_debug_win32_sigint();
     jl_mutex_lock_nogc(&safepoint_lock);
     // Make sure the GC safepoint is disabled for SIGINT.
     if (jl_signal_pending == 2) {
@@ -205,6 +207,7 @@ void jl_safepoint_defer_sigint(void)
 
 int jl_safepoint_consume_sigint(void)
 {
+    jl_debug_win32_sigint();
     int has_signal = 0;
     jl_mutex_lock_nogc(&safepoint_lock);
     // Make sure both safepoints are disabled for SIGINT.

src/signals-win.c

@@ -43,6 +43,7 @@ static char *strsignal(int sig)
 
 static void jl_try_throw_sigint(void)
 {
+    jl_debug_win32_sigint();
     jl_tls_states_t *ptls = jl_get_ptls_states();
     jl_safepoint_enable_sigint();
     jl_wake_libuv();
@@ -78,6 +79,7 @@ void __cdecl crt_sig_handler(int sig, int num)
         break;
     case SIGINT:
         signal(SIGINT, (void (__cdecl *)(int))crt_sig_handler);
+        jl_debug_win32_sigint();
         if (exit_on_sigint)
             jl_exit(130); // 128 + SIGINT
         jl_try_throw_sigint();
@@ -126,6 +128,7 @@ HANDLE hMainThread = INVALID_HANDLE_VALUE;
 // Try to throw the exception in the master thread.
 static void jl_try_deliver_sigint(void)
 {
+    jl_debug_win32_sigint();
     jl_tls_states_t *ptls = jl_all_task_states[0].ptls;
     jl_safepoint_enable_sigint();
     jl_wake_libuv();
@@ -166,6 +169,7 @@ static void jl_try_deliver_sigint(void)
 
 static BOOL WINAPI sigint_handler(DWORD wsig) //This needs winapi types to guarantee __stdcall
 {
+    jl_debug_win32_sigint();
     int sig;
     //windows signals use different numbers from unix (raise)
     switch(wsig) {
@@ -193,6 +197,7 @@ static LONG WINAPI _exception_handler(struct _EXCEPTION_POINTERS *ExceptionInfo,
                 return EXCEPTION_CONTINUE_EXECUTION;
             case EXCEPTION_ACCESS_VIOLATION:
                 if (jl_addr_is_safepoint(ExceptionInfo->ExceptionRecord->ExceptionInformation[1])) {
+                    jl_debug_win32_sigint();
 #ifdef JULIA_ENABLE_THREADING
                     jl_set_gc_and_wait();
                     // Do not raise sigint on worker thread
@@ -260,7 +265,9 @@ static LONG WINAPI _exception_handler(struct _EXCEPTION_POINTERS *ExceptionInfo,
                 jl_safe_printf("UNKNOWN"); break;
         }
         jl_safe_printf(" at 0x%Ix -- ", (size_t)ExceptionInfo->ExceptionRecord->ExceptionAddress);
-        jl_gdblookup((uintptr_t)ExceptionInfo->ExceptionRecord->ExceptionAddress);
+        jl_safe_printf(" safepoint_addr 0x%Ix -- ",
+                       (size_t)(uintptr_t)jl_safepoint_pages);
+        /* jl_gdblookup((uintptr_t)ExceptionInfo->ExceptionRecord->ExceptionAddress); */
 
         jl_critical_error(0, ExceptionInfo->ContextRecord, jl_bt_data, &jl_bt_size);
         static int recursion = 0;