[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 12/25] Simplify syncing with master
From: |
Richard Henderson |
Subject: |
[PATCH v3 12/25] Simplify syncing with master |
Date: |
Thu, 21 May 2020 19:34:27 -0700 |
Do not pass status like RES_BAD_IO from apprentice to master.
This means that when master reports i/o error that we know it
came from master; the apprentice will report its own i/o error.
Reviewed-by: Alex Bennée <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
reginfo.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/reginfo.c b/reginfo.c
index c37c5df..31bc699 100644
--- a/reginfo.c
+++ b/reginfo.c
@@ -90,10 +90,9 @@ RisuResult recv_and_compare_register_info(void *uc)
}
if (header.risu_op != op) {
- /* We are out of sync */
- res = RES_BAD_IO;
- respond(res);
- return res;
+ /* We are out of sync. Tell master to exit. */
+ respond(RES_END);
+ return RES_BAD_IO;
}
/* send OK for the header */
@@ -115,7 +114,7 @@ RisuResult recv_and_compare_register_info(void *uc)
} else if (op == OP_TESTEND) {
res = RES_END;
}
- respond(res);
+ respond(res == RES_OK ? RES_OK : RES_END);
break;
case OP_SETMEMBLOCK:
memblock = (void *)(uintptr_t)get_reginfo_paramreg(&apprentice_ri);
@@ -133,7 +132,7 @@ RisuResult recv_and_compare_register_info(void *uc)
/* memory mismatch */
res = RES_MISMATCH;
}
- respond(res);
+ respond(res == RES_OK ? RES_OK : RES_END);
break;
default:
abort();
--
2.20.1
- [PATCH v3 02/25] Unify master_fd and apprentice_fd to comm_fd, (continued)
- [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, 2020/05/21
- [PATCH v3 11/25] Always write for --master, Richard Henderson, 2020/05/21
- [PATCH v3 12/25] Simplify syncing with master,
Richard Henderson <=
- [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
- [PATCH v3 21/25] ppc64: Use uint64_t to represent double, Richard Henderson, 2020/05/21
- [PATCH v3 22/25] Standardize reginfo_dump_mismatch printing, Richard Henderson, 2020/05/21