forked from amazingfate/loongoffice
b021fdfab3
This improves on b68640c44ecdb1df59d704cc6c2bae8bb412d7d0 "Prevent creation of new ORequestThreads during shutdown," which added throwing the DisposedException from ThreadAdmin::add. But ThreadAdmin::m_disposed can only become true via uno_threadpool_destroy -> ThreadPool::joinWorkers -> ThreadAdmin::join, and ThreadAdmin::add observing that can only happen via uno_threadpool_putJob -> ThreadPool::addJob -> ThreadPool::createThread -> ORequestThread::launch -> ThradAdmin::add, where the bridges should ensure that uno_threadpool_destroy does not run in parallel with uno_threadpool_putJob. So demote this from a DisposedException to a SAL_WARN. Change-Id: I3912ea077b7fa35827c41e82dd0a8f962ba412b6
72 lines
2.3 KiB
C++
72 lines
2.3 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_THREAD_HXX
|
|
#define INCLUDED_CPPU_SOURCE_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
|
|
|
|
class ORequestThread:
|
|
public salhelper::SimpleReferenceObject, public osl::Thread
|
|
{
|
|
public:
|
|
ORequestThread( ThreadPoolHolder const &aThreadPool,
|
|
JobQueue * ,
|
|
const ::rtl::ByteSequence &aThreadId,
|
|
bool bAsynchron );
|
|
virtual ~ORequestThread();
|
|
|
|
void setTask( JobQueue * , const ::rtl::ByteSequence & aThreadId , bool bAsynchron );
|
|
|
|
bool 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() SAL_OVERRIDE;
|
|
virtual void SAL_CALL onTerminated() SAL_OVERRIDE;
|
|
|
|
ThreadPoolHolder m_aThreadPool;
|
|
JobQueue *m_pQueue;
|
|
::rtl::ByteSequence m_aThreadId;
|
|
bool m_bAsynchron;
|
|
};
|
|
|
|
} // end cppu_threadpool
|
|
|
|
|
|
#endif
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|