diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-03-13 09:17:21 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-03-13 12:11:04 +0100 |
| commit | 3902bb7a45f6266c51e01eddcda4e25b34814957 (patch) | |
| tree | e011f64cdfcc37975efd5497155f138813caad34 /comphelper | |
| parent | 9d778261d4dd6e50e6c5f7583c4dfa5f8d5b5a0b (diff) | |
Revert "comphelper: fix MSVC hang in ThreadPool::shutdown()"
As it causes "unopkg.bin:
/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_clang_dbgutil_64/comphelper/source/misc/threadpool.cxx:96:
comphelper::ThreadPool::~ThreadPool(): Assertion `mbTerminate' failed."
in
<https://ci.libreoffice.org/job/lo_gerrit/8283/Config=linux_clang_dbgutil_64/console>
and also locally. Revert till it's clear if that assert() should be a
SAL_WARN() or unopkg has to be fixed.
This reverts commit 9899ffd244dd367ba69dffe1f21f4f0222064a46.
Change-Id: I72902f7da410012340aa8231d84c6871a3f7b976
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/source/misc/threadpool.cxx | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/comphelper/source/misc/threadpool.cxx b/comphelper/source/misc/threadpool.cxx index 1219ef24b986..712009d8a2b4 100644 --- a/comphelper/source/misc/threadpool.cxx +++ b/comphelper/source/misc/threadpool.cxx @@ -89,12 +89,7 @@ ThreadPool::ThreadPool( sal_Int32 nWorkers ) : ThreadPool::~ThreadPool() { - // note: calling shutdown from global variable dtor blocks forever on Win7 - // note2: there isn't enough MSVCRT left on exit to call assert() properly - // so these asserts just print something to stderr but exit status is - // still 0, but hopefully they will be more helpful on non-WNT platforms - assert(mbTerminate); - assert(maTasks.empty()); + shutdown(); } struct ThreadPoolStatic : public rtl::StaticWithInit< std::shared_ptr< ThreadPool >, @@ -132,7 +127,6 @@ sal_Int32 ThreadPool::getPreferredConcurrency() return ThreadCount; } -// FIXME: what does "this" refer to in the following? // FIXME: there should be no need for this as/when our baseline // is >VS2015 and drop WinXP; the sorry details are here: // https://connect.microsoft.com/VisualStudio/feedback/details/1282596 |