mirror of
https://github.com/mpv-player/mpv
synced 2025-01-01 04:12:25 +00:00
2fd34889fe
Until now --log-file performed a blocking write to the log file, which made any calling thread block for I/O. It even explicitly flushed after every line (to make it tail-able, or to ensure a hard crash wouldn't lose any of the output). This wasn't so good, because it could cause real playback problems, which made it infeasible to enable it by default. Try to buffer it through a ring buffer and a thread. There's no other choice but to use a thread, since async I/O on files is generally a big and unportable pain. (We very much prefer portable pain.) Fortunately, there's already a ring buffer (mp_log_buffer, normally for the client API logging hook). This still involves some pretty messy locking. Give each mp_log_buffer its own lock to make this easier. This still makes calling threads block if the log buffer is full (unlike with client API log buffers, which just drop messages). I don't want log messages to get lost for this purpose. This also made locking pretty complicated (without it, mp_log_buffer wouldn't have needed its own lock). Maybe I'll remove this blocking again when it turns out to be nonsense. (We could avoid wasting an entire thread by "reusing" some other thread. E.g. pick some otherwise not real time thread, and make it react to the log buffer's wakeup callback. But let's not. It's complicated to abuse random threads for this. It'd also raise locking complexity, because we still want it to block on a full buffer.)
44 lines
1.5 KiB
C
44 lines
1.5 KiB
C
#ifndef MP_MSG_CONTROL_H
|
|
#define MP_MSG_CONTROL_H
|
|
|
|
#include <stdbool.h>
|
|
|
|
struct mpv_global;
|
|
struct MPOpts;
|
|
void mp_msg_init(struct mpv_global *global);
|
|
void mp_msg_uninit(struct mpv_global *global);
|
|
void mp_msg_update_msglevels(struct mpv_global *global, struct MPOpts *opts);
|
|
void mp_msg_force_stderr(struct mpv_global *global, bool force_stderr);
|
|
bool mp_msg_has_status_line(struct mpv_global *global);
|
|
bool mp_msg_has_log_file(struct mpv_global *global);
|
|
void mp_msg_set_early_logging(struct mpv_global *global, bool enable);
|
|
|
|
void mp_msg_flush_status_line(struct mp_log *log);
|
|
|
|
struct mp_log_buffer_entry {
|
|
char *prefix;
|
|
int level;
|
|
char *text;
|
|
};
|
|
|
|
// Use --msg-level option for log level of this log buffer
|
|
#define MP_LOG_BUFFER_MSGL_TERM (MSGL_MAX + 1)
|
|
// For --log-file; --msg-level, but at least MSGL_DEBUG
|
|
#define MP_LOG_BUFFER_MSGL_LOGFILE (MSGL_MAX + 2)
|
|
|
|
struct mp_log_buffer;
|
|
struct mp_log_buffer *mp_msg_log_buffer_new(struct mpv_global *global,
|
|
int size, int level,
|
|
void (*wakeup_cb)(void *ctx),
|
|
void *wakeup_cb_ctx);
|
|
void mp_msg_log_buffer_destroy(struct mp_log_buffer *buffer);
|
|
struct mp_log_buffer_entry *mp_msg_log_buffer_read(struct mp_log_buffer *buffer);
|
|
void mp_msg_log_buffer_set_silent(struct mp_log_buffer *buffer, bool silent);
|
|
|
|
int mp_msg_find_level(const char *s);
|
|
|
|
extern const char *const mp_log_levels[MSGL_MAX + 1];
|
|
extern const int mp_mpv_log_levels[MSGL_MAX + 1];
|
|
|
|
#endif
|