[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 36/39] util/log: Combine two logfile closes
From: |
Richard Henderson |
Subject: |
[PATCH v3 36/39] util/log: Combine two logfile closes |
Date: |
Sun, 17 Apr 2022 11:30:16 -0700 |
Merge the close from the changed_name block with the close
from the !need_to_open_file block.
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
util/log.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/util/log.c b/util/log.c
index 631856e231..21da961d8d 100644
--- a/util/log.c
+++ b/util/log.c
@@ -157,12 +157,6 @@ static bool qemu_set_log_internal(const char *filename,
bool changed_name,
g_free(global_filename);
global_filename = newname;
filename = newname;
-
- if (logfile) {
- qatomic_rcu_set(&global_file, NULL);
- call_rcu(logfile, qemu_logfile_free, rcu);
- logfile = NULL;
- }
} else {
filename = global_filename;
}
@@ -182,11 +176,12 @@ static bool qemu_set_log_internal(const char *filename,
bool changed_name,
daemonized = is_daemonized();
need_to_open_file = log_flags && (!daemonized || filename);
- if (logfile && !need_to_open_file) {
+ if (logfile && (!need_to_open_file || changed_name)) {
qatomic_rcu_set(&global_file, NULL);
call_rcu(logfile, qemu_logfile_free, rcu);
- return true;
+ logfile = NULL;
}
+
if (!logfile && need_to_open_file) {
FILE *fd;
--
2.25.1
- [PATCH v3 31/39] util/log: Remove qemu_log_close, (continued)
- [PATCH v3 31/39] util/log: Remove qemu_log_close, Richard Henderson, 2022/04/17
- [PATCH v3 28/39] bsd-user: Use qemu_set_log_filename_flags, Richard Henderson, 2022/04/17
- [PATCH v3 02/39] target/hexagon: Remove qemu_set_log in hexagon_translate_init, Richard Henderson, 2022/04/17
- [PATCH v3 04/39] util/log: Pass Error pointer to qemu_set_log, Richard Henderson, 2022/04/17
- [PATCH v3 15/39] target/nios2: Remove log_cpu_state from reset, Richard Henderson, 2022/04/17
- [PATCH v3 24/39] include/exec/log: Do not reference QemuLogFile directly, Richard Henderson, 2022/04/17
- [PATCH v3 29/39] linux-user: Use qemu_set_log_filename_flags, Richard Henderson, 2022/04/17
- [PATCH v3 35/39] util/log: Hoist the eval of is_daemonized in qemu_set_log_internal, Richard Henderson, 2022/04/17
- [PATCH v3 34/39] util/log: Rename qemu_logfile_mutex to global_mutex, Richard Henderson, 2022/04/17
- [PATCH v3 36/39] util/log: Combine two logfile closes,
Richard Henderson <=
- [PATCH v3 39/39] util/log: Support per-thread log files, Richard Henderson, 2022/04/17
- [PATCH v3 38/39] util/log: Limit RCUCloseFILE to file closing, Richard Henderson, 2022/04/17
- [PATCH v3 33/39] util/log: Rename qemu_logfile to global_file, Richard Henderson, 2022/04/17
- [PATCH v3 12/39] exec/translator: Pass the locked filepointer to disas_log hook, Richard Henderson, 2022/04/17
- [PATCH v3 18/39] util/log: Mark qemu_log_trylock as G_GNUC_WARN_UNUSED_RESULT, Richard Henderson, 2022/04/17