[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 35/39] util/log: Hoist the eval of is_daemonized in qemu_set_log_i
From: |
Richard Henderson |
Subject: |
[PULL 35/39] util/log: Hoist the eval of is_daemonized in qemu_set_log_internal |
Date: |
Wed, 20 Apr 2022 11:06:14 -0700 |
Only call is_daemonized once.
We require the result on all paths after this point.
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>
Message-Id: <20220417183019.755276-36-richard.henderson@linaro.org>
---
util/log.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/util/log.c b/util/log.c
index bb201664ac..631856e231 100644
--- a/util/log.c
+++ b/util/log.c
@@ -123,6 +123,7 @@ static bool qemu_set_log_internal(const char *filename,
bool changed_name,
int log_flags, Error **errp)
{
bool need_to_open_file;
+ bool daemonized;
QemuLogFile *logfile;
QEMU_LOCK_GUARD(&global_mutex);
@@ -178,7 +179,8 @@ static bool qemu_set_log_internal(const char *filename,
bool changed_name,
* or to a file (if there is a filename).
* If we are daemonized, we will only log if there is a filename.
*/
- need_to_open_file = log_flags && (!is_daemonized() || filename);
+ daemonized = is_daemonized();
+ need_to_open_file = log_flags && (!daemonized || filename);
if (logfile && !need_to_open_file) {
qatomic_rcu_set(&global_file, NULL);
@@ -196,7 +198,7 @@ static bool qemu_set_log_internal(const char *filename,
bool changed_name,
return false;
}
/* In case we are a daemon redirect stderr to logfile */
- if (is_daemonized()) {
+ if (daemonized) {
dup2(fileno(fd), STDERR_FILENO);
fclose(fd);
/* This will skip closing logfile in qemu_logfile_free. */
@@ -204,7 +206,7 @@ static bool qemu_set_log_internal(const char *filename,
bool changed_name,
}
} else {
/* Default to stderr if no log file specified */
- assert(!is_daemonized());
+ assert(!daemonized);
fd = stderr;
}
--
2.34.1
- [PULL 23/39] tests/unit: Do not reference QemuLogFile directly, (continued)
- [PULL 23/39] tests/unit: Do not reference QemuLogFile directly, Richard Henderson, 2022/04/20
- [PULL 21/39] bsd-user: Expand log_page_dump inline, Richard Henderson, 2022/04/20
- [PULL 25/39] include/qemu/log: Move entire implementation out-of-line, Richard Henderson, 2022/04/20
- [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 <=
- [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, 2022/04/20
- [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