mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util/log: Move qemu_log_lock, qemu_log_unlock out of line

Browse Source 
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220417183019.755276-7-richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2022-04-17 11:29:46 -07:00
parent 229ef2eb44
commit c59fe6e536
2 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
include/qemu/log.h
View File

@ -65,32 +65,10 @@ static inline bool qemu_log_separate(void)
/* LOG_STRACE is used for user-mode strace logging. */
#define LOG_STRACE (1 << 19)
/* Lock output for a series of related logs. Since this is not needed
* for a single qemu_log / qemu_log_mask / qemu_log_mask_and_addr, we
* assume that qemu_loglevel_mask has already been tested, and that
* qemu_loglevel is never set when qemu_logfile is unset.
*/
/* Lock/unlock output. */
static inline FILE *qemu_log_lock(void)
{
QemuLogFile *logfile;
rcu_read_lock();
logfile = qatomic_rcu_read(&qemu_logfile);
if (logfile) {
qemu_flockfile(logfile->fd);
return logfile->fd;
} else {
return NULL;
}
}
static inline void qemu_log_unlock(FILE *fd)
{
if (fd) {
qemu_funlockfile(fd);
}
rcu_read_unlock();
}
FILE *qemu_log_lock(void);
void qemu_log_unlock(FILE *fd);
/* Logging functions: */

23
util/log.c
View File

@ -34,6 +34,29 @@ int qemu_loglevel;
static int log_append = 0;
static GArray *debug_regions;
/* Lock/unlock output. */
FILE *qemu_log_lock(void)
{
QemuLogFile *logfile;
rcu_read_lock();
logfile = qatomic_rcu_read(&qemu_logfile);
if (logfile) {
qemu_flockfile(logfile->fd);
return logfile->fd;
} else {
return NULL;
}
}
void qemu_log_unlock(FILE *fd)
{
if (fd) {
qemu_funlockfile(fd);
}
rcu_read_unlock();
}
/* Return the number of characters emitted. */
int qemu_log(const char *fmt, ...)
{