| author |  Andrew Kelley <andrew@ziglang.org> 2021-01-01 14:56:26-07:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2021-01-01 14:56:26-07:00 |
| log | c24540d263c6190ad48eee313079dd5d36bed1d6 |
| tree | 3ba0a4865d1dfa927583d5af121e59fa377c3076 |
| parent | c9756ca0e16a669263e003b02d21152622db42cc |
std.debug: adjust panic message
also extern "c" instead of extern "pthread"2 files changed, 3 insertions(+), 3 deletions(-)
lib
lib/std/c/freebsd.zig+1-1
| ... | @@ -13,7 +13,7 @@ pub extern "c" fn getdents(fd: c_int, buf_ptr: [*]u8, nbytes: usize) usize; | ... | @@ -13,7 +13,7 @@ pub extern "c" fn getdents(fd: c_int, buf_ptr: [*]u8, nbytes: usize) usize; |
| 13 | pub extern "c" fn sigaltstack(ss: ?*stack_t, old_ss: ?*stack_t) c_int; | 13 | pub extern "c" fn sigaltstack(ss: ?*stack_t, old_ss: ?*stack_t) c_int; |
| 14 | pub extern "c" fn getrandom(buf_ptr: [*]u8, buf_len: usize, flags: c_uint) isize; | 14 | pub extern "c" fn getrandom(buf_ptr: [*]u8, buf_len: usize, flags: c_uint) isize; |
| 15 | 15 | ||
| 16 | pub extern "pthread" fn pthread_getthreadid_np() c_int; | 16 | pub extern "c" fn pthread_getthreadid_np() c_int; |
| 17 | 17 | ||
| 18 | pub extern "c" fn posix_memalign(memptr: *?*c_void, alignment: usize, size: usize) c_int; | 18 | pub extern "c" fn posix_memalign(memptr: *?*c_void, alignment: usize, size: usize) c_int; |
| 19 | pub extern "c" fn malloc_usable_size(?*const c_void) usize; | 19 | pub extern "c" fn malloc_usable_size(?*const c_void) usize; |
lib/std/debug.zig+2-2
| ... | @@ -263,10 +263,10 @@ pub fn panicExtra(trace: ?*const builtin.StackTrace, first_trace_addr: ?usize, c | ... | @@ -263,10 +263,10 @@ pub fn panicExtra(trace: ?*const builtin.StackTrace, first_trace_addr: ?usize, c |
| 263 | 263 | ||
| 264 | const stderr = io.getStdErr().writer(); | 264 | const stderr = io.getStdErr().writer(); |
| 265 | if (builtin.single_threaded) { | 265 | if (builtin.single_threaded) { |
| 266 | stderr.print("main thread panicked: ", .{}) catch os.abort(); | 266 | stderr.print("panic: ", .{}) catch os.abort(); |
| 267 | } else { | 267 | } else { |
| 268 | const current_thread_id = std.Thread.getCurrentThreadId(); | 268 | const current_thread_id = std.Thread.getCurrentThreadId(); |
| 269 | stderr.print("thread {d} panicked: ", .{current_thread_id}) catch os.abort(); | 269 | stderr.print("thread {d} panic: ", .{current_thread_id}) catch os.abort(); |
| 270 | } | 270 | } |
| 271 | stderr.print(format ++ "\n", args) catch os.abort(); | 271 | stderr.print(format ++ "\n", args) catch os.abort(); |
| 272 | if (trace) |t| { | 272 | if (trace) |t| { |