From: "Alex Bennée" <alex.bennee@linaro.org>
To: Robert Foley <robert.foley@linaro.org>
Cc: peter.puhov@linaro.org, qemu-devel@nongnu.org
Subject: Re: [PATCH v2 2/6] Cleaned up flow of code in qemu_set_log(), to simplify and clarify.
Date: Mon, 18 Nov 2019 12:07:34 +0000 [thread overview]
Message-ID: <87ftilgzg9.fsf@linaro.org> (raw)
In-Reply-To: <20191115131040.2834-3-robert.foley@linaro.org>
Robert Foley <robert.foley@linaro.org> writes:
> Also added some explanation of the reasoning behind the branches.
>
> Signed-off-by: Robert Foley <robert.foley@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> v2
> - This is new in patch v2.
> ---
> util/log.c | 21 +++++++++++++++------
> 1 file changed, 15 insertions(+), 6 deletions(-)
>
> diff --git a/util/log.c b/util/log.c
> index 4316fe74ee..417d16ec66 100644
> --- a/util/log.c
> +++ b/util/log.c
> @@ -54,12 +54,25 @@ static bool log_uses_own_buffers;
> /* enable or disable low levels log */
> void qemu_set_log(int log_flags)
> {
> + bool need_to_open_file = false;
> qemu_loglevel = log_flags;
> #ifdef CONFIG_TRACE_LOG
> qemu_loglevel |= LOG_TRACE;
> #endif
> - if (!qemu_logfile &&
> - (is_daemonized() ? logfilename != NULL : qemu_loglevel)) {
> + /*
> + * In all cases we only log if qemu_loglevel is set.
> + * Also:
> + * If not daemonized we will always log either to stderr
> + * or to a file (if there is a logfilename).
> + * If we are daemonized,
> + * we will only log if there is a logfilename.
> + */
> + if (qemu_loglevel && (!is_daemonized() || logfilename)) {
> + need_to_open_file = true;
> + }
> + if (qemu_logfile && !need_to_open_file) {
> + qemu_log_close();
> + } else if (!qemu_logfile && need_to_open_file) {
> if (logfilename) {
> qemu_logfile = fopen(logfilename, log_append ? "a" : "w");
> if (!qemu_logfile) {
> @@ -93,10 +106,6 @@ void qemu_set_log(int log_flags)
> log_append = 1;
> }
> }
> - if (qemu_logfile &&
> - (is_daemonized() ? logfilename == NULL : !qemu_loglevel)) {
> - qemu_log_close();
> - }
> }
>
> void qemu_log_needs_buffers(void)
--
Alex Bennée
next prev parent reply other threads:[~2019-11-18 12:08 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-15 13:10 [PATCH v2 0/6] Make the qemu_logfile handle thread safe Robert Foley
2019-11-15 13:10 ` [PATCH v2 1/6] Fix double free issue in qemu_set_log_filename() Robert Foley
2019-11-15 13:10 ` [PATCH v2 2/6] Cleaned up flow of code in qemu_set_log(), to simplify and clarify Robert Foley
2019-11-18 12:07 ` Alex Bennée [this message]
2019-11-15 13:10 ` [PATCH v2 3/6] Add a mutex to guarantee single writer to qemu_logfile handle Robert Foley
2019-11-18 12:16 ` Alex Bennée
2019-11-18 12:50 ` Robert Foley
2019-11-15 13:10 ` [PATCH v2 4/6] qemu_log_lock/unlock now preserves the " Robert Foley
2019-11-15 13:10 ` [PATCH v2 5/6] Add use of RCU for qemu_logfile Robert Foley
2019-11-18 12:22 ` Alex Bennée
2019-11-18 13:01 ` Robert Foley
2019-11-18 13:23 ` Alex Bennée
2019-11-18 14:21 ` Robert Foley
2019-11-18 16:41 ` Alex Bennée
2019-11-18 17:44 ` Robert Foley
2019-11-15 13:10 ` [PATCH v2 6/6] Added tests for close and change of logfile Robert Foley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87ftilgzg9.fsf@linaro.org \
--to=alex.bennee@linaro.org \
--cc=peter.puhov@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=robert.foley@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).