Add support for debugging core nondeterminism

This adds a debug flag to netplay_net (DEBUG_NONDETERMINISTIC_CORES)
which helps determine if a core has nondeterminism.
This commit is contained in:
Gregor Richards 2016-10-05 07:58:01 -04:00
parent 60153e7035
commit e65a63e5d5
1 changed files with 21 additions and 1 deletions

View File

@ -27,7 +27,9 @@
#include "../../autosave.h" #include "../../autosave.h"
#define TOO_EARLY_TO_SAVE 60 #if 0
#define DEBUG_NONDETERMINISTIC_CORES
#endif
static void netplay_handle_frame_hash(netplay_t *netplay, struct delta_frame *delta) static void netplay_handle_frame_hash(netplay_t *netplay, struct delta_frame *delta)
{ {
@ -195,6 +197,7 @@ static void netplay_net_post_frame(netplay_t *netplay)
return; return;
} }
#ifndef DEBUG_NONDETERMINISTIC_CORES
if (!netplay->force_rewind) if (!netplay->force_rewind)
{ {
/* Skip ahead if we predicted correctly. /* Skip ahead if we predicted correctly.
@ -213,6 +216,7 @@ static void netplay_net_post_frame(netplay_t *netplay)
netplay->other_frame_count++; netplay->other_frame_count++;
} }
} }
#endif
/* Now replay the real input if we've gotten ahead of it */ /* Now replay the real input if we've gotten ahead of it */
if (netplay->force_rewind || if (netplay->force_rewind ||
@ -257,6 +261,22 @@ static void netplay_net_post_frame(netplay_t *netplay)
autosave_unlock(); autosave_unlock();
netplay->replay_ptr = NEXT_PTR(netplay->replay_ptr); netplay->replay_ptr = NEXT_PTR(netplay->replay_ptr);
netplay->replay_frame_count++; netplay->replay_frame_count++;
#ifdef DEBUG_NONDETERMINISTIC_CORES
if (ptr->have_remote && netplay_delta_frame_ready(netplay, &netplay->buffer[netplay->replay_ptr], netplay->replay_frame_count))
{
RARCH_LOG("PRE %u: %X\n", netplay->replay_frame_count-1, netplay_delta_frame_crc(netplay, ptr));
if (netplay->is_server)
RARCH_LOG("INP %X %X\n", ptr->real_input_state[0], ptr->self_state[0]);
else
RARCH_LOG("INP %X %X\n", ptr->self_state[0], ptr->real_input_state[0]);
ptr = &netplay->buffer[netplay->replay_ptr];
serial_info.data = ptr->state;
memset(serial_info.data, 0, serial_info.size);
core_serialize(&serial_info);
RARCH_LOG("POST %u: %X\n", netplay->replay_frame_count-1, netplay_delta_frame_crc(netplay, ptr));
}
#endif
} }
if (netplay->read_frame_count < netplay->self_frame_count) if (netplay->read_frame_count < netplay->self_frame_count)