bdd108cd72
Deallocate the XTransferable object async using AsyncCallback (that uses Application::PostUserEvent) which executes the callback in a thread-safe way on the main thread. This avoids a deadlock at deallocation so that the XTransferable. Modify AsyncCallback to not hold the SolarMutexGuard because Application::PostUserEvent is considered thread-safe. Document Application::PostUserEvent thread-safety Change-Id: I4237a1cf380e8be66b3eefc393a58bb4853bf4e1 Reviewed-on: https://gerrit.libreoffice.org/31126 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
126 lines
4.6 KiB
C++
126 lines
4.6 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* 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/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
|
|
#include <sal/config.h>
|
|
|
|
#include <vcl/svapp.hxx>
|
|
#include "osl/mutex.hxx"
|
|
#include "cppuhelper/factory.hxx"
|
|
#include "cppuhelper/implementationentry.hxx"
|
|
#include <cppuhelper/implbase.hxx>
|
|
#include <cppuhelper/supportsservice.hxx>
|
|
#include "com/sun/star/lang/XServiceInfo.hpp"
|
|
#include <com/sun/star/uno/XComponentContext.hpp>
|
|
#include "com/sun/star/awt/XRequestCallback.hpp"
|
|
|
|
/// anonymous implementation namespace
|
|
namespace {
|
|
|
|
class AsyncCallback:
|
|
public ::cppu::WeakImplHelper<
|
|
css::lang::XServiceInfo,
|
|
css::awt::XRequestCallback>
|
|
{
|
|
public:
|
|
AsyncCallback() {}
|
|
AsyncCallback(const AsyncCallback&) = delete;
|
|
AsyncCallback& operator=(const AsyncCallback&) = delete;
|
|
|
|
// css::lang::XServiceInfo:
|
|
virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
|
|
virtual sal_Bool SAL_CALL supportsService(const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception) override;
|
|
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
|
|
|
|
// css::awt::XRequestCallback:
|
|
virtual void SAL_CALL addCallback(const css::uno::Reference< css::awt::XCallback > & xCallback, const css::uno::Any & aData) throw (css::uno::RuntimeException, std::exception) override;
|
|
|
|
private:
|
|
|
|
struct CallbackData
|
|
{
|
|
CallbackData( const css::uno::Reference< css::awt::XCallback >& rCallback, const css::uno::Any& rAny ) :
|
|
xCallback( rCallback ), aData( rAny ) {}
|
|
|
|
css::uno::Reference< css::awt::XCallback > xCallback;
|
|
css::uno::Any aData;
|
|
};
|
|
|
|
DECL_STATIC_LINK( AsyncCallback, Notify_Impl, void*, void );
|
|
|
|
virtual ~AsyncCallback() override {}
|
|
};
|
|
|
|
// com.sun.star.uno.XServiceInfo:
|
|
OUString SAL_CALL AsyncCallback::getImplementationName() throw (css::uno::RuntimeException, std::exception)
|
|
{
|
|
return OUString("com.sun.star.awt.comp.AsyncCallback");
|
|
}
|
|
|
|
sal_Bool SAL_CALL AsyncCallback::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException, std::exception)
|
|
{
|
|
return cppu::supportsService(this, serviceName);
|
|
}
|
|
|
|
css::uno::Sequence< OUString > SAL_CALL AsyncCallback::getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception)
|
|
{
|
|
css::uno::Sequence< OUString > s { "com.sun.star.awt.AsyncCallback" };
|
|
return s;
|
|
}
|
|
|
|
// css::awt::XRequestCallback:
|
|
void SAL_CALL AsyncCallback::addCallback(const css::uno::Reference< css::awt::XCallback > & xCallback, const css::uno::Any & aData) throw (css::uno::RuntimeException, std::exception)
|
|
{
|
|
if ( Application::IsInMain() )
|
|
{
|
|
// NOTE: We don't need SolarMutexGuard here as Application::PostUserEvent is thread-safe
|
|
CallbackData* pCallbackData = new CallbackData( xCallback, aData );
|
|
Application::PostUserEvent( LINK( this, AsyncCallback, Notify_Impl ), pCallbackData );
|
|
}
|
|
}
|
|
|
|
// private asynchronous link to call reference to the callback object
|
|
IMPL_STATIC_LINK( AsyncCallback, Notify_Impl, void*, p, void )
|
|
{
|
|
CallbackData* pCallbackData = static_cast<CallbackData*>(p);
|
|
try
|
|
{
|
|
// Asynchronous execution
|
|
// Check pointer and reference before!
|
|
if ( pCallbackData && pCallbackData->xCallback.is() )
|
|
pCallbackData->xCallback->notify( pCallbackData->aData );
|
|
}
|
|
catch ( css::uno::Exception& )
|
|
{
|
|
}
|
|
|
|
delete pCallbackData;
|
|
}
|
|
|
|
} // closing anonymous implementation namespace
|
|
|
|
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
|
|
com_sun_star_awt_comp_AsyncCallback_get_implementation(
|
|
css::uno::XComponentContext *,
|
|
css::uno::Sequence<css::uno::Any> const &)
|
|
{
|
|
return cppu::acquire(new AsyncCallback());
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|