lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-04 09:00:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor RemoteHost to be copyable with shared storage

Browse Source 
* This allows RemoteHost handles to still be valid and usable (if returning
  empty data) when they are deleted/removed if the device is disconnected, as
  well as providing better multi-thread access (they lock internally)
This commit is contained in:
baldurk
2019-07-30 16:20:09 +01:00
parent da289fdbcc
commit 06f2e61b8f
15 changed files with 626 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/ReplayManager.cpp
+9 -8
View File
@@ -305,11 +305,11 @@ void ReplayManager::CloseThread()
m_Thread = NULL;
}
ReplayStatus ReplayManager::ConnectToRemoteServer(RemoteHost *host)
ReplayStatus ReplayManager::ConnectToRemoteServer(RemoteHost host)
{
ReplayStatus status = RENDERDOC_CreateRemoteServerConnection(host->hostname.c_str(), 0, &m_Remote);
ReplayStatus status = RENDERDOC_CreateRemoteServerConnection(host.Hostname().c_str(), 0, &m_Remote);
if(host->IsADB())
if(host.IsADB())
{
ANALYTIC_SET(UIFeatures.AndroidRemoteReplay, true);
}
@@ -322,7 +322,7 @@ ReplayStatus ReplayManager::ConnectToRemoteServer(RemoteHost *host)
if(status == ReplayStatus::Succeeded)
{
m_RemoteHost->connected = true;
m_RemoteHost.SetConnected(true);
return status;
}
@@ -331,8 +331,7 @@ ReplayStatus ReplayManager::ConnectToRemoteServer(RemoteHost *host)
void ReplayManager::DisconnectFromRemoteServer()
{
if(m_RemoteHost)
m_RemoteHost->connected = false;
m_RemoteHost.SetConnected(false);
if(m_Remote)
{
@@ -340,12 +339,14 @@ void ReplayManager::DisconnectFromRemoteServer()
m_Remote->ShutdownConnection();
}
m_RemoteHost = NULL;
m_RemoteHost = RemoteHost();
m_Remote = NULL;
}
void ReplayManager::ShutdownServer()
{
m_RemoteHost.SetShutdown();
if(m_Remote)
{
QMutexLocker autolock(&m_RemoteLock);
@@ -365,7 +366,7 @@ void ReplayManager::PingRemote()
if(!IsRunning() || m_Thread->isCurrentThread())
{
if(!m_Remote->Ping())
m_RemoteHost->serverRunning = false;
m_RemoteHost.SetShutdown();
}
m_RemoteLock.unlock();
}