SL-18721: Faster viewer shutdown time since performance improvements can lead to perceived inventory loss due to cache corruption

[LLGuru]

Make LLWindowWin32::LLWindowWin32Thread::close() to be called from the class destructor

[akleshchev]

What issues close() call in such case?

[LLGuru]

What issues close() call in such case?

As iit was said in the comment above, the destructor of the class ThreadPool calls this method in any case:

LL::ThreadPool::~ThreadPool()
{
    close();
}

[nat-goodspeed]

I understand that you're deferring the LLWindowWin32Thread::close() call to its destructor, and that it's explicitly destroyed by ~LLWindowWin32(). But I don't know where the LLWindow subclass is destroyed?

[LLGuru]

I understand that you're deferring the LLWindowWin32Thread::close() call to its destructor, and that it's explicitly destroyed by ~LLWindowWin32(). But I don't know where the LLWindow subclass is destroyed?

The class LLWindow destructor is being explicitly called from LLWindowManager::destroyWindow()

BOOL LLWindowManager::destroyWindow(LLWindow* window)
{
	if (sWindowList.find(window) == sWindowList.end())
	{
		LL_ERRS() << "LLWindowManager::destroyWindow() : Window pointer not valid, this window doesn't exist!" 
			<< LL_ENDL;
		return FALSE;
	}

	window->close();

	sWindowList.erase(window);

	delete window;

	return TRUE;
}

The method LLWindowManager::destroyWindow() is being called from LLViewerWindow::destroyWindow()

void LLViewerWindow::destroyWindow()
{
	if (mWindow)
	{
		LLWindowManager::destroyWindow(mWindow);
	}
	mWindow = NULL;
}

The method LLViewerWindow::destroyWindow() is being called from LLViewerWindow::~LLViewerWindow()

LLViewerWindow::~LLViewerWindow()
{
	LL_INFOS() << "Destroying Window" << LL_ENDL;
	destroyWindow();

	delete mDebugText;
	mDebugText = NULL;

	if (LLViewerShaderMgr::sInitialized)
	{
		LLViewerShaderMgr::releaseInstance();
		LLViewerShaderMgr::sInitialized = FALSE;
	}
}

The full callstack looks as follows:

secondlife-bin.exe!LLWindow::~LLWindow() Line 125
[External Code]	
secondlife-bin.exe!LLWindowManager::destroyWindow(LLWindow * window) Line 465
[Inline Frame] secondlife-bin.exe!LLViewerWindow::destroyWindow() Line 5353
secondlife-bin.exe!LLViewerWindow::~LLViewerWindow() Line 2458
[External Code]	
secondlife-bin.exe!LLAppViewer::cleanup() Line 1903
secondlife-bin.exe!LLAppViewerWin32::cleanup() Line 705
secondlife-bin.exe!wWinMain(HINSTANCE__ * hInstance, HINSTANCE__ * hPrevInstance, wchar_t * pCmdLine, int nCmdShow) Line 464

[nat-goodspeed]

Thank you. I thought we'd need a new call at shutdown time, but your answer addresses my concern.