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

LiveCoding: Allow editor thread to keep running while server is processing modules.

Browse Source 
#rb none
#jira UE-71269

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5361379 in //UE4/Release-4.22/... via CL 5368488
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5381906 by ben marsh in Dev-Anim branch]
This commit is contained in:
ben marsh
2019-03-13 10:03:35 -04:00
parent 63faf30df0
commit ff3f76cccb
1 changed files with 57 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
Engine/Source/Developer/Windows/LiveCoding/Private/External/LC_ClientUserCommandThread.cpp vendored
View File

@@ -662,6 +662,48 @@ unsigned int __stdcall ClientUserCommandThread::ThreadProxy(void* context)
}
// BEGIN EPIC MOD - Temporarily release lock to prevent hangs
class LeaveableScopedLock
{
public:
explicit LeaveableScopedLock(CriticalSection* cs)
: m_cs(cs)
, m_hasLock(true)
{
cs->Enter();
}
void Enter()
{
if (!m_hasLock)
{
m_cs->Enter();
m_hasLock = true;
}
}
void Leave()
{
if (m_hasLock)
{
m_cs->Leave();
m_hasLock = false;
}
}
~LeaveableScopedLock(void)
{
Leave();
}
private:
CriticalSection* m_cs;
bool m_hasLock;
};
// END EPIC MOD
unsigned int ClientUserCommandThread::ThreadFunction(Event* waitForStartEvent, CriticalSection* pipeAccessCS)
{
// wait until we get the signal that the thread can start
@@ -702,7 +744,9 @@ unsigned int ClientUserCommandThread::ThreadFunction(Event* waitForStartEvent, C
// lock critical section for accessing the queue.
// user code might be calling other exported functions in the mean time.
CriticalSection::ScopedLock queueLock(&g_userCommandQueueCS);
// BEGIN EPIC MOD - Rearrange lock scope to prevent hangs
LeaveableScopedLock queueLock(&g_userCommandQueueCS);
// END EPIC MOD
if (g_userCommandQueue.size() == 0u)
{
@@ -743,6 +787,10 @@ unsigned int ClientUserCommandThread::ThreadFunction(Event* waitForStartEvent, C
}
}
// BEGIN EPIC MOD - Temporarily release lock to prevent hangs
queueLock.Leave();
// BEGIN EPIC MOD - Pre
// send out scoped commands first
{
const size_t count = enabledScopedCommands.size();
@@ -795,6 +843,14 @@ unsigned int ClientUserCommandThread::ThreadFunction(Event* waitForStartEvent, C
}
}
// BEGIN EPIC MOD - Temporarily release lock to prevent hangs
queueLock.Enter();
if(g_userCommandQueue.size() > 0)
{
continue;
}
// BEGIN EPIC MOD
m_itemInQueueEvent->Reset();
}