From: "Alex Bennée" <alex.bennee@linaro.org>
To: Richard Henderson <richard.henderson@linaro.org>
Cc: peter.maydell@linaro.org, qemu-devel@nongnu.org
Subject: Re: [RISU v2 03/17] Hoist trace file opening
Date: Tue, 19 May 2020 17:50:08 +0100 [thread overview]
Message-ID: <875zcrj2db.fsf@linaro.org> (raw)
In-Reply-To: <20200519025355.4420-4-richard.henderson@linaro.org>
Richard Henderson <richard.henderson@linaro.org> writes:
> We will want to share this code with --dump.
>
> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> risu.c | 37 +++++++++++++++++--------------------
> 1 file changed, 17 insertions(+), 20 deletions(-)
>
> diff --git a/risu.c b/risu.c
> index 059348f..1c66885 100644
> --- a/risu.c
> +++ b/risu.c
> @@ -363,6 +363,21 @@ int main(int argc, char **argv)
> }
> }
>
> + if (trace) {
> + if (strcmp(trace_fn, "-") == 0) {
> + comm_fd = ismaster ? STDOUT_FILENO : STDIN_FILENO;
> + } else {
> + if (ismaster) {
> + comm_fd = open(trace_fn, O_WRONLY | O_CREAT, S_IRWXU);
> + } else {
> + comm_fd = open(trace_fn, O_RDONLY);
> + }
> +#ifdef HAVE_ZLIB
> + gz_trace_file = gzdopen(comm_fd, ismaster ? "wb9" : "rb");
> +#endif
> + }
> + }
> +
> imgfile = argv[optind];
> if (!imgfile) {
> fprintf(stderr, "Error: must specify image file name\n\n");
> @@ -373,31 +388,13 @@ int main(int argc, char **argv)
> load_image(imgfile);
>
> if (ismaster) {
> - if (trace) {
> - if (strcmp(trace_fn, "-") == 0) {
> - comm_fd = STDOUT_FILENO;
> - } else {
> - comm_fd = open(trace_fn, O_WRONLY | O_CREAT, S_IRWXU);
> -#ifdef HAVE_ZLIB
> - gz_trace_file = gzdopen(comm_fd, "wb9");
> -#endif
> - }
> - } else {
> + if (!trace) {
> fprintf(stderr, "master port %d\n", port);
> comm_fd = master_connect(port);
> }
> return master();
> } else {
> - if (trace) {
> - if (strcmp(trace_fn, "-") == 0) {
> - comm_fd = STDIN_FILENO;
> - } else {
> - comm_fd = open(trace_fn, O_RDONLY);
> -#ifdef HAVE_ZLIB
> - gz_trace_file = gzdopen(comm_fd, "rb");
> -#endif
> - }
> - } else {
> + if (!trace) {
> fprintf(stderr, "apprentice host %s port %d\n", hostname, port);
> comm_fd = apprentice_connect(hostname, port);
> }
--
Alex Bennée
next prev parent reply other threads:[~2020-05-19 16:54 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-19 2:53 [RISU v2 00/17] risu cleanups and improvements Richard Henderson
2020-05-19 2:53 ` [RISU v2 01/17] Use bool for tracing variables Richard Henderson
2020-05-19 15:52 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 02/17] Unify master_fd and apprentice_fd to comm_fd Richard Henderson
2020-05-19 15:52 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 03/17] Hoist trace file opening Richard Henderson
2020-05-19 16:50 ` Alex Bennée [this message]
2020-05-19 2:53 ` [RISU v2 04/17] Adjust tracefile open for write Richard Henderson
2020-05-19 18:24 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 05/17] Use EXIT_FAILURE, EXIT_SUCCESS Richard Henderson
2020-05-19 18:24 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 06/17] Make some risu.c symbols static Richard Henderson
2020-05-19 18:25 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 07/17] Add enum RisuOp Richard Henderson
2020-05-19 18:39 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 08/17] Add enum RisuResult Richard Henderson
2020-05-19 19:06 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 09/17] Unify i/o functions and use RisuResult Richard Henderson
2020-05-20 15:50 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 10/17] Pass non-OK result back through siglongjmp Richard Henderson
2020-05-20 15:52 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 11/17] Always write for --master Richard Henderson
2020-05-20 16:12 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 12/17] Simplify syncing with master Richard Henderson
2020-05-20 16:14 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 13/17] Split RES_MISMATCH for registers and memory Richard Henderson
2020-05-20 16:25 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 14/17] Add magic and size to the trace header Richard Henderson
2020-05-19 21:16 ` Richard Henderson
2020-05-20 16:59 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 15/17] Compute reginfo_size based on the reginfo Richard Henderson
2020-05-20 17:30 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 16/17] aarch64: Reorg sve reginfo to save space Richard Henderson
2020-05-20 18:43 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 17/17] Add --dump option to inspect trace files Richard Henderson
2020-05-20 17:49 ` Alex Bennée
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=875zcrj2db.fsf@linaro.org \
--to=alex.bennee@linaro.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@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).