backup/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2026-11-04 22:45:23 +08:00
Code Issues Projects Releases Wiki Activity

fixed lousy ipc client/server cleanup and shutdown doubled timeout.

Browse Source
This commit is contained in:
Nick Bolton
2012-07-13 17:08:00 +00:00
parent db3ea4ab9c
commit 738c321bae
4 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/lib/ipc/CIpcClient.cpp
View File

@@ -46,7 +46,6 @@ CIpcClient::init()
CIpcClient::~CIpcClient()
{
disconnect();
}
void

1
src/lib/ipc/CIpcClientProxy.cpp
View File

@@ -184,6 +184,7 @@ CIpcClientProxy::disconnect()
{
LOG((CLOG_DEBUG "ipc client proxy disconnect"));
m_disconnecting = true;
m_stream.close();
EVENTQUEUE->addEvent(CEvent(getDisconnectedEvent(), this));
}

2
src/lib/ipc/CIpcServerProxy.cpp
View File

@@ -38,8 +38,6 @@ CIpcServerProxy::~CIpcServerProxy()
{
EVENTQUEUE->removeHandler(m_stream.getInputReadyEvent(),
m_stream.getEventTarget());
m_stream.close();
}
void

6
src/lib/platform/CMSWindowsRelauncher.cpp
View File

@@ -276,7 +276,7 @@ CMSWindowsRelauncher::mainLoop(void*)
if (launched) {
LOG((CLOG_DEBUG "closing existing process to make way for new one"));
shutdownProcess(pi.hProcess, pi.dwProcessId, 10);
shutdownProcess(pi.hProcess, pi.dwProcessId, 20);
launched = false;
}
@@ -365,7 +365,7 @@ CMSWindowsRelauncher::mainLoop(void*)
if (launched) {
LOG((CLOG_DEBUG "terminated running process on exit"));
shutdownProcess(pi.hProcess, pi.dwProcessId, 10);
shutdownProcess(pi.hProcess, pi.dwProcessId, 20);
}
LOG((CLOG_DEBUG "relauncher main thread finished"));
@@ -506,7 +506,7 @@ CMSWindowsRelauncher::shutdownExistingProcesses()
_stricmp(entry.szExeFile, "synergys.exe") == 0) {
HANDLE handle = OpenProcess(PROCESS_ALL_ACCESS, FALSE, entry.th32ProcessID);
shutdownProcess(handle, entry.th32ProcessID, 1);
shutdownProcess(handle, entry.th32ProcessID, 10);
}
}