izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Add FGenericPlatformProcess::TerminateProcTreeWithPredicate() that enables killing a launched process tree while keeping some of the child processes alive.

Browse Source 
#jira none
#rb carlmagnus.nordin
#rnx
#preflight 621df1fcf1206ae3ea3c23be

[CL 19196914 by PJ Kack in ue5-main branch]
This commit is contained in:
PJ Kack
2022-03-01 07:42:09 -05:00
parent dca3882e44
commit 23456e2db7
4 changed files with 50 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Engine/Source/Runtime/Core/Private/GenericPlatform/GenericPlatformProcess.cpp
View File

@@ -278,6 +278,13 @@ void FGenericPlatformProcess::TerminateProc( FProcHandle & ProcessHandle, bool K
UE_LOG(LogHAL, Fatal, TEXT("FGenericPlatformProcess::TerminateProc not implemented on this platform"));
}
void FGenericPlatformProcess::TerminateProcTreeWithPredicate(
FProcHandle& ProcessHandle,
TFunctionRef<bool(uint32 ProcessId, const TCHAR* ApplicationName)> Predicate)
{
UE_LOG(LogHAL, Fatal, TEXT("FGenericPlatformProcess::TerminateProcTreeWithPredicate not implemented on this platform"));
}
FGenericPlatformProcess::EWaitAndForkResult FGenericPlatformProcess::WaitAndFork()
{
UE_LOG(LogHAL, Fatal, TEXT("FGenericPlatformProcess::WaitAndFork not implemented on this platform"));

50
Engine/Source/Runtime/Core/Private/Windows/WindowsPlatformProcess.cpp
View File

@@ -439,35 +439,45 @@ void FWindowsPlatformProcess::CloseProc(FProcHandle & ProcessHandle)
void FWindowsPlatformProcess::TerminateProc( FProcHandle & ProcessHandle, bool KillTree )
{
if (KillTree)
TerminateProcTreeWithPredicate(ProcessHandle, [](uint32 ProcessId, const TCHAR* ApplicationName) { return true; });
}
void FWindowsPlatformProcess::TerminateProcTreeWithPredicate(
FProcHandle& ProcessHandle,
TFunctionRef<bool(uint32 ProcessId, const TCHAR* ApplicationName)> Predicate)
{
::DWORD ProcessId = ::GetProcessId(ProcessHandle.Get());
FString ProcessName = FPlatformProcess::GetApplicationName(ProcessId);
if (!Predicate(ProcessId, *ProcessName))
{
HANDLE SnapShot = ::CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
return;
}
if (SnapShot != INVALID_HANDLE_VALUE)
HANDLE SnapShot = ::CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
if (SnapShot != INVALID_HANDLE_VALUE)
{
PROCESSENTRY32 Entry;
Entry.dwSize = sizeof(PROCESSENTRY32);
if (::Process32First(SnapShot, &Entry))
{
::DWORD ProcessId = ::GetProcessId(ProcessHandle.Get());
PROCESSENTRY32 Entry;
Entry.dwSize = sizeof(PROCESSENTRY32);
if (::Process32First(SnapShot, &Entry))
do
{
do
if (Entry.th32ParentProcessID == ProcessId)
{
if (Entry.th32ParentProcessID == ProcessId)
{
HANDLE ChildProcHandle = ::OpenProcess(PROCESS_ALL_ACCESS, 0, Entry.th32ProcessID);
HANDLE ChildProcHandle = ::OpenProcess(PROCESS_ALL_ACCESS, 0, Entry.th32ProcessID);
if (ChildProcHandle)
{
FProcHandle ChildHandle(ChildProcHandle);
TerminateProc(ChildHandle, KillTree);
// ::TerminateProcess(ChildProcHandle, 1);
}
if (ChildProcHandle)
{
FProcHandle ChildHandle(ChildProcHandle);
TerminateProcTreeWithPredicate(ChildHandle, Predicate);
}
}
while(::Process32Next(SnapShot, &Entry));
}
while(::Process32Next(SnapShot, &Entry));
}
}

10
Engine/Source/Runtime/Core/Public/GenericPlatform/GenericPlatformProcess.h
View File

@@ -468,6 +468,16 @@ struct CORE_API FGenericPlatformProcess
*/
static void TerminateProc( FProcHandle & ProcessHandle, bool KillTree = false );
/** Terminates a process tree
*
* @param ProcessHandle handle returned from FPlatformProcess::CreateProc
* @param Predicate that returns true if the process identified by ProcessId and ApplicationName
* should be terminated with its children, else that process and its children will be kept alive
*/
static void TerminateProcTreeWithPredicate(
FProcHandle& ProcessHandle,
TFunctionRef<bool(uint32 ProcessId, const TCHAR* ApplicationName)> Predicate);
enum class EWaitAndForkResult : uint8
{
Error,

3
Engine/Source/Runtime/Core/Public/Windows/WindowsPlatformProcess.h
View File

@@ -162,6 +162,9 @@ public:
static void WaitForProc( FProcHandle & ProcessHandle );
static void CloseProc( FProcHandle & ProcessHandle );
static void TerminateProc( FProcHandle & ProcessHandle, bool KillTree = false );
static void TerminateProcTreeWithPredicate(
FProcHandle& ProcessHandle,
TFunctionRef<bool(uint32 ProcessId, const TCHAR* ApplicationName)> Predicate);
static bool GetProcReturnCode( FProcHandle & ProcHandle, int32* ReturnCode );
static bool GetApplicationMemoryUsage(uint32 ProcessId, SIZE_T* OutMemoryUsage);
static bool GetPerFrameProcessorUsage(uint32 ProcessId, float& ProcessUsageFraction, float& IdleUsageFraction);