Noel Grandin
e7d0b0d6b9
similar to
commit c02c75ba1e
Author: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Thu Mar 27 14:28:02 2025 +0200
fix CppunitTest_dbaccess_SingleSelectQueryComposer_test deadlock
deadlocking threads are
in privateSnippetExecutor
in connectivity::hsqldb::ODriverDelegator::shutdownConnection
in connectivity::hsqldb::ODriverDelegator::disposing
in privateSnippetExecutor
in dbaccess::OConnection::disposing
in dbaccess::OSharedConnection::close
in SingleSelectQueryComposerTest::tearDown
and
Thread 42 (Thread 0x7f7d6e672700 (LWP 3544697) "DocumentEventNo"):
in comphelper::SolarMutex::acquire
in dbaccess::ModelMethodGuard::ModelMethodGuard
in dbaccess::DocumentGuard::DocumentGuard
in dbaccess::ODatabaseDocument::getCurrentController
in non-virtual thunk to
dbaccess::ODatabaseDocument::getCurrentController
in tdoc_ucp::OfficeDocumentsManager::isWithoutOrInTopLevelFrame
in tdoc_ucp::OfficeDocumentsManager::isOfficeDocument
in tdoc_ucp::OfficeDocumentsManager::documentEventOccured
in dbaccess::DocumentEventNotifier_Impl::impl_notifyEvent_nothrow
in dbaccess::DocumentEventNotifier_Impl::processEvent
in comphelper::AsyncEventNotifierBase::execute()
in comphelper::AsyncEventNotifierAutoJoin::run()
in threadFunc(void*) (param=0x36a7450)
Change-Id: Ifb8e37a05ce62ca37132e8391980de821bb97ee8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183428
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
63 lines
1.8 KiB
Makefile
63 lines
1.8 KiB
Makefile
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
|
#
|
|
# This file is part of the LibreOffice project.
|
|
#
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
#
|
|
|
|
$(eval $(call gb_Library_Library,hsqldb))
|
|
|
|
$(eval $(call gb_Library_set_include,hsqldb,\
|
|
-I$(SRCDIR)/connectivity/inc \
|
|
-I$(SRCDIR)/connectivity/source/inc \
|
|
$$(INCLUDE) \
|
|
))
|
|
|
|
$(eval $(call gb_Library_use_externals,hsqldb,\
|
|
boost_headers \
|
|
hsqldb \
|
|
))
|
|
|
|
$(eval $(call gb_Library_use_sdk_api,hsqldb))
|
|
|
|
$(eval $(call gb_Library_use_libraries,hsqldb,\
|
|
comphelper \
|
|
cppu \
|
|
cppuhelper \
|
|
dbtools \
|
|
jvmfwk \
|
|
sal \
|
|
salhelper \
|
|
tl \
|
|
utl \
|
|
vcl \
|
|
i18nlangtag \
|
|
))
|
|
|
|
$(eval $(call gb_Library_set_componentfile,hsqldb,connectivity/source/drivers/hsqldb/hsqldb,services))
|
|
|
|
$(eval $(call gb_Library_add_exception_objects,hsqldb,\
|
|
connectivity/source/drivers/hsqldb/HCatalog \
|
|
connectivity/source/drivers/hsqldb/HColumns \
|
|
connectivity/source/drivers/hsqldb/HConnection \
|
|
connectivity/source/drivers/hsqldb/HDriver \
|
|
connectivity/source/drivers/hsqldb/HStorageAccess \
|
|
connectivity/source/drivers/hsqldb/HStorageMap \
|
|
connectivity/source/drivers/hsqldb/HTable \
|
|
connectivity/source/drivers/hsqldb/HTables \
|
|
connectivity/source/drivers/hsqldb/HTerminateListener \
|
|
connectivity/source/drivers/hsqldb/HTools \
|
|
connectivity/source/drivers/hsqldb/HUser \
|
|
connectivity/source/drivers/hsqldb/HUsers \
|
|
connectivity/source/drivers/hsqldb/HView \
|
|
connectivity/source/drivers/hsqldb/HViews \
|
|
connectivity/source/drivers/hsqldb/StorageFileAccess \
|
|
connectivity/source/drivers/hsqldb/StorageNativeInputStream \
|
|
connectivity/source/drivers/hsqldb/StorageNativeOutputStream \
|
|
connectivity/source/drivers/hsqldb/accesslog \
|
|
))
|
|
|
|
# vim: set noet sw=4 ts=4:
|