Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

win32: Don't rely on timeout at all #2350

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

win32: Don't rely on timeout at all #2350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b16fa2e
win32: Don't run cleanup if we're about to exit anyway
Keno Dec 29, 2019
b89aef2
win32: Properly wait unil the thread finishes in dll unload
Keno Dec 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions driver/others/blas_server_win32.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,14 +462,7 @@ int BLASFUNC(blas_thread_shutdown)(void){

for(i = 0; i < blas_num_threads - 1; i++){
// Could also just use WaitForMultipleObjects
DWORD wait_thread_value = WaitForSingleObject(blas_threads[i], 50);

#ifndef OS_WINDOWSSTORE
// TerminateThread is only available with WINAPI_DESKTOP and WINAPI_SYSTEM not WINAPI_APP in UWP
if (WAIT_OBJECT_0 != wait_thread_value) {
TerminateThread(blas_threads[i],0);
}
#endif
DWORD wait_thread_value = WaitForSingleObject(blas_threads[i], INFINITE);

CloseHandle(blas_threads[i]);
}
Expand Down
5 changes: 4 additions & 1 deletion exports/dllinit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,10 @@ BOOL APIENTRY DllMain(HINSTANCE hInst, DWORD reason, LPVOID reserved) {
gotoblas_init();
break;
case DLL_PROCESS_DETACH:
gotoblas_quit();
// If the process is about to exit, don't bother releasing any resources
// The kernel is much better at bulk releasing then.
if (!reserved)
gotoblas_quit();
break;
case DLL_THREAD_ATTACH:
break;
Expand Down