Kaydet (Commit) 362b0c52 authored tarafından Michael Stahl's avatar Michael Stahl Kaydeden (comit) Stephan Bergmann

tdf#114815 pyuno: avoid 2 threads initing python in parallel

According to the crash reports, it's possible for the grammar checking
thread to call GetGrammarChecker, instantiating lightproof, at the same
time as the main thread instantiates LngSvcMgr, which also instantiates
(some?) (all?) grammar checkers.

Ensure that pyuno_loader::CreateInstance() initialises Python only
once with a C++11 thread safe static.

For the backport, use rtl::Static instead, because on the 5.4 branch
MSVC does not have HAVE_THREADSAFE_STATICS enabled.

Change-Id: I5b1faba9107355c508831a078366e4a29fdbfadf
(cherry picked from commit 5357ca82)
Reviewed-on: https://gerrit.libreoffice.org/49116Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst d4a41817
......@@ -31,6 +31,7 @@
#include <rtl/ustrbuf.hxx>
#include <rtl/strbuf.hxx>
#include <rtl/bootstrap.hxx>
#include <rtl/instance.hxx>
#include <cppuhelper/implementationentry.hxx>
#include <cppuhelper/factory.hxx>
......@@ -176,11 +177,10 @@ static void prependPythonPath( const OUString & pythonPathBootstrap )
osl_setEnvironment(envVar.pData, envValue.pData);
}
Reference< XInterface > CreateInstance( const Reference< XComponentContext > & ctx )
struct PythonInit
{
Reference< XInterface > ret;
if( ! Py_IsInitialized() )
PythonInit() {
if (! Py_IsInitialized()) // may be inited by getComponentContext() already
{
OUString pythonPath;
OUString pythonHome;
......@@ -236,9 +236,26 @@ Reference< XInterface > CreateInstance( const Reference< XComponentContext > & c
// PyThreadAttach below.
PyThreadState_Delete(tstate);
}
}
};
namespace {
struct thePythonInit : public rtl::Static<PythonInit, thePythonInit> {};
}
Reference<XInterface> CreateInstance(const Reference<XComponentContext> & ctx)
{
// tdf#114815 thread-safe static to init python only once
thePythonInit::get();
Reference< XInterface > ret;
PyThreadAttach attach( PyInterpreterState_Head() );
{
// note: this can't race against getComponentContext() because
// either (in soffice.bin) CreateInstance() must be called before
// getComponentContext() can be called, or (in python.bin) the other
// way around
if( ! Runtime::isInitialized() )
{
Runtime::initialize( ctx );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment