Hi, On Sat, Mar 11, 2017 at 10:09:01AM +0000, Michael Stahl <mstahl@redhat.com> wrote:
comphelper/source/misc/threadpool.cxx | 8 +++++++-
package/qa/cppunit/test_package.cxx | 14 +++++++++++---
pyuno/source/module/pyuno_module.cxx | 21 ++++++++++++++++-----
test/source/bootstrapfixture.cxx | 7 +++++++
test/source/vclbootstrapprotector.cxx | 3 +++
unotest/source/python/org/libreoffice/unotest.py | 3 +++
6 files changed, 47 insertions(+), 9 deletions(-)
New commits:
commit 9899ffd244dd367ba69dffe1f21f4f0222064a46
Author: Michael Stahl <mstahl@redhat.com>
Date: Sat Mar 11 00:44:21 2017 +0100
comphelper: fix MSVC hang in ThreadPool::shutdown()
The assert added here:
ThreadPool::~ThreadPool()
{
- shutdown();
+ // 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);
Seems to be a bit brave, see e.g. <https://ci.libreoffice.org/job/lo_gerrit/8283/Config=linux_clang_dbgutil_64/console>. I'm not sure what is a good way forward -- change that to a SAL_WARN() or fix unopkg to shut the thread pool down? (I had to revert this locally to have my gcc/dbgutil build 'make check' pass.) Regards, Miklos
Attachment:
signature.asc
Description: Digital signature