* commit 'ooo/DEV300_m101': (185 commits) chart52: cleanup unused legend entry stuff in preparation of issue #i82802# masterfix: #i10000# add missing dependency in offapi sb138: #i115619# fix for MinGW sb138: #i115619#, #i116038# use osl_setThreadName in binaryurp sb138: #i115619# osl_setThreadName gridsort: i116682: update UnoControlDialog to reflect XDialog gridsort: minor changes to the new API: - renamed XMutableGridDataModel::setRowHeading to updateRowHeading for consistency reasons - renamed XSortableGridDataModel to XSortableGridData - actually, this is not a full-fledged model in itself. gridsort: grid control related unit tests (first set, more to come) sb138: #i116038# fresh implementation of binary URP bridge chart52: #28670# make the legend within charts resizeable - part 2 gridsort: re-did the column resizing - introduced XGridColumn.Flexibility, determining to which degree the column is resized during auto-column-resizing - removed XGridColumn.PreferredWidth - there really is no need for this anymore now - documented the relationship between XGridColumn.Flexibility and XGridColumn.Resizeable - re-implemented TableControl_Impl::impl_ni_updateColumnWidths, with (hopefully) less magic sb139: #i116530# improve Java URP bridge error notification by utilizing the java.lang.Throwable cause facility gridsort: document the relationship between soorting the data and notifying XGridDataListeners gridsort: introduce XGridColumn::DataModelIndex. this allows for column removal/insertion at the GridColumnModel, without the need to touch the GridDataModel locales34: #i112431# adapt documentation to reality gridsort: introduce XSortableGridDataModel::removeColumnSort gridsort: #163172# added UNO API support for sorting grid data. Implementation still unfinished. Things missing in the SortableGridData implementation - add as listener to the delegator, so we're notified of changes - translate and multiplex those changes - do own notifications (XGridDataListener.dataChanged) when the sort order changed - (possibly) update the sort order when the data in the current sort-column changed gridsort: made the row title a row heading, being an Any instead of a string gridsort: XMutableGridData: renamed updateRow to updateRowData for consistency; introduced updateRowToolTip as shortcut for multiple updateCellToolTip calls gridsort: updateCell->updateCellData, setCellToolTip->updateCellToolTip; in both methods, have (Col,Row) params instead of (Row,Col), for consistency reasons ... Conflicts: bridges/inc/bridges/remote/bridgeimpl.hxx bridges/inc/bridges/remote/connection.h bridges/inc/bridges/remote/context.h bridges/inc/bridges/remote/helper.hxx bridges/inc/bridges/remote/mapping.hxx bridges/inc/bridges/remote/proxy.hxx bridges/inc/bridges/remote/remote.h bridges/inc/bridges/remote/remote.hxx bridges/inc/bridges/remote/stub.hxx bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx bridges/source/remote/context/context.cxx bridges/source/remote/static/helper.cxx bridges/source/remote/static/mapping.cxx bridges/source/remote/static/proxy.cxx bridges/source/remote/static/remote.cxx bridges/source/remote/static/remote_types.cxx bridges/source/remote/static/remote_types.hxx bridges/source/remote/static/stub.cxx bridges/source/remote/urp/urp_bridgeimpl.cxx bridges/source/remote/urp/urp_bridgeimpl.hxx bridges/source/remote/urp/urp_cache.h bridges/source/remote/urp/urp_cache.hxx bridges/source/remote/urp/urp_dispatch.cxx bridges/source/remote/urp/urp_dispatch.hxx bridges/source/remote/urp/urp_environment.cxx bridges/source/remote/urp/urp_job.cxx bridges/source/remote/urp/urp_job.hxx bridges/source/remote/urp/urp_log.cxx bridges/source/remote/urp/urp_log.hxx bridges/source/remote/urp/urp_marshal.cxx bridges/source/remote/urp/urp_marshal.hxx bridges/source/remote/urp/urp_marshal_decl.hxx bridges/source/remote/urp/urp_property.hxx bridges/source/remote/urp/urp_propertyobject.cxx bridges/source/remote/urp/urp_propertyobject.hxx bridges/source/remote/urp/urp_reader.cxx bridges/source/remote/urp/urp_reader.hxx bridges/source/remote/urp/urp_replycontainer.hxx bridges/source/remote/urp/urp_threadid.cxx bridges/source/remote/urp/urp_threadid.hxx bridges/source/remote/urp/urp_unmarshal.cxx bridges/source/remote/urp/urp_unmarshal.hxx bridges/source/remote/urp/urp_writer.cxx bridges/source/remote/urp/urp_writer.hxx cppu/source/threadpool/threadpool.cxx cppu/util/target.pmk cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx cppuhelper/source/interfacecontainer.cxx cpputools/source/regcomplazy/regcomplazy.cxx jurt/prj/d.lst jvmfwk/source/elements.cxx offapi/com/sun/star/awt/grid/GridDataEvent.idl offapi/com/sun/star/awt/grid/XGridColumn.idl offapi/com/sun/star/awt/tab/makefile.mk offapi/com/sun/star/chart2/ExplicitIncrementData.idl offapi/com/sun/star/chart2/XPlotter.idl offapi/com/sun/star/chart2/XUndoHelper.idl offapi/com/sun/star/document/MediaDescriptor.idl offapi/com/sun/star/document/makefile.mk offapi/com/sun/star/linguistic2/XLanguageGuessing.idl offapi/com/sun/star/script/ModuleInfo.idl offapi/com/sun/star/script/ModuleType.idl offapi/com/sun/star/text/TextMarkupType.idl offapi/com/sun/star/util/XTextSearch.idl offapi/com/sun/star/xml/sax/XFastAttributeList.idl pyuno/source/loader/makefile.mk remotebridges/source/bridge/bridge_connection.cxx remotebridges/source/bridge/bridge_connection.hxx remotebridges/source/bridge/bridge_provider.cxx remotebridges/source/bridge/remote_bridge.cxx remotebridges/source/bridge/remote_bridge.hxx remotebridges/source/dynamicloader/dynamicloader.cxx remotebridges/source/factory/bridgefactory.cxx remotebridges/source/factory/bridgeimpl.cxx remotebridges/source/factory/bridgeimpl.hxx remotebridges/source/factory/makefile.mk sal/cppunittester/cppunittester.cxx sal/inc/osl/diagnose.h sal/osl/os2/system.h sal/osl/unx/diagnose.c sal/osl/unx/file_misc.cxx sal/osl/unx/process_impl.cxx sal/osl/w32/diagnose.c sal/osl/w32/process.cxx sal/prj/build.lst sal/qa/rtl/math/makefile.mk sal/qa/rtl/math/rtl_math.cxx sal/qa/rtl/math/rtl_old_testint64.cxx sal/qa/rtl/math/test_rtl_math.cxx sal/systools/win32/kill/kill.cxx sal/textenc/tencinfo.c sal/util/sal.map stoc/source/inspect/introspection.cxx stoc/source/security/file_policy.cxx stoc/source/simpleregistry/simpleregistry.cxx
200 lines
5.2 KiB
C++
200 lines
5.2 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.
|
|
*
|
|
************************************************************************/
|
|
|
|
// MARKER(update_precomp.py): autogen include statement, do not remove
|
|
#include "precompiled_cppu.hxx"
|
|
#include "jobqueue.hxx"
|
|
#include "threadpool.hxx"
|
|
|
|
#include <osl/diagnose.h>
|
|
|
|
using namespace ::osl;
|
|
|
|
namespace cppu_threadpool {
|
|
|
|
JobQueue::JobQueue() :
|
|
m_nToDo( 0 ),
|
|
m_bSuspended( sal_False ),
|
|
m_cndWait( osl_createCondition() )
|
|
{
|
|
osl_resetCondition( m_cndWait );
|
|
m_DisposedCallerAdmin = DisposedCallerAdmin::getInstance();
|
|
}
|
|
|
|
JobQueue::~JobQueue()
|
|
{
|
|
osl_destroyCondition( m_cndWait );
|
|
}
|
|
|
|
|
|
void JobQueue::add( void *pThreadSpecificData, RequestFun * doRequest )
|
|
{
|
|
MutexGuard guard( m_mutex );
|
|
Job job = { pThreadSpecificData , doRequest };
|
|
m_lstJob.push_back( job );
|
|
if( ! m_bSuspended )
|
|
{
|
|
osl_setCondition( m_cndWait );
|
|
}
|
|
m_nToDo ++;
|
|
}
|
|
|
|
void *JobQueue::enter( sal_Int64 nDisposeId , sal_Bool bReturnWhenNoJob )
|
|
{
|
|
void *pReturn = 0;
|
|
{
|
|
// synchronize with the dispose calls
|
|
MutexGuard guard( m_mutex );
|
|
if( m_DisposedCallerAdmin->isDisposed( nDisposeId ) )
|
|
{
|
|
return 0;
|
|
}
|
|
m_lstCallstack.push_front( nDisposeId );
|
|
}
|
|
|
|
|
|
while( sal_True )
|
|
{
|
|
if( bReturnWhenNoJob )
|
|
{
|
|
MutexGuard guard( m_mutex );
|
|
if( m_lstJob.empty() )
|
|
{
|
|
break;
|
|
}
|
|
}
|
|
|
|
osl_waitCondition( m_cndWait , 0 );
|
|
|
|
struct Job job={0,0};
|
|
{
|
|
// synchronize with add and dispose calls
|
|
MutexGuard guard( m_mutex );
|
|
|
|
if( 0 == m_lstCallstack.front() )
|
|
{
|
|
// disposed !
|
|
if( m_lstJob.empty() )
|
|
{
|
|
osl_resetCondition( m_cndWait );
|
|
}
|
|
break;
|
|
}
|
|
|
|
OSL_ASSERT( ! m_lstJob.empty() );
|
|
if( ! m_lstJob.empty() )
|
|
{
|
|
job = m_lstJob.front();
|
|
m_lstJob.pop_front();
|
|
}
|
|
if( m_lstJob.empty() )
|
|
{
|
|
osl_resetCondition( m_cndWait );
|
|
}
|
|
}
|
|
|
|
if( job.doRequest )
|
|
{
|
|
job.doRequest( job.pThreadSpecificData );
|
|
m_nToDo --;
|
|
}
|
|
else
|
|
{
|
|
m_nToDo --;
|
|
pReturn = job.pThreadSpecificData;
|
|
break;
|
|
}
|
|
}
|
|
|
|
{
|
|
// synchronize with the dispose calls
|
|
MutexGuard guard( m_mutex );
|
|
m_lstCallstack.pop_front();
|
|
}
|
|
|
|
return pReturn;
|
|
}
|
|
|
|
void JobQueue::dispose( sal_Int64 nDisposeId )
|
|
{
|
|
MutexGuard guard( m_mutex );
|
|
for( CallStackList::iterator ii = m_lstCallstack.begin() ;
|
|
ii != m_lstCallstack.end() ;
|
|
++ii )
|
|
{
|
|
if( (*ii) == nDisposeId )
|
|
{
|
|
(*ii) = 0;
|
|
}
|
|
}
|
|
|
|
if( !m_lstCallstack.empty() && ! m_lstCallstack.front() )
|
|
{
|
|
// The thread is waiting for a disposed pCallerId, let it go
|
|
osl_setCondition( m_cndWait );
|
|
}
|
|
}
|
|
|
|
void JobQueue::suspend()
|
|
{
|
|
MutexGuard guard( m_mutex );
|
|
m_bSuspended = sal_True;
|
|
}
|
|
|
|
void JobQueue::resume()
|
|
{
|
|
MutexGuard guard( m_mutex );
|
|
m_bSuspended = sal_False;
|
|
if( ! m_lstJob.empty() )
|
|
{
|
|
osl_setCondition( m_cndWait );
|
|
}
|
|
}
|
|
|
|
sal_Bool JobQueue::isEmpty()
|
|
{
|
|
MutexGuard guard( m_mutex );
|
|
return m_lstJob.empty();
|
|
}
|
|
|
|
sal_Bool JobQueue::isCallstackEmpty()
|
|
{
|
|
MutexGuard guard( m_mutex );
|
|
return m_lstCallstack.empty();
|
|
}
|
|
|
|
sal_Bool JobQueue::isBusy() const
|
|
{
|
|
return m_nToDo > 0;
|
|
}
|
|
|
|
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|