diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2011-06-21 13:50:08 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2011-06-22 09:40:55 (GMT) |
| commit | 38db40d9a2db44e47b0aabd9487284cd1106b353 (patch) | |
| tree | 55b436e2d8474a24dcb18cf5efc60afeb72d5383 | |
| parent | f332786abc6817fefaa683fb22caa40184c1316e (diff) | |
| download | Qt-38db40d9a2db44e47b0aabd9487284cd1106b353.zip Qt-38db40d9a2db44e47b0aabd9487284cd1106b353.tar.gz Qt-38db40d9a2db44e47b0aabd9487284cd1106b353.tar.bz2 | |
Workaround webkit deadlock on macos x
The webkit AtomicallyInitializedStatic and Qt's Q_GLOBAL_STATIC can
deadlock on the Mac, as the mac compiler inserts calls to
__cxa_guard_acquire and __cxa_guard_release around initialisation of
local statics.
In Q_GLOBAL_STATIC case, this is the QGlobalStaticDeleter local static
Whereas webkit AtomicallyInitializedStatic is a local static variable
in any case.
Problem is triggered because webkit constructs QNetworkConfigurationManager
inside the constructor of a local static - networkStateNotifier
And the generic bearer plugin calls QNetworkInterface::allInterfaces
in the bearer thread, which needs an initialised Q_GLOBAL_STATIC.
Reviewed-by: Laszlo Agocs
| -rw-r--r-- | src/plugins/bearer/generic/qgenericengine.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/bearer/generic/qgenericengine.cpp b/src/plugins/bearer/generic/qgenericengine.cpp index 7e97ffe..13f2b4c 100644 --- a/src/plugins/bearer/generic/qgenericengine.cpp +++ b/src/plugins/bearer/generic/qgenericengine.cpp @@ -147,6 +147,9 @@ static QNetworkConfiguration::BearerType qGetInterfaceType(const QString &interf QGenericEngine::QGenericEngine(QObject *parent) : QBearerEngineImpl(parent) { + //workaround for deadlock in __cxa_guard_acquire with webkit on macos x + //initialise the Q_GLOBAL_STATIC in same thread as the AtomicallyInitializedStatic + (void)QNetworkInterface::interfaceFromIndex(0); } QGenericEngine::~QGenericEngine() |