Skip to content

fix(session): free retired sessions at the start of a frame, not mid-frame #73

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.

Sign up for GitHub

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

Merged
notchyves merged 1 commit into from
Nov 6, 2026
Merged

fix(session): free retired sessions at the start of a frame, not mid-frame #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions src/client/Perlin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,9 +242,6 @@ namespace perlin {
else if (!friendLease && versionOverride.protocol > 0 && versionOverride.server == options.server)
session->SetProtocolOverride(versionOverride.protocol, versionOverride.version);
session->SetRecordTap(replayCtl.NewSessionTap());
if (connectsInFlight.load() == 0)
std::erase_if(retiredSessions,
[](const std::unique_ptr<BedrockSession>& s) { return !s->Transferring(); });
session->SetPacketHandler([this](uint32_t id, const std::vector<uint8_t>& body) {
if (!modWantPackets.load() || body.size() > 65536)
return;
Expand Down
5 changes: 5 additions & 0 deletions src/client/PerlinFrame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,11 @@ namespace perlin {
camera.aspect = static_cast<float>(width) / static_cast<float>(height);

PumpReplay(dt);
// retired sessions die here, before this frame takes `live`: Connect() can run mid-frame (a Discord
// join, a transfer, a button) while the rest of the frame still holds the old session
if (connectsInFlight.load() == 0)
std::erase_if(retiredSessions,
[](const std::unique_ptr<BedrockSession>& s) { return !s->Transferring(); });
live = sessionReady && session && !session->Transferring() ? session.get() : nullptr;
if (live) {
const physics::State& viewerState = player.State();
Expand Down
3 changes: 0 additions & 3 deletions src/client/PerlinReplay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,9 +336,6 @@ namespace perlin {
: 1 << 20);
session->SetPackDirectory(paths::DataDir() + "/server_packs");
sessionReady = true;
if (connectsInFlight.load() == 0)
std::erase_if(retiredSessions,
[](const std::unique_ptr<BedrockSession>& r) { return !r->Transferring(); });
}

void Perlin::MountReplayPacks() {
Expand Down
Loading