rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

process stop detection and relaunch feature (useful for winxp where the server/client is killed at logout).

This commit is contained in:
Nick Bolton 2012-07-14 04:48:32 +00:00
parent 60125e8499
commit 3e0f062df0
1 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -257,6 +257,8 @@ CMSWindowsRelauncher::mainLoop(void*)
PROCESS_INFORMATION pi; PROCESS_INFORMATION pi;
ZeroMemory(&pi, sizeof(PROCESS_INFORMATION)); ZeroMemory(&pi, sizeof(PROCESS_INFORMATION));
int failures = 0;
while (m_running) { while (m_running) {
HANDLE sendSasEvent = 0; HANDLE sendSasEvent = 0;
@ -268,9 +270,40 @@ CMSWindowsRelauncher::mainLoop(void*)
DWORD newSessionId = getSessionId(); DWORD newSessionId = getSessionId();
bool running = false;
if (launched) {
DWORD exitCode;
GetExitCodeProcess(pi.hProcess, &exitCode);
running = (exitCode == STILL_ACTIVE);
if (!running) {
failures++;
LOG((CLOG_INFO "detected application not running, pid=%d, failures=%d", pi.dwProcessId, failures));
// increasing backoff period, maximum of 10 seconds.
int timeout = (failures * 2) < 10 ? (failures * 2) : 10;
LOG((CLOG_DEBUG "waiting, backoff period is %d seconds", timeout));
ARCH->sleep(timeout);
// double check, in case process started after we waited.
GetExitCodeProcess(pi.hProcess, &exitCode);
running = (exitCode == STILL_ACTIVE);
}
else {
// reset failures when running.
failures = 0;
}
}
// only enter here when id changes, and the session isn't -1, which // only enter here when id changes, and the session isn't -1, which
// may mean that there is no active session. // may mean that there is no active session.
if (((newSessionId != sessionId) && (newSessionId != -1)) || m_commandChanged) { bool sessionChanged = ((newSessionId != sessionId) && (newSessionId != -1));
// relaunch if it was running but has stopped unexpectedly.
bool stoppedRunning = (launched && !running);
if (stoppedRunning || sessionChanged || m_commandChanged) {
m_commandChanged = false; m_commandChanged = false;
@ -328,6 +361,7 @@ CMSWindowsRelauncher::mainLoop(void*)
CREATE_UNICODE_ENVIRONMENT; CREATE_UNICODE_ENVIRONMENT;
// re-launch in current active user session // re-launch in current active user session
LOG((CLOG_INFO "starting new process"));
BOOL createRet = CreateProcessAsUser( BOOL createRet = CreateProcessAsUser(
userToken, NULL, LPSTR(cmd.c_str()), userToken, NULL, LPSTR(cmd.c_str()),
&sa, NULL, TRUE, creationFlags, &sa, NULL, TRUE, creationFlags,