4361ee2585
ScRefreshTimer::Invoke() locks the mutex and subsequent nested
locks are attempted in ScDocShell::ConvertFrom() and
ScDocShellModificator ctor by ScRefreshTimerProtector.
A std::mutex must not be owned by the calling thread when a lock
is attempted, otherwise even deadlocks may occur, as was the case
here. This is exactly the difference of std::recursive_mutex.
Likely a regression from
commit 287680683c
CommitDate: Mon Aug 2 12:17:07 2021 +0200
osl::Mutex->std::mutex in ScRefreshTimer
Change-Id: Iaa0f1da2b4b9616e9627d8d0001775f554756048
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130573
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
67 lines
2.1 KiB
C++
67 lines
2.1 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 .
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <sal/config.h>
|
|
|
|
#include <vcl/timer.hxx>
|
|
#include "scdllapi.h"
|
|
#include <memory>
|
|
#include <mutex>
|
|
|
|
class ScRefreshTimerControl
|
|
{
|
|
std::recursive_mutex aMutex;
|
|
sal_uInt16 nBlockRefresh;
|
|
|
|
public:
|
|
ScRefreshTimerControl() : nBlockRefresh(0) {}
|
|
void SetAllowRefresh( bool b );
|
|
bool IsRefreshAllowed() const { return !nBlockRefresh; }
|
|
std::recursive_mutex& GetMutex() { return aMutex; }
|
|
};
|
|
|
|
class ScRefreshTimer : public AutoTimer
|
|
{
|
|
std::unique_ptr<ScRefreshTimerControl> const * ppControl;
|
|
|
|
public:
|
|
ScRefreshTimer();
|
|
ScRefreshTimer( sal_Int32 nSeconds );
|
|
ScRefreshTimer( const ScRefreshTimer& r );
|
|
virtual ~ScRefreshTimer() override;
|
|
|
|
ScRefreshTimer& operator=( const ScRefreshTimer& r );
|
|
bool operator==( const ScRefreshTimer& r ) const;
|
|
bool operator!=( const ScRefreshTimer& r ) const;
|
|
|
|
void SetRefreshControl( std::unique_ptr<ScRefreshTimerControl> const * pp );
|
|
void SetRefreshHandler( const Link<Timer *, void>& rLink );
|
|
sal_Int32 GetRefreshDelaySeconds() const;
|
|
void StopRefreshTimer();
|
|
|
|
void SetRefreshDelay( sal_Int32 nSeconds );
|
|
SC_DLLPUBLIC virtual void Invoke() override;
|
|
|
|
private:
|
|
void Launch();
|
|
};
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|