[Libreoffice-commits] core.git: 4 commits - avmedia/source connectivity/source cppu/source dbaccess/source desktop/source dtrans/source extensions/source forms/source fpicker/source framework/source io/source linguistic/source salhelper/source sal/osl sdext/source sd/source sfx2/source svx/source sw/source toolkit/source ucb/source unotools/source vcl/unx
Michael Stahl
mstahl at redhat.com
Mon Aug 25 04:23:47 PDT 2014
avmedia/source/vlc/wrapper/EventHandler.cxx | 4 +++-
connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx | 2 ++
cppu/source/AffineBridge/AffineBridge.cxx | 4 ++++
cppu/source/threadpool/thread.cxx | 2 ++
cppu/source/threadpool/thread.hxx | 1 -
dbaccess/source/filter/xml/xmlfilter.cxx | 2 ++
dbaccess/source/ui/dlg/odbcconfig.cxx | 2 ++
dbaccess/source/ui/relationdesign/RelationController.cxx | 2 ++
desktop/source/app/app.cxx | 6 ++----
desktop/source/offacc/acceptor.cxx | 2 ++
dtrans/source/win32/clipb/MtaOleClipb.cxx | 4 ++++
dtrans/source/win32/dnd/source.cxx | 3 +++
dtrans/source/win32/dnd/target.cxx | 3 +++
extensions/source/plugin/unx/mediator.cxx | 2 ++
extensions/source/scanner/scanunx.cxx | 2 ++
extensions/source/update/check/updatecheck.cxx | 6 ++++++
extensions/source/update/check/updatecheckjob.cxx | 2 ++
forms/source/component/EventThread.cxx | 2 ++
fpicker/source/win32/filepicker/asynceventnotifier.cxx | 3 +++
fpicker/source/win32/filepicker/asyncrequests.cxx | 2 ++
fpicker/source/win32/filepicker/getfilenamewrapper.cxx | 2 ++
fpicker/source/win32/folderpicker/MtaFop.cxx | 3 +++
framework/source/helper/wakeupthread.cxx | 2 ++
io/source/stm/opump.cxx | 1 +
linguistic/source/gciterator.cxx | 2 ++
sal/osl/unx/process.cxx | 2 ++
sal/osl/w32/dllentry.c | 3 +++
salhelper/source/timer.cxx | 2 ++
sd/source/ui/remotecontrol/Transmitter.cxx | 2 ++
sdext/source/presenter/PresenterTimer.cxx | 2 ++
sfx2/source/appl/shutdowniconw32.cxx | 2 ++
sfx2/source/doc/doctemplates.cxx | 2 ++
sfx2/source/doc/docundomanager.cxx | 2 +-
sfx2/source/doc/printhelper.cxx | 2 ++
svx/source/accessibility/svxpixelctlaccessiblecontext.cxx | 2 --
svx/source/core/extedit.cxx | 2 ++
svx/source/form/fmsrcimp.cxx | 2 ++
svx/source/svdraw/svdograf.cxx | 2 ++
sw/source/core/docnode/finalthreadmanager.cxx | 4 ++++
sw/source/core/docnode/retrieveinputstream.cxx | 2 ++
sw/source/uibase/dbui/maildispatcher.cxx | 2 ++
toolkit/source/awt/vclxtoolkit.cxx | 3 +++
ucb/source/ucp/webdav/SerfLockStore.cxx | 2 ++
unotools/source/ucbhelper/ucblockbytes.cxx | 2 ++
vcl/unx/generic/dtrans/X11_selection.cxx | 1 +
vcl/unx/generic/printer/cupsmgr.cxx | 2 ++
vcl/unx/generic/printer/printerinfomanager.cxx | 2 ++
vcl/unx/kde/UnxCommandThread.cxx | 2 ++
vcl/unx/kde/UnxNotifyThread.cxx | 2 ++
49 files changed, 108 insertions(+), 9 deletions(-)
New commits:
commit 57a4337e254b485df33dc01e508bb936adc6ec75
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Aug 22 23:51:08 2014 +0200
set names on a bunch more threads...
Change-Id: I4c2f2f0bcce52839033876ec991529721e06a3c8
diff --git a/avmedia/source/vlc/wrapper/EventHandler.cxx b/avmedia/source/vlc/wrapper/EventHandler.cxx
index 666ac94..40e2e45 100644
--- a/avmedia/source/vlc/wrapper/EventHandler.cxx
+++ b/avmedia/source/vlc/wrapper/EventHandler.cxx
@@ -28,6 +28,8 @@ void EventHandler::stop()
void EventHandler::run()
{
+ osl_setThreadName("VLC EventHandler");
+
TCallback callback;
do
{
@@ -43,4 +45,4 @@ void EventHandler::run()
}
}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
index 81030a73..60ba8c0 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
@@ -229,6 +229,8 @@ void MNS_XPCOM_EventLoop()
extern "C" void MNS_Mozilla_UI_Thread( void *arg )
{
+ osl_setThreadName("MNS_Mozilla_UI_Thread");
+
aLive=1;
OSL_TRACE( "IN : MNS_Mozilla_UI_Thread()" );
UI_Thread_ARGS * args = (UI_Thread_ARGS*) arg;
diff --git a/cppu/source/AffineBridge/AffineBridge.cxx b/cppu/source/AffineBridge/AffineBridge.cxx
index 786e9d9..24b8127 100644
--- a/cppu/source/AffineBridge/AffineBridge.cxx
+++ b/cppu/source/AffineBridge/AffineBridge.cxx
@@ -97,6 +97,8 @@ public:
void InnerThread::run(void)
{
+ osl_setThreadName("UNO AffineBridge InnerThread");
+
m_pAffineBridge->enter();
m_pAffineBridge->innerDispatch();
m_pAffineBridge->leave();
@@ -120,6 +122,8 @@ OuterThread::OuterThread(AffineBridge * threadEnvironment)
void OuterThread::run(void)
{
+ osl_setThreadName("UNO AffineBridge OuterThread");
+
osl::MutexGuard guard(m_pAffineBridge->m_outerMutex);
m_pAffineBridge->m_outerThreadId = getIdentifier();
diff --git a/cppu/source/threadpool/thread.cxx b/cppu/source/threadpool/thread.cxx
index 4924a45..aed1322 100644
--- a/cppu/source/threadpool/thread.cxx
+++ b/cppu/source/threadpool/thread.cxx
@@ -148,6 +148,8 @@ namespace cppu_threadpool {
void ORequestThread::run()
{
+ osl_setThreadName("cppu_threadpool::ORequestThread");
+
try
{
while ( m_pQueue )
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index a8a8a3b..e55ad34 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -107,6 +107,8 @@ namespace dbaxml
void SAL_CALL FastLoader::run()
{
+ osl_setThreadName("dbaxml::FastLoader");
+
if ( m_eWhat == E_JAVA )
{
#if HAVE_FEATURE_JAVA
diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx
index a6677a7..557af35 100644
--- a/dbaccess/source/ui/dlg/odbcconfig.cxx
+++ b/dbaccess/source/ui/dlg/odbcconfig.cxx
@@ -287,6 +287,8 @@ public:
protected:
virtual void SAL_CALL run()
{
+ osl_setThreadName("dbaui::ProcessTerminationWait");
+
osl_joinProcess( m_hProcessHandle );
osl_freeProcessHandle( m_hProcessHandle );
Application::PostUserEvent( m_aFinishHdl );
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx
index 230d845..49f2f7b 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -311,6 +311,8 @@ namespace
void SAL_CALL RelationLoader::run()
{
+ osl_setThreadName("RelationLoader");
+
const OUString* pIter = m_aTableList.getConstArray() + m_nStartIndex;
for(sal_Int32 i = m_nStartIndex; i < m_nEndIndex;++i,++pIter)
{
diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx
index 4730902..ef64f9f 100644
--- a/desktop/source/offacc/acceptor.cxx
+++ b/desktop/source/offacc/acceptor.cxx
@@ -38,6 +38,8 @@ namespace desktop
extern "C" void offacc_workerfunc (void * acc)
{
+ osl_setThreadName("URP Acceptor");
+
((Acceptor*)acc)->run();
}
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx
index e520c5a..5c1399e 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -463,6 +463,8 @@ UpdateCheckThread::onTerminated()
void SAL_CALL
UpdateCheckThread::run()
{
+ osl_setThreadName("UpdateCheckThread");
+
bool bExtensionsChecked = false;
TimeValue systime;
TimeValue nExtCheckTime;
@@ -626,6 +628,8 @@ DownloadThread::~DownloadThread()
void SAL_CALL
DownloadThread::run()
{
+ osl_setThreadName("DownloadThread");
+
#ifdef WNT
CoUninitialize();
CoInitialize( NULL );
@@ -710,6 +714,8 @@ ShutdownThread::~ShutdownThread()
void SAL_CALL
ShutdownThread::run()
{
+ osl_setThreadName("ShutdownThread");
+
TimeValue tv = { 0, 250 };
m_aCondition.wait(&tv);
diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx
index 6a2699a..db3ac9a 100644
--- a/extensions/source/update/check/updatecheckjob.cxx
+++ b/extensions/source/update/check/updatecheckjob.cxx
@@ -125,6 +125,8 @@ InitUpdateCheckJobThread::InitUpdateCheckJobThread(
void SAL_CALL InitUpdateCheckJobThread::run()
{
+ osl_setThreadName("InitUpdateCheckJobThread");
+
if (!m_bShowDialog) {
TimeValue tv = { 25, 0 };
m_aCondition.wait( &tv );
diff --git a/forms/source/component/EventThread.cxx b/forms/source/component/EventThread.cxx
index a7a633b..ac891c5 100644
--- a/forms/source/component/EventThread.cxx
+++ b/forms/source/component/EventThread.cxx
@@ -160,6 +160,8 @@ void SAL_CALL OComponentEventThread::onTerminated()
void OComponentEventThread::run()
{
+ osl_setThreadName("frm::OComponentEventThread");
+
implStarted( );
// Hold on to ourselves, so that we're not deleted if a dispose is called at some point in time
diff --git a/framework/source/helper/wakeupthread.cxx b/framework/source/helper/wakeupthread.cxx
index e695a60..c048ca5 100644
--- a/framework/source/helper/wakeupthread.cxx
+++ b/framework/source/helper/wakeupthread.cxx
@@ -33,6 +33,8 @@ WakeUpThread::WakeUpThread(const css::uno::Reference< css::util::XUpdatable >& x
void SAL_CALL WakeUpThread::run()
{
+ osl_setThreadName("framework::WakeUpThread");
+
::osl::Condition aSleeper;
TimeValue aTime;
diff --git a/io/source/stm/opump.cxx b/io/source/stm/opump.cxx
index 51b4bb8..42e3a35 100644
--- a/io/source/stm/opump.cxx
+++ b/io/source/stm/opump.cxx
@@ -241,6 +241,7 @@ void Pump::close()
void Pump::static_run( void* pObject )
{
+ osl_setThreadName("io_stm::Pump::run()");
((Pump*)pObject)->run();
((Pump*)pObject)->release();
}
diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx
index 74f9aba..36a8068 100644
--- a/linguistic/source/gciterator.cxx
+++ b/linguistic/source/gciterator.cxx
@@ -223,6 +223,8 @@ static sal_Int32 lcl_BacktraceWhiteSpaces( const OUString &rText, sal_Int32 nSta
extern "C" void lcl_workerfunc (void * gci)
{
+ osl_setThreadName("GrammarCheckingIterator");
+
((GrammarCheckingIterator*)gci)->DequeueAndCheck();
}
diff --git a/salhelper/source/timer.cxx b/salhelper/source/timer.cxx
index f0486b5..899d6c3 100644
--- a/salhelper/source/timer.cxx
+++ b/salhelper/source/timer.cxx
@@ -427,6 +427,8 @@ void TimerManager::checkForTimeout()
void TimerManager::run()
{
+ osl_setThreadName("salhelper::TimerManager");
+
setPriority( osl_Thread_PriorityBelowNormal );
while (schedule())
diff --git a/sd/source/ui/remotecontrol/Transmitter.cxx b/sd/source/ui/remotecontrol/Transmitter.cxx
index a217d58..d03ff5b 100644
--- a/sd/source/ui/remotecontrol/Transmitter.cxx
+++ b/sd/source/ui/remotecontrol/Transmitter.cxx
@@ -24,6 +24,8 @@ Transmitter::Transmitter( IBluetoothSocket* aSocket )
void SAL_CALL Transmitter::run()
{
+ osl_setThreadName("bluetooth Transmitter");
+
while ( true )
{
mQueuesNotEmpty.wait();
diff --git a/sdext/source/presenter/PresenterTimer.cxx b/sdext/source/presenter/PresenterTimer.cxx
index 96668e9..d3362ee 100644
--- a/sdext/source/presenter/PresenterTimer.cxx
+++ b/sdext/source/presenter/PresenterTimer.cxx
@@ -224,6 +224,8 @@ void TimerScheduler::CancelTask (const sal_Int32 nTaskId)
void SAL_CALL TimerScheduler::run (void)
{
+ osl_setThreadName("sdext::presenter::TimerScheduler");
+
while (true)
{
// Get the current time.
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index d84e689..3b8a9b6 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -2417,6 +2417,8 @@ Updater_Impl::~Updater_Impl()
void SAL_CALL Updater_Impl::run()
{
+ osl_setThreadName("Updater_Impl");
+
mpDocTemplates->doUpdate();
}
diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx
index 87e2ca8..7059059 100644
--- a/sfx2/source/doc/printhelper.cxx
+++ b/sfx2/source/doc/printhelper.cxx
@@ -494,6 +494,8 @@ class ImplUCBPrintWatcher : public ::osl::Thread
*/
void SAL_CALL run() SAL_OVERRIDE
{
+ osl_setThreadName("ImplUCBPrintWatcher");
+
/* SAFE { */
{
SolarMutexGuard aGuard;
diff --git a/svx/source/core/extedit.cxx b/svx/source/core/extedit.cxx
index 12864cc..c5e6eaf 100644
--- a/svx/source/core/extedit.cxx
+++ b/svx/source/core/extedit.cxx
@@ -68,6 +68,8 @@ IMPL_LINK (ExternalToolEdit, StartListeningEvent, void*, pEvent)
void ExternalToolEdit::threadWorker(void* pThreadData)
{
+ osl_setThreadName("ExternalToolEdit");
+
ExternalToolEdit* pData = (ExternalToolEdit*) pThreadData;
// Make an asynchronous call to listen to the event of temporary image file
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index 3504132..32e0116 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -70,6 +70,8 @@ using namespace ::svxform;
void FmSearchThread::run()
{
+ osl_setThreadName("FmSearchThread");
+
m_pEngine->SearchNextImpl();
};
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 339b0df..8c6a489 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -183,6 +183,8 @@ void SAL_CALL SdrGraphicUpdater::onTerminated(void)
void SAL_CALL SdrGraphicUpdater::run(void)
{
+ osl_setThreadName("SdrGraphicUpdater");
+
Graphic aGraphic( ImpLoadLinkedGraphic( maFileName, mrGraphicLink.getReferer(), maFilterName ) );
SolarMutexGuard aSolarGuard;
if ( !mbIsTerminated )
diff --git a/sw/source/core/docnode/finalthreadmanager.cxx b/sw/source/core/docnode/finalthreadmanager.cxx
index 419b450..efbeb7d 100644
--- a/sw/source/core/docnode/finalthreadmanager.cxx
+++ b/sw/source/core/docnode/finalthreadmanager.cxx
@@ -120,6 +120,8 @@ bool CancelJobsThread::stopped() const
void SAL_CALL CancelJobsThread::run()
{
+ osl_setThreadName("sw CancelJobsThread");
+
while ( !stopped() )
{
while ( existJobs() )
@@ -190,6 +192,8 @@ bool TerminateOfficeThread::OfficeTerminationStopped()
void SAL_CALL TerminateOfficeThread::run()
{
+ osl_setThreadName("sw TerminateOfficeThread");
+
while ( !OfficeTerminationStopped() )
{
osl::MutexGuard aGuard(maMutex);
diff --git a/sw/source/core/docnode/retrieveinputstream.cxx b/sw/source/core/docnode/retrieveinputstream.cxx
index 6e609f6..ad70921 100644
--- a/sw/source/core/docnode/retrieveinputstream.cxx
+++ b/sw/source/core/docnode/retrieveinputstream.cxx
@@ -51,6 +51,8 @@ SwAsyncRetrieveInputStreamThread::~SwAsyncRetrieveInputStreamThread()
void SwAsyncRetrieveInputStreamThread::threadFunction()
{
+ osl_setThreadName("SwAsyncRetrieveInputStreamThread");
+
com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > xProps( 2 );
xProps[0].Name = "URL";
xProps[0].Value <<= mrLinkedURL;
diff --git a/sw/source/uibase/dbui/maildispatcher.cxx b/sw/source/uibase/dbui/maildispatcher.cxx
index 8b1a877..4bd4f17 100644
--- a/sw/source/uibase/dbui/maildispatcher.cxx
+++ b/sw/source/uibase/dbui/maildispatcher.cxx
@@ -221,6 +221,8 @@ void MailDispatcher::sendMailMessageNotifyListener(uno::Reference<mail::XMailMes
void MailDispatcher::run()
{
+ osl_setThreadName("MailDispatcher");
+
// acquire a self reference in order to avoid race
// conditions. The last client of this class must
// call shutdown before releasing his last reference
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index be5ee82..bbfe52f 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -50,6 +50,7 @@
#include <cppuhelper/typeprovider.hxx>
#include <osl/conditn.hxx>
#include <osl/module.h>
+#include <osl/thread.h>
#include <osl/mutex.hxx>
#include <rtl/uuid.h>
#include <rtl/process.h>
@@ -596,6 +597,8 @@ extern "C"
{
static void SAL_CALL ToolkitWorkerFunction( void* pArgs )
{
+ osl_setThreadName("VCLXToolkit VCL main thread");
+
VCLXToolkit * pTk = (VCLXToolkit *)pArgs;
bInitedByVCLToolkit = InitVCL();
if( bInitedByVCLToolkit )
diff --git a/ucb/source/ucp/webdav/SerfLockStore.cxx b/ucb/source/ucp/webdav/SerfLockStore.cxx
index cd95a29..5314cee 100644
--- a/ucb/source/ucp/webdav/SerfLockStore.cxx
+++ b/ucb/source/ucp/webdav/SerfLockStore.cxx
@@ -49,6 +49,8 @@ protected:
void TickerThread::run()
{
+ osl_setThreadName("http_dav_ucp::TickerThread");
+
SAL_INFO("ucb.ucp.webdav", "TickerThread: start." );
// we have to go through the loop more often to be able to finish ~quickly
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx
index 6bf08cc..f8a1ff9 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.cxx
@@ -782,6 +782,8 @@ void Moderator::setInputStream(const Reference<XInputStream> &rxInputStream)
void SAL_CALL Moderator::run()
{
+ osl_setThreadName("utl::Moderator");
+
ResultType aResultType;
Any aResult;
sal_Int32 nIOErrorCode = 0;
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index 8c05206..fecc6ad 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -1169,6 +1169,8 @@ static const struct SystemCommandParameters aParms[] =
void SystemQueueInfo::run()
{
+ osl_setThreadName("LPR psp::SystemQueueInfo");
+
char pBuffer[1024];
FILE *pPipe;
std::list< OString > aLines;
commit 961d061ba177a79fe9f91404e3cd4d0d0bc30a87
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Aug 22 21:53:42 2014 +0200
set names on some UNIX-only threads
Change-Id: I4c247916256618312e7d98673d9db4d26e26fa39
diff --git a/extensions/source/plugin/unx/mediator.cxx b/extensions/source/plugin/unx/mediator.cxx
index 8248800..76045f3 100644
--- a/extensions/source/plugin/unx/mediator.cxx
+++ b/extensions/source/plugin/unx/mediator.cxx
@@ -196,6 +196,8 @@ MediatorListener::~MediatorListener()
void MediatorListener::run()
{
+ osl_setThreadName("MediatorListener");
+
bool bRun = true;
while( schedule() && m_pMediator && bRun )
{
diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx
index affc65e..125e8c8 100644
--- a/extensions/source/scanner/scanunx.cxx
+++ b/extensions/source/scanner/scanunx.cxx
@@ -181,6 +181,8 @@ ScannerThread::~ScannerThread()
void ScannerThread::run()
{
+ osl_setThreadName("ScannerThread");
+
osl::MutexGuard aGuard( m_pHolder->m_aProtector );
BitmapTransporter* pTransporter = new BitmapTransporter;
Reference< XInterface > aIf( static_cast< OWeakObject* >( pTransporter ) );
diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx
index eb24586..8503ff0 100644
--- a/sal/osl/unx/process.cxx
+++ b/sal/osl/unx/process.cxx
@@ -190,6 +190,8 @@ extern "C" {
static void ChildStatusProc(void *pData)
{
+ osl_setThreadName("osl_executeProcess");
+
pid_t pid = -1;
int status = 0;
int channel[2] = { -1, -1 };
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index a24d373..3bcc984 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -97,6 +97,7 @@ extern "C"
static void call_SelectionManager_runDragExecute( void * pMgr )
{
+ osl_setThreadName("SelectionManager::runDragExecute()");
SelectionManager::runDragExecute( pMgr );
}
}
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
index d39196e..99417d8 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -111,6 +111,7 @@ struct GetPPDAttribs
extern "C" {
static void getPPDWorker(void* pData)
{
+ osl_setThreadName("CUPSManager getPPDWorker");
GetPPDAttribs* pAttribs = (GetPPDAttribs*)pData;
pAttribs->executeCall();
}
@@ -172,6 +173,7 @@ extern "C"
{
static void run_dest_thread_stub( void* pThis )
{
+ osl_setThreadName("CUPSManager cupsGetDests");
CUPSManager::runDestThread( pThis );
}
}
diff --git a/vcl/unx/kde/UnxCommandThread.cxx b/vcl/unx/kde/UnxCommandThread.cxx
index 7b907de..84bc2d8a 100644
--- a/vcl/unx/kde/UnxCommandThread.cxx
+++ b/vcl/unx/kde/UnxCommandThread.cxx
@@ -103,6 +103,8 @@ uno::Any SAL_CALL UnxFilePickerCommandThread::getValue()
void SAL_CALL UnxFilePickerCommandThread::run()
{
+ osl_setThreadName("UnxFilePickerCommandThread");
+
if ( m_nReadFD < 0 )
return;
diff --git a/vcl/unx/kde/UnxNotifyThread.cxx b/vcl/unx/kde/UnxNotifyThread.cxx
index f500767..3b97014 100644
--- a/vcl/unx/kde/UnxNotifyThread.cxx
+++ b/vcl/unx/kde/UnxNotifyThread.cxx
@@ -72,6 +72,8 @@ void SAL_CALL UnxFilePickerNotifyThread::fileSelectionChanged()
void SAL_CALL UnxFilePickerNotifyThread::run()
{
+ osl_setThreadName("UnxFilePickerNotifyThread");
+
do {
m_aNotifyCondition.reset();
m_aNotifyCondition.wait();
commit d386f88774df977691f9cb6ab231aa5b085d0b70
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Aug 22 17:42:42 2014 +0200
set names on the Win32-only threads
Nice to see what weird threads are running.
Change-Id: Ic9888aa3260d0aeb5858cde5415571ab23c75484
diff --git a/dtrans/source/win32/clipb/MtaOleClipb.cxx b/dtrans/source/win32/clipb/MtaOleClipb.cxx
index 1747eec..c28d564 100644
--- a/dtrans/source/win32/clipb/MtaOleClipb.cxx
+++ b/dtrans/source/win32/clipb/MtaOleClipb.cxx
@@ -40,6 +40,7 @@
#include "MtaOleClipb.hxx"
#include <osl/conditn.hxx>
+#include <osl/thread.h>
#include <wchar.h>
#include <process.h>
@@ -740,6 +741,8 @@ unsigned int CMtaOleClipboard::run( )
unsigned int WINAPI CMtaOleClipboard::oleThreadProc( LPVOID pParam )
{
+ osl_setThreadName("CMtaOleClipboard::run()");
+
CMtaOleClipboard* pInst =
reinterpret_cast<CMtaOleClipboard*>( pParam );
OSL_ASSERT( NULL != pInst );
@@ -749,6 +752,7 @@ unsigned int WINAPI CMtaOleClipboard::oleThreadProc( LPVOID pParam )
unsigned int WINAPI CMtaOleClipboard::clipboardChangedNotifierThreadProc( LPVOID pParam )
{
+ osl_setThreadName("CMtaOleClipboard::clipboardChangedNotifierThreadProc()");
CMtaOleClipboard* pInst = reinterpret_cast< CMtaOleClipboard* >( pParam );
OSL_ASSERT( NULL != pInst );
diff --git a/dtrans/source/win32/dnd/source.cxx b/dtrans/source/win32/dnd/source.cxx
index aed131f..d7907f5 100644
--- a/dtrans/source/win32/dnd/source.cxx
+++ b/dtrans/source/win32/dnd/source.cxx
@@ -30,6 +30,7 @@
#include "sourcecontext.hxx"
#include "../../inc/DtObjFactory.hxx"
#include <rtl/ustring.h>
+#include <osl/thread.h>
#include <winuser.h>
#include <stdio.h>
@@ -310,6 +311,8 @@ Sequence< OUString > SAL_CALL DragSource::getSupportedServiceNames( ) throw (Ru
XSourceListener. */
unsigned __stdcall DndOleSTAFunc(LPVOID pParams)
{
+ osl_setThreadName("DragSource DndOleSTAFunc");
+
// The structure contains all arguments for DoDragDrop and other
DragSource *pSource= (DragSource*)pParams;
diff --git a/dtrans/source/win32/dnd/target.cxx b/dtrans/source/win32/dnd/target.cxx
index 6a6afe8..f7f7704 100644
--- a/dtrans/source/win32/dnd/target.cxx
+++ b/dtrans/source/win32/dnd/target.cxx
@@ -27,6 +27,7 @@
#include "targetdropcontext.hxx"
#include "targetdragcontext.hxx"
#include <rtl/ustring.h>
+#include <osl/thread.h>
using namespace cppu;
using namespace osl;
@@ -185,6 +186,8 @@ void SAL_CALL DropTarget::initialize( const Sequence< Any >& aArguments )
// DoDragDrop. The thread also notifies all XSourceListener.
DWORD WINAPI DndTargetOleSTAFunc(LPVOID pParams)
{
+ osl_setThreadName("DropTarget DndTargetOleSTAFunc");
+
HRESULT hr= OleInitialize( NULL);
if( SUCCEEDED( hr) )
{
diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.cxx b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
index 7d116d7..b7df994 100644
--- a/fpicker/source/win32/filepicker/asynceventnotifier.cxx
+++ b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
@@ -18,6 +18,7 @@
*/
#include <osl/diagnose.h>
+#include <osl/thread.h>
#include "asynceventnotifier.hxx"
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/ui/dialogs/XFilePickerListener.hpp>
@@ -297,6 +298,8 @@ void SAL_CALL CAsyncEventNotifier::run()
unsigned int WINAPI CAsyncEventNotifier::ThreadProc(LPVOID pParam)
{
+ osl_setThreadName("fpicker CAsyncEventNotifier::run()");
+
CAsyncEventNotifier* pInst = reinterpret_cast< CAsyncEventNotifier* >(pParam);
OSL_ASSERT(pInst);
diff --git a/fpicker/source/win32/filepicker/asyncrequests.cxx b/fpicker/source/win32/filepicker/asyncrequests.cxx
index 228c9ea..e8ca9bc 100644
--- a/fpicker/source/win32/filepicker/asyncrequests.cxx
+++ b/fpicker/source/win32/filepicker/asyncrequests.cxx
@@ -152,6 +152,8 @@ void AsyncRequests::triggerRequestThreadAware(const RequestRef& rRequest,
void SAL_CALL AsyncRequests::run()
{
+ osl_setThreadName("fpicker::win32::vista::AsyncRequests");
+
static const ::sal_Int32 TIME_TO_WAIT_FOR_NEW_REQUESTS = 250;
// SYNCHRONIZED ->
diff --git a/fpicker/source/win32/filepicker/getfilenamewrapper.cxx b/fpicker/source/win32/filepicker/getfilenamewrapper.cxx
index 6e1446d..34202b0 100644
--- a/fpicker/source/win32/filepicker/getfilenamewrapper.cxx
+++ b/fpicker/source/win32/filepicker/getfilenamewrapper.cxx
@@ -132,6 +132,8 @@ namespace /* private */
unsigned __stdcall ThreadProc(void* pParam)
{
+ osl_setThreadName("fpicker GetOpenFileName");
+
CurDirGuard aGuard;
GetFileNameParam* lpgfnp =
diff --git a/fpicker/source/win32/folderpicker/MtaFop.cxx b/fpicker/source/win32/folderpicker/MtaFop.cxx
index cbab83b..d832ddf 100644
--- a/fpicker/source/win32/folderpicker/MtaFop.cxx
+++ b/fpicker/source/win32/folderpicker/MtaFop.cxx
@@ -18,6 +18,7 @@
*/
#include <osl/diagnose.h>
+#include <osl/thread.h>
#include <osl/conditn.hxx>
#include "MtaFop.hxx"
@@ -738,6 +739,8 @@ unsigned int CMtaFolderPicker::run( )
unsigned int WINAPI CMtaFolderPicker::StaThreadProc( LPVOID pParam )
{
+ osl_setThreadName("fpicker CMtaFolderPicker::run()");
+
CMtaFolderPicker* pInst =
reinterpret_cast<CMtaFolderPicker*>( pParam );
diff --git a/sal/osl/w32/dllentry.c b/sal/osl/w32/dllentry.c
index 1441f3e..f16cab7 100644
--- a/sal/osl/w32/dllentry.c
+++ b/sal/osl/w32/dllentry.c
@@ -32,6 +32,7 @@
#include <float.h>
#include <osl/mutex.h>
+#include <osl/thread.h>
#include "internal/rtllifecycle.h"
@@ -260,6 +261,8 @@ static DWORD GetParentProcessId()
static DWORD WINAPI ParentMonitorThreadProc( LPVOID lpParam )
{
+ osl_setThreadName("headless ParentMonitorThread");
+
DWORD_PTR dwParentProcessId = (DWORD_PTR)lpParam;
HANDLE hParentProcess = OpenProcess( SYNCHRONIZE, FALSE, dwParentProcessId );
diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx
index 584d6b0..6bd9a62 100644
--- a/sfx2/source/appl/shutdowniconw32.cxx
+++ b/sfx2/source/appl/shutdowniconw32.cxx
@@ -472,6 +472,8 @@ LRESULT CALLBACK executerWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP
DWORD WINAPI SystrayThread( LPVOID /*lpParam*/ )
{
+ osl_setThreadName("SystrayThread");
+
aListenerWindow = CreateWindowExA(0,
QUICKSTART_CLASSNAME, // registered class name
QUICKSTART_WINDOWNAME, // window name
commit b70fb7d704aa721cf7b1f3ce1120f84f89429479
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Aug 22 22:44:16 2014 +0200
everything is independent from vos these days...
Change-Id: Iccb94dcc31d6de8c9e4e7a31b3c2e36d4198b295
diff --git a/cppu/source/threadpool/thread.hxx b/cppu/source/threadpool/thread.hxx
index 4f1b6da..cc66975 100644
--- a/cppu/source/threadpool/thread.hxx
+++ b/cppu/source/threadpool/thread.hxx
@@ -32,7 +32,6 @@ namespace cppu_threadpool {
// private thread class for the threadpool
- // independent from vos
class ORequestThread:
public salhelper::SimpleReferenceObject, public osl::Thread
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 0332f90..3f8cd6c 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2873,10 +2873,8 @@ void Desktop::CheckFirstRun( )
{
if (officecfg::Office::Common::Misc::FirstRun::get())
{
- // this has once been done using a vos timer. this could lead to problems when
- // the timer would trigger when the app is already going down again, since VCL would
- // no longer be available. Since the old handler would do a postUserEvent to the main
- // thread anyway, we can use a vcl timer here to prevent the race contition (#107197#)
+ // use VCL timer, which won't trigger during shutdown if the
+ // application exits before timeout
m_firstRunTimer.SetTimeout(3000); // 3 sec.
m_firstRunTimer.SetTimeoutHdl(LINK(this, Desktop, AsyncInitFirstRun));
m_firstRunTimer.Start();
diff --git a/sfx2/source/doc/docundomanager.cxx b/sfx2/source/doc/docundomanager.cxx
index b816e51..3b448f0 100644
--- a/sfx2/source/doc/docundomanager.cxx
+++ b/sfx2/source/doc/docundomanager.cxx
@@ -161,7 +161,7 @@ namespace sfx2
//= SolarMutexFacade
- /** a facade for the SolarMutex, implementing ::framework::IMutex (as opposed to ::vos::IMutex)
+ /** a facade for the SolarMutex, implementing ::framework::IMutex
*/
class SolarMutexFacade : public ::framework::IMutex
{
diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
index bcf602e..1a28f11 100644
--- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
@@ -639,7 +639,6 @@ void SAL_CALL SvxPixelCtlAccessibleChild::grabFocus() throw( RuntimeException, s
sal_Int32 SvxPixelCtlAccessibleChild::getForeground( )
throw (::com::sun::star::uno::RuntimeException, std::exception)
{
- //::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
::osl::MutexGuard aGuard( m_aMutex );
ThrowExceptionIfNotAlive();
return mrParentWindow.GetControlForeground().GetColor();
@@ -647,7 +646,6 @@ sal_Int32 SvxPixelCtlAccessibleChild::getForeground( )
sal_Int32 SvxPixelCtlAccessibleChild::getBackground( )
throw (::com::sun::star::uno::RuntimeException, std::exception)
{
- //::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
::osl::MutexGuard aGuard( m_aMutex );
ThrowExceptionIfNotAlive();
More information about the Libreoffice-commits
mailing list