Skip to content
This repository has been archived by the owner on Nov 16, 2022. It is now read-only.

Fixing initialization errors and unity log errors. Also fixes a bug with int encoding of the frames in backroll connection. #5

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fixing initialization errors and unity log errors. Also fixes a bug with int encoding of the frames in backroll connection. #5

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2da0302
Fixing Unity debug formatting errors, various initialization errors, …
chunloklo Dec 28, 2020
e77ff7d
fixing sync test and sync printing
chunloklo Jan 16, 2021
d0a9392
removing comments, fixing minor spacing changes, and made several oth…
chunloklo Jan 17, 2021
2565789
pushing latest version of backroll with various desync logging and ob…
chunloklo Oct 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 44 additions & 28 deletions Runtime/Backends/P2PBackrollSession.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ public unsafe class P2PBackrollSession<T> : BackrollSession<T> where T : struct

public bool IsSynchronizing {
get {
// Always synchronized
return false;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this correct? I don't think this is true even in the C++ implementation for GGPO.

for (var i = 0; i < _players.Length; i++) {
if (!_players[i].IsLocal && !_players[i].IsSynchronized &&
!_localConnectStatus[i].Disconnected) {
Expand Down Expand Up @@ -76,37 +78,46 @@ public P2PBackrollSession(BackrollSessionConfig config) {

_callbacks = config.Callbacks;

_players = InitializeConnections(config.Players);
_spectators = InitializeConnections(config.Spectators);

SetupConnections(_players);
SetupConnections(_spectators);

_localConnectStatus = new BackrollConnectStatus[PlayerCount];
for (int i = 0; i < _localConnectStatus.Length; i++) {
_localConnectStatus[i].LastFrame = -1;
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does this initialization change do? What was broken before?

Copy link

@christopherliu830 christopherliu830 Jan 10, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Previous code checked PlayerCount on line 87 (_players.Length) before _players was assigned (line 94)
also, SetupConnection tries to get the index of the player in _players so it can't be used during the assignment to _players

// Initialize the synchronziation layer
_sync = new Sync(_localConnectStatus, new Sync.Config {
NumPlayers = config.Players.Length,
InputSize = InputSize,
Callbacks = _callbacks,
NumPredictionFrames = BackrollConstants.kMaxPredictionFrames,
});

_localConnectStatus = new BackrollConnectStatus[PlayerCount];
for (int i = 0; i < _localConnectStatus.Length; i++) {
unchecked {
_localConnectStatus[i].LastFrame = ~0;
}
}

_players = InitializeConnections(config.Players);
_spectators = InitializeConnections(config.Spectators);

}

BackrollConnection[] InitializeConnections(LobbyMember[] members) {
Assert.IsNotNull(members);
var connections = new BackrollConnection[members.Length];
for (var i = 0; i < connections.Length; i++) {
var connection = new BackrollConnection(members[i], i, _localConnectStatus);
connections[i] = connection;
}
return connections;
}

void SetupConnections(BackrollConnection[] connections) {
for (var i = 0; i < connections.Length; i++) {
ref BackrollConnection connection = ref connections[i];
SetupConnection(connection);
connection.SetDisconnectTimeout((uint)DEFAULT_DISCONNECT_TIMEOUT);
connection.SetDisconnectNotifyStart((uint)DEFAULT_DISCONNECT_NOTIFY_START);
connection.Synchronize();
connections[i] = connection;
}
return connections;
}

void UpdateConnections() {
Expand Down Expand Up @@ -137,12 +148,12 @@ public override void Idle(int timeout) {
minFrame = PollNPlayers(current_frame);
}

Debug.LogFormat("last confirmed frame in p2p backend is {}.", minFrame);
Debug.LogFormat("last confirmed frame in p2p backend is {0}.", minFrame);
if (minFrame >= 0) {
Assert.IsTrue(minFrame != int.MaxValue);
if (SpectatorCount > 0) {
while (_next_spectator_frame <= minFrame) {
Debug.LogFormat("pushing frame {} to spectators.", _next_spectator_frame);
Debug.LogFormat("pushing frame {0} to spectators.", _next_spectator_frame);

GameInput input;
input.Frame = _next_spectator_frame;
Expand All @@ -154,7 +165,7 @@ public override void Idle(int timeout) {
_next_spectator_frame++;
}
}
Debug.LogFormat("setting confirmed frame in sync to {}.", minFrame);
Debug.LogFormat("setting confirmed frame in sync to {0}.", minFrame);
_sync.SetLastConfirmedFrame(minFrame);
}

Expand Down Expand Up @@ -188,14 +199,14 @@ protected int Poll2Players(int current_frame) {
if (!_localConnectStatus[i].Disconnected) {
minFrame = (int)Math.Min(_localConnectStatus[i].LastFrame, minFrame);
}
Debug.LogFormat(" local endp: connected = {}, last_received = {}, minFrame = {}.",
Debug.LogFormat(" local endp: connected = {0}, last_received = {1}, minFrame = {2}.",
!_localConnectStatus[i].Disconnected, _localConnectStatus[i].LastFrame,
minFrame);
if (!connected && !_localConnectStatus[i].Disconnected) {
Debug.LogFormat("disconnecting i {} by remote request.", i);
Debug.LogFormat("disconnecting i {0} by remote request.", i);
DisconnectPlayerQueue(i, minFrame);
}
Debug.LogFormat(" minFrame = {}.", minFrame);
Debug.LogFormat(" minFrame = {0}.", minFrame);
}
return minFrame;
}
Expand All @@ -208,7 +219,7 @@ protected int PollNPlayers(int current_frame) {
for (var queue = 0; queue < PlayerCount; queue++) {
bool connected = true;
int minConfirmed = Int32.MaxValue;
Debug.LogFormat("considering queue {}.", queue);
Debug.LogFormat("considering queue {0}.", queue);
for (var i = 0; i < _players.Length; i++) {
// we're going to do a lot of logic here in consideration of endpoint i.
// keep accumulating the minimum confirmed point for all n*n packets and
Expand All @@ -227,7 +238,7 @@ protected int PollNPlayers(int current_frame) {
if (!_localConnectStatus[queue].Disconnected) {
minConfirmed = (int)Math.Min(_localConnectStatus[queue].LastFrame, minConfirmed);
}
Debug.LogFormat(" local endp: connected = {}, last_received = {}, minConfirmed = {}.",
Debug.LogFormat(" local endp: connected = {0}, last_received = {1}, minConfirmed = {2}.",
!_localConnectStatus[queue].Disconnected, _localConnectStatus[queue].LastFrame, minConfirmed);

if (connected) {
Expand All @@ -237,11 +248,11 @@ protected int PollNPlayers(int current_frame) {
// so, we need to re-adjust. This can happen when we detect our own disconnect at frame n
// and later receive a disconnect notification for frame n-1.
if (!_localConnectStatus[queue].Disconnected || _localConnectStatus[queue].LastFrame > minConfirmed) {
Debug.LogFormat("disconnecting queue {} by remote request.", queue);
Debug.LogFormat("disconnecting queue {0} by remote request.", queue);
DisconnectPlayerQueue(queue, minConfirmed);
}
}
Debug.LogFormat(" minFrame = {}.", minFrame);
Debug.LogFormat(" minFrame = {0}.", minFrame);
}
return minFrame;
}
Expand Down Expand Up @@ -272,7 +283,7 @@ public override void AddLocalInput(BackrollPlayerHandle player,
// confirmed local frame for this player. this must come first so it
// gets incorporated into the next packet we send.

Debug.LogFormat("setting local connect status for local queue {} to {}",
Debug.LogFormat("setting local connect status for local queue {0} to {1}",
queue, input.Frame);
_localConnectStatus[queue].LastFrame = input.Frame;

Expand All @@ -293,7 +304,7 @@ public override int SyncInput(void *values, int size) {
}

public override void AdvanceFrame() {
Debug.LogFormat("End of frame ({})...", _sync.FrameCount);
Debug.LogFormat("End of frame ({0})...", _sync.FrameCount);
_sync.IncrementFrame();
Idle(0);
}
Expand Down Expand Up @@ -325,13 +336,18 @@ void SetupConnection(BackrollConnection connection) {
if (_localConnectStatus[queue].Disconnected) return;
int current_remote_frame = _localConnectStatus[queue].LastFrame;
int new_remote_frame = input.Frame;


Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove extra space here.

Debug.Log($"[BackrollConnection][Nibblet][Read] Use Me! Remote Frame {new_remote_frame}, Last Frame {current_remote_frame}");
Assert.IsTrue(current_remote_frame == -1 || new_remote_frame == (current_remote_frame + 1));

_sync.AddRemoteInput(queue, ref input);
// Notify the other endpoints which frame we received from a peer
Debug.LogFormat("setting remote connect status for queue {} to {}",
Debug.LogFormat("setting remote connect status for queue {0} to {1}",
queue, new_remote_frame);
_localConnectStatus[queue].LastFrame = new_remote_frame;

Debug.Log($"[BackrollConnection][Nibblet][Read] Use Me! New Remote Frame {_localConnectStatus[queue].LastFrame}");
};

connection.OnSynchronizing += (total, count) => {
Expand Down Expand Up @@ -376,15 +392,15 @@ public override void DisconnectPlayer(BackrollPlayerHandle player) {
int current_frame = _sync.FrameCount;
// xxx: we should be tracking who the local player is, but for now assume
// that if the endpoint is not initalized, this must be the local player.
Debug.LogFormat("Disconnecting local player {} at frame {} by user request.",
Debug.LogFormat("Disconnecting local player {0} at frame {1} by user request.",
queue, _localConnectStatus[queue].LastFrame);
for (int i = 0; i < PlayerCount; i++) {
if (!_players[i].IsLocal) {
DisconnectPlayerQueue(i, current_frame);
}
}
} else {
Debug.LogFormat("Disconnecting queue {} at frame {} by user request.",
Debug.LogFormat("Disconnecting queue {0} at frame {1} by user request.",
queue, _localConnectStatus[queue].LastFrame);
DisconnectPlayerQueue(queue, _localConnectStatus[queue].LastFrame);
}
Expand All @@ -395,14 +411,14 @@ protected void DisconnectPlayerQueue(int queue, int syncto) {

_players[queue].Disconnect();

Debug.LogFormat("Changing queue {} local connect status for last frame from {} to {} on disconnect request (current: {}).",
Debug.LogFormat("Changing queue {0} local connect status for last frame from {1} to {2} on disconnect request (current: {3}).",
queue, _localConnectStatus[queue].LastFrame, syncto, framecount);

_localConnectStatus[queue].Disconnected = true;
_localConnectStatus[queue].LastFrame = syncto;

if (syncto < framecount) {
Debug.LogFormat("adjusting simulation to account for the fact that {} Disconnected @ {}.", queue, syncto);
Debug.LogFormat("adjusting simulation to account for the fact that {0} Disconnected @ {1}.", queue, syncto);
_sync.AdjustSimulation(syncto);
Debug.LogFormat("finished adjusting simulation.");
}
Expand Down
Loading