log: fix panic on mutex destroy, when exiting a program, while a thread is still logging

spytheman · spytheman · commit b9d057118cd4 · 2025-02-24T18:28:27.000+02:00
diff --git a/vlib/builtin/builtin.c.v b/vlib/builtin/builtin.c.v
@@ -6,11 +6,6 @@ pub type FnExitCb = fn ()
 fn C.atexit(f FnExitCb) int
 fn C.strerror(int) &char
 
-@[noreturn]
-fn vhalt() {
-	for {}
-}
-
 @[markused]
 fn v_segmentation_fault_handler(signal_number i32) {
 	$if freestanding {
@@ -99,7 +94,7 @@ fn panic_debug(line_no int, file string, mod string, fn_name string, s string) {
 			C.exit(1)
 		}
 	}
-	vhalt()
+	C.exit(1)
 }
 
 // panic_option_not_set is called by V, when you use option error propagation in your main function.
@@ -154,7 +149,7 @@ pub fn panic(s string) {
 			C.exit(1)
 		}
 	}
-	vhalt()
+	C.exit(1)
 }
 
 // return a C-API error message matching to `errnum`
diff --git a/vlib/log/safe_log.v b/vlib/log/safe_log.v
@@ -23,15 +23,22 @@ pub fn new_thread_safe_log() &ThreadSafeLog {
 @[unsafe]
 pub fn (mut x ThreadSafeLog) free() {
 	unsafe {
+		// make sure other threads are not in the blocks protected by the mutex:
+		mut p := x.mu
+		p.try_lock()
+		x.mu = nil
+		p.unlock()
+		p.destroy()
+		free(p)
 		x.Log.free()
-		x.mu.destroy()
-		free(x.mu)
-		// C.printf(c'ThreadSafeLog free(x), x: %p\n', x)
 	}
 }
 
 // set_level changes the log level
 pub fn (mut x ThreadSafeLog) set_level(level Level) {
+	if unsafe { x.mu == 0 } {
+		return
+	}
 	x.mu.lock()
 	x.Log.set_level(level)
 	x.mu.unlock()
@@ -40,34 +47,49 @@ pub fn (mut x ThreadSafeLog) set_level(level Level) {
 // set_always_flush called with true, will make the log flush after every single .fatal(), .error(), .warn(), .info(), .debug() call.
 // That can be much slower, if you plan to do lots of frequent calls, but if your program exits early or crashes, your logs will be more complete.
 pub fn (mut x ThreadSafeLog) set_always_flush(should_flush bool) {
+	if unsafe { x.mu == 0 } {
+		return
+	}
 	x.mu.lock()
 	x.Log.set_always_flush(should_flush)
 	x.mu.unlock()
 }
 
 // debug logs a debug message
 pub fn (mut x ThreadSafeLog) debug(s string) {
+	if unsafe { x.mu == 0 } {
+		return
+	}
 	x.mu.lock()
 	x.Log.debug(s)
 	x.mu.unlock()
 }
 
 // info logs an info messagep
 pub fn (mut x ThreadSafeLog) info(s string) {
+	if unsafe { x.mu == 0 } {
+		return
+	}
 	x.mu.lock()
 	x.Log.info(s)
 	x.mu.unlock()
 }
 
 // warn logs a warning message
 pub fn (mut x ThreadSafeLog) warn(s string) {
+	if unsafe { x.mu == 0 } {
+		return
+	}
 	x.mu.lock()
 	x.Log.warn(s)
 	x.mu.unlock()
 }
 
 // error logs an error message
 pub fn (mut x ThreadSafeLog) error(s string) {
+	if unsafe { x.mu == 0 } {
+		return
+	}
 	x.mu.lock()
 	x.Log.error(s)
 	x.mu.unlock()
@@ -76,6 +98,9 @@ pub fn (mut x ThreadSafeLog) error(s string) {
 // fatal logs a fatal message, and panics
 @[noreturn]
 pub fn (mut x ThreadSafeLog) fatal(s string) {
+	if unsafe { x.mu == 0 } {
+		panic(s)
+	}
 	x.mu.lock()
 	defer {
 		// TODO: Log.fatal() is marked as noreturn, but this defer is allowed.

Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,6 @@ pub type FnExitCb = fn ()`
`6`	`6`	`fn C.atexit(f FnExitCb) int`
`7`	`7`	`fn C.strerror(int) &char`
`8`	`8`
`9`		`-@[noreturn]`
`10`		`-fn vhalt() {`
`11`		`- for {}`
`12`		`-}`
`13`		`-`
`14`	`9`	`@[markused]`
`15`	`10`	`fn v_segmentation_fault_handler(signal_number i32) {`
`16`	`11`	`$if freestanding {`
`@@ -99,7 +94,7 @@ fn panic_debug(line_no int, file string, mod string, fn_name string, s string) {`
`99`	`94`	`C.exit(1)`
`100`	`95`	`}`
`101`	`96`	`}`
`102`		`- vhalt()`
	`97`	`+ C.exit(1)`
`103`	`98`	`}`
`104`	`99`
`105`	`100`	`// panic_option_not_set is called by V, when you use option error propagation in your main function.`
`@@ -154,7 +149,7 @@ pub fn panic(s string) {`
`154`	`149`	`C.exit(1)`
`155`	`150`	`}`
`156`	`151`	`}`
`157`		`- vhalt()`
	`152`	`+ C.exit(1)`
`158`	`153`	`}`
`159`	`154`
`160`	`155`	// return a C-API error message matching to `errnum`