This repository has been archived by the owner on Aug 29, 2024. It is now read-only.
Bugfix/unr-1453 fix net dormancy #1364
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
improbable-prow-robot
added
jira/no-ticket
m-samiec
requested review from
improbable-valy,
samiwh,
tenevdev and
cmsmithio
| @@ -1496,6 +1518,35 @@ bool USpatialNetDriver::CreateSpatialNetConnection(const FURL& InUrl, const FUni | |||
| return true; | |||
| } | |||
|
|
|||
| void USpatialNetDriver::ProcessPendingDormancy() | |||
| { | |||
| TArray<TWeakObjectPtr<USpatialActorChannel>> RemoveChannels; | |||
There was a problem hiding this comment.
Build a set of channels that are still pending, as per offline discussion.
| @@ -1027,6 +1046,7 @@ void USpatialNetDriver::ServerReplicateActors_ProcessPrioritizedActors(UNetConne | |||
| } | |||
|
|
|||
| Channel = GetOrCreateSpatialActorChannel(Actor); | |||
| check(Channel == nullptr || Channel->Actor != nullptr); | |||
There was a problem hiding this comment.
Reevaluate this check.
| @@ -1692,6 +1743,7 @@ void USpatialPendingNetGame::SendJoin() | |||
|
|
|||
| void USpatialNetDriver::AddActorChannel(Worker_EntityId EntityId, USpatialActorChannel* Channel) | |||
| { | |||
| check(Channel != nullptr && Channel->Actor != nullptr); | |||
There was a problem hiding this comment.
Reevaluate this check.
| @@ -1715,6 +1767,7 @@ USpatialActorChannel* USpatialNetDriver::GetOrCreateSpatialActorChannel(UObject* | |||
| { | |||
| check(TargetObject); | |||
| USpatialActorChannel* Channel = GetActorChannelByEntityId(PackageMap->GetEntityIdFromObject(TargetObject)); | |||
| check(Channel == nullptr || Channel->Actor != nullptr); | |||
There was a problem hiding this comment.
Reevaluate this check.
| @@ -358,7 +380,10 @@ void USpatialReceiver::HandleActorAuthority(const Worker_AuthorityChangeOp& Op) | |||
| } | |||
| } | |||
|
|
|||
| UpdateShadowData(Op.entity_id); | |||
| if (bDormantActor == false) | |||
There was a problem hiding this comment.
Suggested change
| if (bDormantActor == false) | |
| if (!bDormantActor) |
SpatialGDK/Source/SpatialGDK/Public/EngineClasses/SpatialActorChannel.h
Outdated
Show resolved
Hide resolved
SpatialGDK/Source/SpatialGDK/Public/EngineClasses/SpatialActorChannel.h
Outdated
Show resolved
Hide resolved
| @@ -41,6 +41,8 @@ class SPATIALGDK_API USpatialNetConnection : public UIpConnection | |||
| /////// | |||
| // End NetConnection Interface | |||
|
|
|||
| virtual bool IsReplayConnection() const override { return false; } | |||
There was a problem hiding this comment.
Isn't this also in the NetConnection interface?
improbable-valy
approved these changes
Oct 1, 2019
Co-Authored-By: improbable-valentyn <32096431+improbable-valentyn@users.noreply.github.com>
| if (IsDormantEntity(EntityId) && ThisActor->HasAuthority()) | ||
| { | ||
| // Deliberately don't unregister the dormant entity, but let it get cleaned up in the entity remove op process | ||
| check(StaticComponentView->GetAuthority(EntityId, SpatialGDK::Position::ComponentId) == WORKER_AUTHORITY_AUTHORITATIVE); |
There was a problem hiding this comment.
This will cause a crash if the last update we sent before making the actor dormant caused it to cross a boundary.
| Channel->ConditionalCleanUp(false, EChannelCloseReason::Dormancy); | ||
| } | ||
| } | ||
| PendingDormantChannels = std::move(RemainingChannels); |
There was a problem hiding this comment.
Nit
Suggested change
| PendingDormantChannels = std::move(RemainingChannels); | |
| PendingDormantChannels = MoveTemp(RemainingChannels); |
| if (Channel != nullptr && Channel->Actor == nullptr) | ||
| { | ||
| // This shouldn't occur, but can often crop up whilst we are refactoring entity/actor/channel lifecycles. | ||
| UE_LOG(LogSpatialOSNetDriver, Error, TEXT("Failed to correct initialize SpatialActorChannel for [%s]"), *TargetObject->GetName()); |
There was a problem hiding this comment.
Suggested change
| UE_LOG(LogSpatialOSNetDriver, Error, TEXT("Failed to correct initialize SpatialActorChannel for [%s]"), *TargetObject->GetName()); | |
| UE_LOG(LogSpatialOSNetDriver, Error, TEXT("Failed to correctly initialize SpatialActorChannel for [%s]"), *TargetObject->GetName()); |
improbable-valy
approved these changes
Oct 2, 2019
m-samiec
commented
Oct 2, 2019
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Actors can now go dormant within Spatial and their actors will be cleaned up.
Requires engine PR - https://github.com/improbableio/UnrealEngine/pull/258
Release note
Feature:
Tests
Tested locally within a gym, will upload to TPS.
Primary reviewers
@improbable-valentyn @samiwh