7606488c0e
This now allows changing the logfile while logging is active, and also solves the issue of a seg fault while changing the logfile. Any read access to the qemu_logfile handle will use the rcu_read_lock()/unlock() around the use of the handle. To fetch the handle we will use atomic_rcu_read(). We also in many cases do a check for validity of the logfile handle before using it to deal with the case where the file is closed and set to NULL. The cases where we write to the qemu_logfile will use atomic_rcu_set(). Writers will also use call_rcu() with a newly added qemu_logfile_free function for freeing/closing when readers have finished. Signed-off-by: Robert Foley <robert.foley@linaro.org> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Message-Id: <20191118211528.3221-6-robert.foley@linaro.org>
86 lines
1.9 KiB
C
86 lines
1.9 KiB
C
#ifndef QEMU_EXEC_LOG_H
|
|
#define QEMU_EXEC_LOG_H
|
|
|
|
#include "qemu/log.h"
|
|
#include "hw/core/cpu.h"
|
|
#include "disas/disas.h"
|
|
|
|
/* cpu_dump_state() logging functions: */
|
|
/**
|
|
* log_cpu_state:
|
|
* @cpu: The CPU whose state is to be logged.
|
|
* @flags: Flags what to log.
|
|
*
|
|
* Logs the output of cpu_dump_state().
|
|
*/
|
|
static inline void log_cpu_state(CPUState *cpu, int flags)
|
|
{
|
|
QemuLogFile *logfile;
|
|
|
|
if (qemu_log_enabled()) {
|
|
rcu_read_lock();
|
|
logfile = atomic_rcu_read(&qemu_logfile);
|
|
if (logfile) {
|
|
cpu_dump_state(cpu, logfile->fd, flags);
|
|
}
|
|
rcu_read_unlock();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* log_cpu_state_mask:
|
|
* @mask: Mask when to log.
|
|
* @cpu: The CPU whose state is to be logged.
|
|
* @flags: Flags what to log.
|
|
*
|
|
* Logs the output of cpu_dump_state() if loglevel includes @mask.
|
|
*/
|
|
static inline void log_cpu_state_mask(int mask, CPUState *cpu, int flags)
|
|
{
|
|
if (qemu_loglevel & mask) {
|
|
log_cpu_state(cpu, flags);
|
|
}
|
|
}
|
|
|
|
#ifdef NEED_CPU_H
|
|
/* disas() and target_disas() to qemu_logfile: */
|
|
static inline void log_target_disas(CPUState *cpu, target_ulong start,
|
|
target_ulong len)
|
|
{
|
|
QemuLogFile *logfile;
|
|
rcu_read_lock();
|
|
logfile = atomic_rcu_read(&qemu_logfile);
|
|
if (logfile) {
|
|
target_disas(logfile->fd, cpu, start, len);
|
|
}
|
|
rcu_read_unlock();
|
|
}
|
|
|
|
static inline void log_disas(void *code, unsigned long size)
|
|
{
|
|
QemuLogFile *logfile;
|
|
rcu_read_lock();
|
|
logfile = atomic_rcu_read(&qemu_logfile);
|
|
if (logfile) {
|
|
disas(logfile->fd, code, size);
|
|
}
|
|
rcu_read_unlock();
|
|
}
|
|
|
|
#if defined(CONFIG_USER_ONLY)
|
|
/* page_dump() output to the log file: */
|
|
static inline void log_page_dump(void)
|
|
{
|
|
QemuLogFile *logfile;
|
|
rcu_read_lock();
|
|
logfile = atomic_rcu_read(&qemu_logfile);
|
|
if (logfile) {
|
|
page_dump(logfile->fd);
|
|
}
|
|
rcu_read_unlock();
|
|
}
|
|
#endif
|
|
#endif
|
|
|
|
#endif
|