forked from amazingfate/loongoffice
a0bc388b38
This avoids the need for the tricky osl::Condition::reset calls. For example,
the first one (in the "disposed !" case) had been added with
2a3ed89284890615ad4bce57be55ba558351cde1 "sb132: #i112448# proper clean up in
JobQueue::enter (patch by olistraub)" as
> if( 0 == m_lstCallstack.front() )
> {
> // disposed !
> + if( m_lstJob.empty() )
> + {
> + osl_resetCondition( m_cndWait );
> + }
> break;
> }
>
and then change to
> if( 0 == m_lstCallstack.front() )
> {
> // disposed !
> - if( m_lstJob.empty() )
> + if( m_lstJob.empty()
> + && (m_lstCallstack.empty()
> + || m_lstCallstack.front() != 0) )
> {
> osl_resetCondition( m_cndWait );
> }
with cba3ac1eab7acaf8e6efd7a00eee7c5e969fc49b "Avoid deadlocks when disposing
recursive JobQueue::enter", which prevented the reset from ever hapening
(because m_lstCallstack.front() cannot both be zero and non-zero here at the
same time). The std::condition_variable semantics nicely avoid any reasoning
whether or not a reset would be necessary here.
Change-Id: Ic9b57b836bb6679829f4aa3b68679256726acf60
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96406
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
76 lines
2.1 KiB
C++
76 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 .
|
|
*/
|
|
|
|
#ifndef INCLUDED_CPPU_SOURCE_THREADPOOL_JOBQUEUE_HXX
|
|
#define INCLUDED_CPPU_SOURCE_THREADPOOL_JOBQUEUE_HXX
|
|
|
|
#include <sal/config.h>
|
|
|
|
#include <condition_variable>
|
|
#include <deque>
|
|
#include <memory>
|
|
#include <mutex>
|
|
|
|
#include <sal/types.h>
|
|
|
|
namespace cppu_threadpool
|
|
{
|
|
extern "C" typedef void (RequestFun)(void *);
|
|
|
|
struct Job
|
|
{
|
|
void *pThreadSpecificData;
|
|
RequestFun * doRequest;
|
|
};
|
|
|
|
class DisposedCallerAdmin;
|
|
typedef std::shared_ptr<DisposedCallerAdmin> DisposedCallerAdminHolder;
|
|
|
|
class JobQueue
|
|
{
|
|
public:
|
|
JobQueue();
|
|
|
|
void add( void *pThreadSpecificData, RequestFun * doRequest );
|
|
|
|
void *enter( void const * nDisposeId , bool bReturnWhenNoJob = false );
|
|
void dispose( void const * nDisposeId );
|
|
|
|
void suspend();
|
|
void resume();
|
|
|
|
bool isEmpty() const;
|
|
bool isCallstackEmpty() const;
|
|
bool isBusy() const;
|
|
|
|
private:
|
|
mutable std::mutex m_mutex;
|
|
std::deque < struct Job > m_lstJob;
|
|
std::deque<void const *> m_lstCallstack;
|
|
sal_Int32 m_nToDo;
|
|
bool m_bSuspended;
|
|
std::condition_variable m_cndWait;
|
|
DisposedCallerAdminHolder m_DisposedCallerAdmin;
|
|
};
|
|
}
|
|
|
|
#endif
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|