huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gracefully shutdown the filewatcher thread (#530)

This commit is contained in:
pan-wang 2018-01-19 14:31:51 -08:00 committed by GitHub
parent 2204989660
commit d85ed094aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/AspNetCore/Inc/filewatcher.h
View File

@ -54,6 +54,7 @@ public:
private:
HANDLE m_hCompletionPort;
HANDLE m_hChangeNotificationThread;
volatile BOOL m_fThreadExit;
};
class FILE_WATCHER_ENTRY

38
src/AspNetCore/Src/filewatcher.cxx
View File

@ -5,7 +5,8 @@
FILE_WATCHER::FILE_WATCHER() :
m_hCompletionPort(NULL),
m_hChangeNotificationThread(NULL)
m_hChangeNotificationThread(NULL),
m_fThreadExit(FALSE)
{
}
@ -13,8 +14,36 @@ FILE_WATCHER::~FILE_WATCHER()
{
if (m_hChangeNotificationThread != NULL)
{
DWORD dwRetryCounter = 20; // totally wait for 1s
DWORD dwExitCode = STILL_ACTIVE;
// signal the file watch thread to exit
PostQueuedCompletionStatus(m_hCompletionPort, 0, FILE_WATCHER_SHUTDOWN_KEY, NULL);
WaitForSingleObject(m_hChangeNotificationThread, INFINITE);
while (!m_fThreadExit && dwRetryCounter > 0)
{
if (GetExitCodeThread(m_hChangeNotificationThread, &dwExitCode))
{
if (dwExitCode == STILL_ACTIVE)
{
// the file watcher thread will set m_fThreadExit before exit
WaitForSingleObject(m_hChangeNotificationThread, 50);
}
}
else
{
// fail to get thread status
// call terminitethread
TerminateThread(m_hChangeNotificationThread, 1);
m_fThreadExit = TRUE;
}
dwRetryCounter--;
}
if (!m_fThreadExit)
{
TerminateThread(m_hChangeNotificationThread, 1);
}
CloseHandle(m_hChangeNotificationThread);
m_hChangeNotificationThread = NULL;
}
@ -126,7 +155,8 @@ Win32 error
cbCompletion = 0;
}
return 0;
pFileMonitor->m_fThreadExit = TRUE;
ExitThread(0);
}
VOID
@ -463,4 +493,4 @@ FILE_WATCHER_ENTRY::Create(
Finished:
return hr;
}
}