mirror of
https://github.com/mpv-player/mpv
synced 2025-02-06 15:11:58 +00:00
e42a8d537f
the mp_log is freed when the corresponding mpv_handle (ta_parent) is freed in the EventHelper, though it could still be used from different threads. instead don't use a ta_parent and manually free on manual dereferencing. on app shutdown (memory cleanup) this is not called but instead is freed by the usual cleanup and freeing. the LogHelper is only able to be manually dereferenced in the AppHub, so no race conditions are possible in all other cases (vo).in the AppHub it's impossible to hit a race condition atm, because of how the init process works and how/where the log is used. only manually forcing logging in the exit process itself could theoretically trigger a use after free. Fixes #13823
68 lines
1.9 KiB
Swift
68 lines
1.9 KiB
Swift
/*
|
|
* This file is part of mpv.
|
|
*
|
|
* mpv is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* mpv is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with mpv. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
import Cocoa
|
|
import os
|
|
|
|
class LogHelper {
|
|
var log: OpaquePointer?
|
|
let logger = Logger(subsystem: "io.mpv", category: "mpv")
|
|
|
|
let loggerMapping: [Int:OSLogType] = [
|
|
MSGL_V: .debug,
|
|
MSGL_INFO: .info,
|
|
MSGL_WARN: .error,
|
|
MSGL_ERR: .fault,
|
|
]
|
|
|
|
init(_ log: OpaquePointer? = nil) {
|
|
self.log = log
|
|
}
|
|
|
|
func verbose(_ message: String) {
|
|
send(message: message, type: MSGL_V)
|
|
}
|
|
|
|
func info(_ message: String) {
|
|
send(message: message, type: MSGL_INFO)
|
|
}
|
|
|
|
func warning(_ message: String) {
|
|
send(message: message, type: MSGL_WARN)
|
|
}
|
|
|
|
func error(_ message: String) {
|
|
send(message: message, type: MSGL_ERR)
|
|
}
|
|
|
|
func send(message: String, type: Int) {
|
|
guard let log = log else {
|
|
logger.log(level: loggerMapping[type] ?? .default, "\(message, privacy: .public)")
|
|
return
|
|
}
|
|
|
|
let args: [CVarArg] = [(message as NSString).utf8String ?? "NO MESSAGE"]
|
|
mp_msg_va(log, Int32(type), "%s\n", getVaList(args))
|
|
}
|
|
|
|
deinit {
|
|
// only a manual dereferencing will trigger this, cleanup properly in that case
|
|
ta_free(UnsafeMutablePointer(log))
|
|
log = nil
|
|
}
|
|
}
|