mirror of
https://github.com/RetroPortingToolKit/psxrecomp
synced 2026-10-28 19:07:47 -04:00
Alexandros Mandravillis
5c7a37146c
A netplay match that ends early returns both players to the lobby. The runtime knew why (netplay_soft_exit's origin) but only printed it to stdout, so players saw the lobby again with no reason. A boot-digest mismatch (peers booted different BIOS images or boot settings) first held a black window for the full 20 s admit-stall watchdog. netplay_soft_exit now records a sentence for its origin, and the soft return to the lobby puts it on the launcher's status line through last_error (the room and browser views already show it). The dig0 gate timestamps a mismatch; once the same pair of digests has held for 3 s, the watchdog ends the match with its own reason. A peer that gets the other side's BYE while it sees the same mismatch reports the mismatch, not "the other player left". A CLI match prints the sentence to stderr. The origin-to-text map and the grace decision live in netplay_exit_reason.c, covered by netplay_exit_reason_test. Builds on the previous commit's psx_lobby_set_last_error.
56 lines
2.3 KiB
C
56 lines
2.3 KiB
C
/* Netplay exit reasons and the boot-mismatch deadline.
|
|
* Plain checks, not assert(): Release test builds define NDEBUG. */
|
|
#include "netplay_exit_reason.h"
|
|
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
|
|
static int failures;
|
|
#define CHECK(cond) do { if (!(cond)) { \
|
|
fprintf(stderr, "%s:%d: CHECK failed: %s\n", __FILE__, __LINE__, #cond); \
|
|
++failures; } } while (0)
|
|
|
|
int main(void)
|
|
{
|
|
static const char *const ended[] = {
|
|
"netplay_boot_mismatch", "netplay_peer_disconnect", "netplay_load_failed",
|
|
"netplay_load_stall", "netplay_link_stall", "netplay_admit_stall",
|
|
};
|
|
size_t i;
|
|
|
|
/* Every origin netplay_soft_exit uses for a failure has a sentence, and it
|
|
* fits the lobby client's last_error (192 bytes). */
|
|
for (i = 0; i < sizeof(ended) / sizeof(ended[0]); ++i) {
|
|
const char *t = netplay_exit_reason_text(ended[i]);
|
|
CHECK(t != NULL);
|
|
CHECK(t && strlen(t) > 20 && strlen(t) < 192);
|
|
}
|
|
CHECK(strstr(netplay_exit_reason_text("netplay_boot_mismatch"), "BIOS") != NULL);
|
|
|
|
/* A player who closed the window or pressed Escape needs no reason. */
|
|
CHECK(netplay_exit_reason_text("sdl_window_close") == NULL);
|
|
CHECK(netplay_exit_reason_text("netplay_escape") == NULL);
|
|
CHECK(netplay_exit_reason_text("netplay_barrier_escape") == NULL);
|
|
CHECK(netplay_exit_reason_text("") == NULL);
|
|
CHECK(netplay_exit_reason_text(NULL) == NULL);
|
|
|
|
/* No mismatch seen: never final. */
|
|
CHECK(!netplay_boot_mismatch_final(0u, 100000u, NETPLAY_BOOT_MISMATCH_GRACE_MS));
|
|
/* Seen, grace not yet over, then over. */
|
|
CHECK(!netplay_boot_mismatch_final(1000u, 3999u, NETPLAY_BOOT_MISMATCH_GRACE_MS));
|
|
CHECK(netplay_boot_mismatch_final(1000u, 4000u, NETPLAY_BOOT_MISMATCH_GRACE_MS));
|
|
/* The 32-bit millisecond clock wraps. */
|
|
CHECK(!netplay_boot_mismatch_final(0xFFFFFF00u, 0x00000100u, NETPLAY_BOOT_MISMATCH_GRACE_MS));
|
|
CHECK(netplay_boot_mismatch_final(0xFFFFFF00u, 0x00000C00u, NETPLAY_BOOT_MISMATCH_GRACE_MS));
|
|
/* The old behaviour was a 20 s admit-stall watchdog; the grace is far
|
|
* shorter than that. */
|
|
CHECK(NETPLAY_BOOT_MISMATCH_GRACE_MS < 20000u);
|
|
|
|
if (failures) {
|
|
fprintf(stderr, "netplay_exit_reason: %d check(s) FAILED\n", failures);
|
|
return 1;
|
|
}
|
|
puts("netplay_exit_reason: PASS");
|
|
return 0;
|
|
}
|