[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 36/39] util/log: Combine two logfile closes
From: |
Richard Henderson |
Subject: |
[PULL 36/39] util/log: Combine two logfile closes |
Date: |
Wed, 20 Apr 2022 11:06:15 -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>
Message-Id: <20220417183019.755276-37-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.34.1
- [PULL 22/39] linux-user: Expand log_page_dump inline, (continued)
- [PULL 22/39] linux-user: Expand log_page_dump inline, Richard Henderson, 2022/04/20
- [PULL 27/39] util/log: Introduce qemu_set_log_filename_flags, Richard Henderson, 2022/04/20
- [PULL 26/39] sysemu/os-win32: Test for and use _lock_file/_unlock_file, Richard Henderson, 2022/04/20
- [PULL 29/39] linux-user: Use qemu_set_log_filename_flags, Richard Henderson, 2022/04/20
- [PULL 30/39] softmmu: Use qemu_set_log_filename_flags, Richard Henderson, 2022/04/20
- [PULL 31/39] util/log: Remove qemu_log_close, Richard Henderson, 2022/04/20
- [PULL 32/39] util/log: Rename logfilename to global_filename, Richard Henderson, 2022/04/20
- [PULL 35/39] util/log: Hoist the eval of is_daemonized in qemu_set_log_internal, Richard Henderson, 2022/04/20
- [PULL 28/39] bsd-user: Use qemu_set_log_filename_flags, Richard Henderson, 2022/04/20
- [PULL 33/39] util/log: Rename qemu_logfile to global_file, Richard Henderson, 2022/04/20
- [PULL 36/39] util/log: Combine two logfile closes,
Richard Henderson <=
- [PULL 37/39] util/log: Rename QemuLogFile to RCUCloseFILE, Richard Henderson, 2022/04/20
- [PULL 38/39] util/log: Limit RCUCloseFILE to file closing, Richard Henderson, 2022/04/20
- [PULL 39/39] util/log: Support per-thread log files, Richard Henderson, 2022/04/20
- [PULL 34/39] util/log: Rename qemu_logfile_mutex to global_mutex, Richard Henderson, 2022/04/20
- Re: [PULL 00/39] Logging cleanup and per-thread logfiles, Richard Henderson, 2022/04/20