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 /package/qa | |
| 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 'package/qa')
| -rw-r--r-- | package/qa/cppunit/test_package.cxx | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/package/qa/cppunit/test_package.cxx b/package/qa/cppunit/test_package.cxx index d015e8db8d66..335f490ddaba 100644 --- a/package/qa/cppunit/test_package.cxx +++ b/package/qa/cppunit/test_package.cxx @@ -119,16 +119,8 @@ namespace uno::Reference<container::XNameAccess> xNA(xZip, uno::UNO_QUERY); CPPUNIT_ASSERT(xNA.is()); - struct TestThreadPool { - comphelper::ThreadPool aPool; - TestThreadPool(sal_Int32 const i) : aPool(i) {} - ~TestThreadPool() { aPool.shutdown(); } - }; - - { - TestThreadPool aPool(4); - comphelper::ThreadPool & rPool(aPool.aPool); + comphelper::ThreadPool aPool(4); std::shared_ptr<comphelper::ThreadTaskTag> pTag = comphelper::ThreadPool::createThreadTaskTag(); std::vector<std::vector<char>> aTestBuffers(26); @@ -143,10 +135,10 @@ namespace xNA->getByName(aName) >>= xStrm; CPPUNIT_ASSERT(xStrm.is()); - rPool.pushTask(new Worker(pTag, xStrm, *itBuf)); + aPool.pushTask(new Worker(pTag, xStrm, *itBuf)); } - rPool.waitUntilDone(pTag); + aPool.waitUntilDone(pTag); // Verify the streams. CPPUNIT_ASSERT_EQUAL(size_t(26), aTestBuffers.size()); |