Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[rebased] Compare timebase of netplay users to detect desyncs. #2517

Merged
merged 3 commits into from Jun 8, 2015

Conversation

comex
Copy link
Contributor

@comex comex commented Jun 4, 2015

Based on #2178. Haven't done much more than rebase and compile check yet, since I'm about to go to sleep, but in the spirit of getting things done...

packet >> x;
packet >> y;
packet >> frame;
s_timebase[frame].emplace_back(x | ((u64)y >> 32), player.pid);

This comment was marked as off-topic.

@comex comex force-pushed the netplay-timebase-rb branch 2 times, most recently from edd3d9c to 230d29b Compare June 6, 2015 05:21
@comex comex changed the title [WIP] [rebased] Compare timebase of netplay users to detect desyncs. [rebased] Compare timebase of netplay users to detect desyncs. Jun 6, 2015
@comex
Copy link
Contributor Author

comex commented Jun 6, 2015

Okay, should actually work now.

Note - I removed a SleepCurrentThread(1) the patch added which seemed to
be unrelated to the actual job at hand.  If there was a real need for it
(which sounds like it would be an enet-related bug - enet_host_service
is supposed to *sleep*), that needs to be dealt with...
@@ -129,6 +130,13 @@ void SetIsFramelimiterTempDisabled(bool disable)
std::string GetStateFileName() { return s_state_filename; }
void SetStateFileName(const std::string& val) { s_state_filename = val; }

void FrameUpdateOnCPUThread()
{
if (!IsCPUThread()) abort();

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

@JMC47
Copy link
Contributor

JMC47 commented Jun 6, 2015

In a quick test this is absolutely amazing.

@JMC47
Copy link
Contributor

JMC47 commented Jun 7, 2015

JMC47: Lioncash, review 2517 ;D
JMC47: it's pertinent to my interests.
Lioncash: i dont have any issues with it.

comex added a commit that referenced this pull request Jun 8, 2015
[rebased] Compare timebase of netplay users to detect desyncs.
@comex comex merged commit 5c7caf1 into dolphin-emu:master Jun 8, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
4 participants