forked from amazingfate/loongoffice
2fa2660b55
This is a follow up to d015384e1d98fe77fd59339044f58efb1ab9fb25 "Fixed ThreadPool (and dependent ORequestThread) life cycle" that still had some problems: * First, if Bridge::terminate was first entered from the reader or writer thread, it would not join on that thread, so that thread could still be running during exit. That has been addressed by giving Bridge::dispose new semantics: It waits until both Bridge::terminate has completed (even if that was called from a different thread) and all spawned threads (reader, writer, ORequestThread workers) have been joined. (This implies that Bridge::dispose must not be called from such a thread, to avoid deadlock.) * Second, if Bridge::terminate was first entered from an ORequestThread, the call to uno_threadpool_dispose(0) to join on all such worker threads could deadlock. That has been addressed by making the last call to uno_threadpool_destroy wait to join on all worker threads, and by calling uno_threadpool_destroy only from the final Bridge::terminate (from Bridge::dispose), to avoid deadlock. (The special semantics of uno_threadpool_dispose(0) are no longer needed and have been removed, as they conflicted with the fix for the third problem below.) * Third, once uno_threadpool_destroy had called uno_threadpool_dispose(0), the ThreadAdmin singleton had been disposed, so no new remote bridges could successfully be created afterwards. That has been addressed by making ThreadAdmin a member of ThreadPool, and making (only) those uno_ThreadPool handles with overlapping life spans share one ThreadPool instance (which thus is no longer a singleton, either). Additionally, ORequestThread has been made more robust (in the style of salhelper::Thread) to avoid races. Change-Id: I2cbd1b3f9aecc1bf4649e482d2c22b33b471788f
82 lines
2.7 KiB
C++
82 lines
2.7 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*************************************************************************
|
|
*
|
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
*
|
|
* Copyright 2000, 2010 Oracle and/or its affiliates.
|
|
*
|
|
* OpenOffice.org - a multi-platform office productivity suite
|
|
*
|
|
* This file is part of OpenOffice.org.
|
|
*
|
|
* OpenOffice.org is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU Lesser General Public License version 3
|
|
* only, as published by the Free Software Foundation.
|
|
*
|
|
* OpenOffice.org is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Lesser General Public License version 3 for more details
|
|
* (a copy is included in the LICENSE file that accompanied this code).
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
* version 3 along with OpenOffice.org. If not, see
|
|
* <http://www.openoffice.org/license.html>
|
|
* for a copy of the LGPLv3 License.
|
|
*
|
|
************************************************************************/
|
|
#ifndef _CPPU_THREADPOOL_THREAD_HXX
|
|
#define _CPPU_THREADPOOL_THREAD_HXX
|
|
|
|
#include <osl/thread.hxx>
|
|
#include <sal/types.h>
|
|
#include <salhelper/simplereferenceobject.hxx>
|
|
|
|
#include "jobqueue.hxx"
|
|
#include "threadpool.hxx"
|
|
|
|
namespace cppu_threadpool {
|
|
|
|
class JobQueue;
|
|
|
|
//-----------------------------------------
|
|
// private thread class for the threadpool
|
|
// independent from vos
|
|
//-----------------------------------------
|
|
class ORequestThread:
|
|
public salhelper::SimpleReferenceObject, public osl::Thread
|
|
{
|
|
public:
|
|
ORequestThread( ThreadPoolHolder const &aThreadPool,
|
|
JobQueue * ,
|
|
const ::rtl::ByteSequence &aThreadId,
|
|
sal_Bool bAsynchron );
|
|
virtual ~ORequestThread();
|
|
|
|
void setTask( JobQueue * , const ::rtl::ByteSequence & aThreadId , sal_Bool bAsynchron );
|
|
|
|
void launch();
|
|
|
|
static inline void * operator new(std::size_t size)
|
|
{ return SimpleReferenceObject::operator new(size); }
|
|
|
|
static inline void operator delete(void * pointer)
|
|
{ SimpleReferenceObject::operator delete(pointer); }
|
|
|
|
private:
|
|
virtual void SAL_CALL run();
|
|
virtual void SAL_CALL onTerminated();
|
|
|
|
ThreadPoolHolder m_aThreadPool;
|
|
JobQueue *m_pQueue;
|
|
::rtl::ByteSequence m_aThreadId;
|
|
sal_Bool m_bAsynchron;
|
|
};
|
|
|
|
} // end cppu_threadpool
|
|
|
|
|
|
#endif
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|