[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 10/25] Pass non-OK result back through siglongjmp
From: |
Richard Henderson |
Subject: |
[PATCH v3 10/25] Pass non-OK result back through siglongjmp |
Date: |
Thu, 21 May 2020 19:34:25 -0700 |
Rather than doing some work in the signal handler and
some work outside, move all of the non-resume work outside.
This works because we arranged for RES_OK to be 0, which
is the normal return from sigsetjmp.
Reviewed-by: Alex Bennée <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
risu.c | 50 ++++++++++++++++++++++++--------------------------
1 file changed, 24 insertions(+), 26 deletions(-)
diff --git a/risu.c b/risu.c
index 1917311..f238117 100644
--- a/risu.c
+++ b/risu.c
@@ -107,15 +107,10 @@ static void master_sigill(int sig, siginfo_t *si, void
*uc)
} else {
r = recv_and_compare_register_info(uc);
}
-
- switch (r) {
- case RES_OK:
- /* match OK */
+ if (r == RES_OK) {
advance_pc(uc);
- return;
- default:
- /* mismatch, or end of test */
- siglongjmp(jmpbuf, 1);
+ } else {
+ siglongjmp(jmpbuf, r);
}
}
@@ -129,21 +124,10 @@ static void apprentice_sigill(int sig, siginfo_t *si,
void *uc)
} else {
r = send_register_info(uc);
}
-
- switch (r) {
- case RES_OK:
- /* match OK */
+ if (r == RES_OK) {
advance_pc(uc);
- return;
- case RES_END:
- /* end of test */
- exit(EXIT_SUCCESS);
- default:
- /* mismatch */
- if (trace) {
- siglongjmp(jmpbuf, 1);
- }
- exit(EXIT_FAILURE);
+ } else {
+ siglongjmp(jmpbuf, r);
}
}
@@ -200,7 +184,9 @@ static void load_image(const char *imgfile)
static int master(void)
{
- if (sigsetjmp(jmpbuf, 1)) {
+ RisuResult res = sigsetjmp(jmpbuf, 1);
+
+ if (res != RES_OK) {
#ifdef HAVE_ZLIB
if (trace && comm_fd != STDOUT_FILENO) {
gzclose(gz_trace_file);
@@ -226,15 +212,27 @@ static int master(void)
static int apprentice(void)
{
- if (sigsetjmp(jmpbuf, 1)) {
+ RisuResult res = sigsetjmp(jmpbuf, 1);
+
+ if (res != RES_OK) {
#ifdef HAVE_ZLIB
if (trace && comm_fd != STDIN_FILENO) {
gzclose(gz_trace_file);
}
#endif
close(comm_fd);
- fprintf(stderr, "finished early after %zd checkpoints\n",
signal_count);
- return report_match_status(true);
+
+ switch (res) {
+ case RES_END:
+ return EXIT_SUCCESS;
+ default:
+ if (!trace) {
+ return EXIT_FAILURE;
+ }
+ fprintf(stderr, "finished early after %zd checkpoints\n",
+ signal_count);
+ return report_match_status(true);
+ }
}
set_sigill_handler(&apprentice_sigill);
fprintf(stderr, "starting apprentice image at 0x%"PRIxPTR"\n",
--
2.20.1
- [PATCH v3 00/25] risu cleanups and improvements, Richard Henderson, 2020/05/21
- [PATCH v3 01/25] Use bool for tracing variables, Richard Henderson, 2020/05/21
- [PATCH v3 02/25] Unify master_fd and apprentice_fd to comm_fd, Richard Henderson, 2020/05/21
- [PATCH v3 03/25] Hoist trace file and socket opening, Richard Henderson, 2020/05/21
- [PATCH v3 04/25] Adjust tracefile open for write, Richard Henderson, 2020/05/21
- [PATCH v3 05/25] Use EXIT_FAILURE, EXIT_SUCCESS, Richard Henderson, 2020/05/21
- [PATCH v3 06/25] Make some risu.c symbols static, Richard Henderson, 2020/05/21
- [PATCH v3 08/25] Add enum RisuResult, Richard Henderson, 2020/05/21
- [PATCH v3 07/25] Add enum RisuOp, Richard Henderson, 2020/05/21
- [PATCH v3 09/25] Unify i/o functions and use RisuResult, Richard Henderson, 2020/05/21
- [PATCH v3 10/25] Pass non-OK result back through siglongjmp,
Richard Henderson <=
- [PATCH v3 11/25] Always write for --master, Richard Henderson, 2020/05/21
- [PATCH v3 12/25] Simplify syncing with master, Richard Henderson, 2020/05/21
- [PATCH v3 13/25] Split RES_MISMATCH for registers and memory, Richard Henderson, 2020/05/21
- [PATCH v3 15/25] Rearrange reginfo and memblock buffers, Richard Henderson, 2020/05/21
- [PATCH v3 14/25] Merge reginfo.c into risu.c, Richard Henderson, 2020/05/21
- [PATCH v3 16/25] Split out recv_register_info, Richard Henderson, 2020/05/21
- [PATCH v3 17/25] Add magic and size to the trace header, Richard Henderson, 2020/05/21
- [PATCH v3 18/25] Compute reginfo_size based on the reginfo, Richard Henderson, 2020/05/21
- [PATCH v3 19/25] aarch64: Reorg sve reginfo to save space, Richard Henderson, 2020/05/21
- [PATCH v3 20/25] aarch64: Use arch_init to configure sve, Richard Henderson, 2020/05/21