[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL for-7.1 05/36] util/log: Move qemu_log_lock, qemu_log_unlock out o
From: |
Richard Henderson |
Subject: |
[PULL for-7.1 05/36] util/log: Move qemu_log_lock, qemu_log_unlock out of line |
Date: |
Sun, 20 Mar 2022 10:11:04 -0700 |
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 64f28785ae..10e284291c 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 00773ab717..248db6211e 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
- [PULL for-7.1 07/36] hw/xen: Split out xen_pv_output_msg, (continued)
- [PULL for-7.1 07/36] hw/xen: Split out xen_pv_output_msg, Richard Henderson, 2022/03/20
- [PULL for-7.1 16/36] util/log: Remove qemu_log_flush, Richard Henderson, 2022/03/20
- [PULL for-7.1 11/36] exec/translator: Pass the locked filepointer to disas_log hook, Richard Henderson, 2022/03/20
- [PULL for-7.1 14/36] target/nios2: Remove log_cpu_state from reset, Richard Henderson, 2022/03/20
- [PULL for-7.1 25/36] bsd-user: Use qemu_set_log_filename_flags, Richard Henderson, 2022/03/20
- [PULL for-7.1 20/36] tests/unit: Do not reference QemuLogFile directly, Richard Henderson, 2022/03/20
- [PULL for-7.1 03/36] util/log: Pass Error pointer to qemu_set_log, Richard Henderson, 2022/03/20
- [PULL for-7.1 05/36] util/log: Move qemu_log_lock, qemu_log_unlock out of line,
Richard Henderson <=
- [PULL for-7.1 06/36] util/log: Treat qemu_log_lock like trylock, Richard Henderson, 2022/03/20
- [PULL for-7.1 29/36] util/log: Rename logfilename to global_filename, Richard Henderson, 2022/03/20
- [PULL for-7.1 30/36] util/log: Rename qemu_logfile to global_file, Richard Henderson, 2022/03/20
- [PULL for-7.1 09/36] util/log: Remove qemu_log_vprintf, Richard Henderson, 2022/03/20