birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix memory leak of ProcessWatcher

Browse Source 
Signed-off-by: Gene Walters <genewalt@amazon.com>
This commit is contained in:
Gene Walters
2021-11-22 18:56:48 -08:00
parent 0bd86cf0a4
commit ff862a2f20
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp
+9 -4
View File
@@ -193,7 +193,7 @@ namespace Multiplayer
}
}
AzFramework::ProcessWatcher* LaunchEditorServer()
void MultiplayerEditorSystemComponent::LaunchEditorServer()
{
// Assemble the server's path
AZ::CVarFixedString serverProcess = editorsv_process;
@@ -248,7 +248,13 @@ namespace Multiplayer
"MultiplayerEditor", processLaunchInfo.m_launchResult != AzFramework::ProcessLauncher::ProcessLaunchResult::PLR_MissingFile,
"LaunchEditorServer failed! The ServerLauncher binary is missing! (%s) Please build server launcher.", serverPath.c_str())
return outProcess;
// Stop the previous server if one exists
if (m_serverProcessWatcher)
{
m_serverProcessWatcher->TerminateProcess(0);
}
m_serverProcessWatcher.reset(outProcess);
m_serverProcessTracePrinter = AZStd::make_unique<ProcessCommunicatorTracePrinter>(m_serverProcessWatcher->GetCommunicator(), "EditorServer");
}
void MultiplayerEditorSystemComponent::OnGameEntitiesStarted()
@@ -308,8 +314,7 @@ namespace Multiplayer
editorNetworkInterface->Listen(editorsv_port);
// Launch the editor-server
m_serverProcessWatcher = LaunchEditorServer();
m_serverProcessTracePrinter = AZStd::make_unique<ProcessCommunicatorTracePrinter>(m_serverProcessWatcher->GetCommunicator(), "EditorServer");
LaunchEditorServer();
AZ::TickBus::Handler::BusConnect();
}
else
Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.h
+4 -2
View File
@@ -83,7 +83,9 @@ namespace Multiplayer
bool IsInGameMode() override;
//! @}
private:
private:
void LaunchEditorServer();
//! EditorEvents::Handler overrides
//! @{
void OnEditorNotifyEvent(EEditorNotifyEvent event) override;
@@ -106,7 +108,7 @@ namespace Multiplayer
//! @}
IEditor* m_editor = nullptr;
AzFramework::ProcessWatcher* m_serverProcessWatcher = nullptr;
AZStd::unique_ptr<AzFramework::ProcessWatcher> m_serverProcessWatcher = nullptr;
AZStd::unique_ptr<ProcessCommunicatorTracePrinter> m_serverProcessTracePrinter = nullptr;
AzNetworking::ConnectionId m_editorConnId;