Change backtrace prefix of thread ID to 1-based

kpamnany · kpamnany · commit 1dd5dbfaffef · 2023-10-02T18:24:55.000-04:00
diff --git a/src/stackwalk.c b/src/stackwalk.c
@@ -662,7 +662,7 @@ void jl_print_bt_entry_codeloc(int sig, jl_bt_element_t *bt_entry) JL_NOTSAFEPOI
     if (sig != -1) {
         snprintf(sig_str, 32, "signal (%d) ", sig);
     }
-    snprintf(pre_str, 64, "%sthread (%d) ", sig_str, jl_threadid());
+    snprintf(pre_str, 64, "%sthread (%d) ", sig_str, jl_threadid() + 1);
 
     if (jl_bt_is_native(bt_entry)) {
         jl_print_native_codeloc(pre_str, bt_entry[0].uintptr);
@@ -1118,7 +1118,7 @@ static void jl_rec_backtrace(jl_task_t *t) JL_NOTSAFEPOINT
 JL_DLLEXPORT void jl_gdblookup(void* ip)
 {
     char pre_str[64];
-    snprintf(pre_str, 64, "thread (%d) ", jl_threadid());
+    snprintf(pre_str, 64, "thread (%d) ", jl_threadid() + 1);
     jl_print_native_codeloc(pre_str, (uintptr_t)ip);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -662,7 +662,7 @@ void jl_print_bt_entry_codeloc(int sig, jl_bt_element_t *bt_entry) JL_NOTSAFEPOI`
`662`	`662`	`if (sig != -1) {`
`663`	`663`	`snprintf(sig_str, 32, "signal (%d) ", sig);`
`664`	`664`	`}`
`665`		`- snprintf(pre_str, 64, "%sthread (%d) ", sig_str, jl_threadid());`
	`665`	`+ snprintf(pre_str, 64, "%sthread (%d) ", sig_str, jl_threadid() + 1);`
`666`	`666`
`667`	`667`	`if (jl_bt_is_native(bt_entry)) {`
`668`	`668`	`jl_print_native_codeloc(pre_str, bt_entry[0].uintptr);`
`@@ -1118,7 +1118,7 @@ static void jl_rec_backtrace(jl_task_t *t) JL_NOTSAFEPOINT`
`1118`	`1118`	`JL_DLLEXPORT void jl_gdblookup(void* ip)`
`1119`	`1119`	`{`
`1120`	`1120`	`char pre_str[64];`
`1121`		`- snprintf(pre_str, 64, "thread (%d) ", jl_threadid());`
	`1121`	`+ snprintf(pre_str, 64, "thread (%d) ", jl_threadid() + 1);`
`1122`	`1122`	`jl_print_native_codeloc(pre_str, (uintptr_t)ip);`
`1123`	`1123`	`}`
`1124`	`1124`