[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 06/39] util/log: Move qemu_log_lock, qemu_log_unlock out of li
From: |
Richard Henderson |
Subject: |
[PATCH v2 06/39] util/log: Move qemu_log_lock, qemu_log_unlock out of line |
Date: |
Sat, 26 Mar 2022 07:24:59 -0600 |
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>
---
include/qemu/log.h | 28 +++-------------------------
util/log.c | 23 +++++++++++++++++++++++
2 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/include/qemu/log.h b/include/qemu/log.h
index 0b892f5e90..6a6b1efce5 100644
--- a/include/qemu/log.h
+++ b/include/qemu/log.h
@@ -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: */
diff --git a/util/log.c b/util/log.c
index bab4d29ecb..1a3121610a 100644
--- a/util/log.c
+++ b/util/log.c
@@ -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, ...)
{
--
2.25.1
- [PATCH v2 1/8] linux-user/nios2: Hoist pc advance to the top of EXCP_TRAP, (continued)
- [PATCH v2 1/8] linux-user/nios2: Hoist pc advance to the top of EXCP_TRAP, Richard Henderson, 2022/03/26
- [PATCH v2 01/39] util/log: Drop manual log buffering, Richard Henderson, 2022/03/26
- [PATCH v2 3/8] linux-user/nios2: Drop syscall 0 "workaround", Richard Henderson, 2022/03/26
- [PATCH v2 02/39] target/hexagon: Remove qemu_set_log in hexagon_translate_init, Richard Henderson, 2022/03/26
- [PATCH v2 03/39] util/log: Return bool from qemu_set_log_filename, Richard Henderson, 2022/03/26
- [PATCH v2 4/8] linux-user/nios2: Adjust error return, Richard Henderson, 2022/03/26
- [PATCH v2 05/39] os-posix: Use qemu_log_enabled, Richard Henderson, 2022/03/26
- [PATCH v2 5/8] linux-user/nios2: Handle special qemu syscall return values, Richard Henderson, 2022/03/26
- [PATCH v2 6/8] linux-user/nios2: Remove do_sigreturn, Richard Henderson, 2022/03/26
- [PATCH v2 04/39] util/log: Pass Error pointer to qemu_set_log, Richard Henderson, 2022/03/26
- [PATCH v2 06/39] util/log: Move qemu_log_lock, qemu_log_unlock out of line,
Richard Henderson <=
- [PATCH v2 7/8] linux-user/nios2: Use QEMU_ESIGRETURN from do_rt_sigreturn, Richard Henderson, 2022/03/26
- [PATCH v2 07/39] util/log: Rename qemu_log_lock to qemu_log_trylock, Richard Henderson, 2022/03/26
- [PATCH v2 08/39] hw/xen: Split out xen_pv_output_msg, Richard Henderson, 2022/03/26
- [PATCH v2 8/8] tests/tcg/nios2: Re-enable linux-user tests, Richard Henderson, 2022/03/26
- [PATCH v2 10/39] util/log: Remove qemu_log_vprintf, Richard Henderson, 2022/03/26
- [PATCH v2 09/39] *: Use fprintf between qemu_log_trylock/unlock, Richard Henderson, 2022/03/26
- [PATCH v2 11/39] tcg: Pass the locked filepointer to tcg_dump_ops, Richard Henderson, 2022/03/26
- [PATCH v2 13/39] exec/log: Remove log_disas and log_target_disas, Richard Henderson, 2022/03/26
- [PATCH v2 12/39] exec/translator: Pass the locked filepointer to disas_log hook, Richard Henderson, 2022/03/26
- [PATCH v2 19/39] util/log: Remove qemu_log_flush, Richard Henderson, 2022/03/26