[Libreoffice-commits] core.git: extensions/source framework/source sc/source sd/source sfx2/source svx/source sw/source toolkit/source vcl/source
László Németh
laszlo.nemeth at collabora.com
Fri Jun 16 12:02:23 UTC 2017
extensions/source/ole/unoobjw.cxx | 2 ++
framework/source/loadenv/loadenv.cxx | 2 ++
framework/source/services/dispatchhelper.cxx | 2 ++
sc/source/ui/unoobj/docuno.cxx | 7 +++++++
sc/source/ui/unoobj/viewuno.cxx | 2 ++
sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx | 4 ++++
sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx | 1 +
sd/source/ui/unoidl/unomodel.cxx | 3 +++
sd/source/ui/unoidl/unopage.cxx | 2 ++
sfx2/source/doc/sfxbasemodel.cxx | 4 ++++
svx/source/unodraw/UnoNameItemTable.cxx | 4 ++++
sw/source/core/unocore/unodraw.cxx | 3 +++
sw/source/core/unocore/unoobj.cxx | 3 +++
sw/source/core/unocore/unotext.cxx | 4 ++++
sw/source/uibase/uno/unotxvw.cxx | 6 ++++++
toolkit/source/awt/vclxwindow.cxx | 2 ++
vcl/source/app/scheduler.cxx | 3 +++
17 files changed, 54 insertions(+)
New commits:
commit 08f6f9dded1b142b858c455da03319abac691655
Author: László Németh <laszlo.nemeth at collabora.com>
Date: Thu Mar 30 14:25:40 2017 +0200
Profiling API: add ProfileZones
Change-Id: Ie5669bd75d9b4be047d98402cb69ac313ab618df
Reviewed-on: https://gerrit.libreoffice.org/38787
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index db6398364656..be441c67e3a3 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -44,6 +44,7 @@
#include <osl/interlck.h>
#include <com/sun/star/uno/genfunc.h>
#include <comphelper/processfactory.hxx>
+#include <comphelper/profilezone.hxx>
#include "comifaces.hxx"
#include "jscriptclasses.hxx"
@@ -785,6 +786,7 @@ STDMETHODIMP InterfaceOleWrapper_Impl::Invoke(DISPID dispidMember,
EXCEPINFO * pexcepinfo,
unsigned int * puArgErr )
{
+ ::comphelper::ProfileZone aZone("COM Bridge");
HRESULT ret = S_OK;
try
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 99dbb690afb6..54b17462c40e 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -84,6 +84,7 @@
#include <rtl/bootstrap.hxx>
#include <vcl/svapp.hxx>
#include <cppuhelper/implbase.hxx>
+#include <comphelper/profilezone.hxx>
const char PROP_TYPES[] = "Types";
const char PROP_NAME[] = "Name";
@@ -143,6 +144,7 @@ css::uno::Reference< css::lang::XComponent > LoadEnv::loadComponentFromURL(const
const css::uno::Sequence< css::beans::PropertyValue >& lArgs )
{
css::uno::Reference< css::lang::XComponent > xComponent;
+ ::comphelper::ProfileZone aZone("loadComponentFromURL");
try
{
diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx
index da6bc9c52997..305367649678 100644
--- a/framework/source/services/dispatchhelper.cxx
+++ b/framework/source/services/dispatchhelper.cxx
@@ -26,6 +26,7 @@
#include <com/sun/star/frame/XNotifyingDispatch.hpp>
#include <comphelper/processfactory.hxx>
+#include <comphelper/profilezone.hxx>
namespace framework{
@@ -113,6 +114,7 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch(
bool SyncronFlag ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
{
+ ::comphelper::ProfileZone aZone("executeDispatch");
css::uno::Reference< css::uno::XInterface > xTHIS(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY);
m_aResult.clear();
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 305e788670cb..2c55292e40a9 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -68,6 +68,7 @@
#include <com/sun/star/script/XInvocation.hpp>
#include <com/sun/star/script/vba/XVBAEventProcessor.hpp>
#include <comphelper/processfactory.hxx>
+#include <comphelper/profilezone.hxx>
#include <comphelper/servicehelper.hxx>
#include <comphelper/string.hxx>
#include <cppuhelper/supportsservice.hxx>
@@ -1989,7 +1990,10 @@ void SAL_CALL ScModelObj::calculate()
{
SolarMutexGuard aGuard;
if (pDocShell)
+ {
+ ::comphelper::ProfileZone aZone("calculate");
pDocShell->DoRecalc(true);
+ }
else
{
OSL_FAIL("no DocShell"); //! throw exception?
@@ -2000,7 +2004,10 @@ void SAL_CALL ScModelObj::calculateAll()
{
SolarMutexGuard aGuard;
if (pDocShell)
+ {
+ ::comphelper::ProfileZone aZone("calculateAll");
pDocShell->DoHardRecalc();
+ }
else
{
OSL_FAIL("no DocShell"); //! throw exception?
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index 612ab210d246..b7b502aa9191 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -39,6 +39,7 @@
#include <sfx2/printer.hxx>
#include <sfx2/request.hxx>
#include <sfx2/viewfrm.hxx>
+#include <comphelper/profilezone.hxx>
#include <comphelper/servicehelper.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <toolkit/helper/convert.hxx>
@@ -1070,6 +1071,7 @@ uno::Reference<sheet::XSpreadsheet> SAL_CALL ScTabViewObj::getActiveSheet()
void SAL_CALL ScTabViewObj::setActiveSheet( const uno::Reference<sheet::XSpreadsheet>& xActiveSheet )
{
SolarMutexGuard aGuard;
+ ::comphelper::ProfileZone aZone("setActiveSheet");
ScTabViewShell* pViewSh = GetViewShell();
if ( pViewSh && xActiveSheet.is() )
diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
index 71e52c5a11f8..226df8a516ac 100644
--- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
@@ -127,6 +127,10 @@ void QueueProcessor::ProcessRequests()
::osl::MutexGuard aGuard (mrQueue.GetMutex());
if ( ! mrQueue.IsEmpty())
Start(mrQueue.GetFrontPriorityClass());
+ else
+ {
+ ::comphelper::ProfileZone aZone("QueueProcessor finished processing all elements");
+ }
}
}
diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
index aafe0648062e..0734decad408 100644
--- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
@@ -32,6 +32,7 @@
#include <svx/svdpagv.hxx>
#include <vcl/svapp.hxx>
#include <vcl/timer.hxx>
+#include <comphelper/profilezone.hxx>
#include <functional>
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 2c85154539bf..17c8d271402d 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -38,6 +38,7 @@
#include <comphelper/servicehelper.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <comphelper/processfactory.hxx>
+#include <comphelper/profilezone.hxx>
#include <editeng/unofield.hxx>
#include <notifydocumentevent.hxx>
@@ -2900,6 +2901,7 @@ sal_Bool SAL_CALL SdDrawPagesAccess::hasElements()
uno::Reference< drawing::XDrawPage > SAL_CALL SdDrawPagesAccess::insertNewByIndex( sal_Int32 nIndex )
{
::SolarMutexGuard aGuard;
+ ::comphelper::ProfileZone aZone("insertNewByIndex");
if( nullptr == mpModel )
throw lang::DisposedException();
@@ -3054,6 +3056,7 @@ sal_Int32 SAL_CALL SdMasterPagesAccess::getCount()
uno::Any SAL_CALL SdMasterPagesAccess::getByIndex( sal_Int32 Index )
{
::SolarMutexGuard aGuard;
+ ::comphelper::ProfileZone aZone("SdMasterPagesAccess::getByIndex");
if( nullptr == mpModel )
throw lang::DisposedException();
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 71078895f0fb..081b25604a84 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -24,6 +24,7 @@
#include <com/sun/star/view/PaperOrientation.hpp>
#include <cppuhelper/implbase.hxx>
#include <comphelper/processfactory.hxx>
+#include <comphelper/profilezone.hxx>
#include <comphelper/servicehelper.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <rtl/ustrbuf.hxx>
@@ -2361,6 +2362,7 @@ Reference< drawing::XDrawPage > SAL_CALL SdDrawPage::getMasterPage( )
void SAL_CALL SdDrawPage::setMasterPage( const Reference< drawing::XDrawPage >& xMasterPage )
{
::SolarMutexGuard aGuard;
+ ::comphelper::ProfileZone aZone("setMasterPage");
throwIfDisposed();
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 44ae593893e2..f0efafec87e8 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -118,6 +118,7 @@
#include <sfx2/DocumentMetadataAccess.hxx>
#include "printhelper.hxx"
#include <sfx2/sfxresid.hxx>
+#include <comphelper/profilezone.hxx>
// namespaces
@@ -1571,6 +1572,7 @@ void SAL_CALL SfxBaseModel::storeSelf( const Sequence< beans::PropertyValue >
void SAL_CALL SfxBaseModel::store()
{
+ ::comphelper::ProfileZone aZone("store");
storeSelf( Sequence< beans::PropertyValue >() );
}
@@ -1582,6 +1584,7 @@ void SAL_CALL SfxBaseModel::storeAsURL( const OUString& rURL
const Sequence< beans::PropertyValue >& rArgs )
{
SfxModelGuard aGuard( *this );
+ ::comphelper::ProfileZone aZone("storeAs");
if ( m_pData->m_pObjectShell.is() )
{
@@ -1621,6 +1624,7 @@ void SAL_CALL SfxBaseModel::storeToURL( const OUString& rURL
const Sequence< beans::PropertyValue >& rArgs )
{
SfxModelGuard aGuard( *this );
+ ::comphelper::ProfileZone aZone("storeToURL");
if ( m_pData->m_pObjectShell.is() )
{
diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx
index 4d38ba0961a3..cab1dace59ce 100644
--- a/svx/source/unodraw/UnoNameItemTable.cxx
+++ b/svx/source/unodraw/UnoNameItemTable.cxx
@@ -25,6 +25,7 @@
#include <svl/itempool.hxx>
#include <svl/itemset.hxx>
#include <svl/style.hxx>
+#include <comphelper/profilezone.hxx>
#include <comphelper/sequence.hxx>
#include <cppuhelper/supportsservice.hxx>
@@ -93,6 +94,7 @@ void SAL_CALL SvxUnoNameItemTable::ImplInsertByName( const OUString& aName, cons
void SAL_CALL SvxUnoNameItemTable::insertByName( const OUString& aApiName, const uno::Any& aElement )
{
SolarMutexGuard aGuard;
+ ::comphelper::ProfileZone aZone("SvxUnoNameItemTable::insertByName");
if( hasByName( aApiName ) )
throw container::ElementExistException();
@@ -106,6 +108,7 @@ void SAL_CALL SvxUnoNameItemTable::insertByName( const OUString& aApiName, const
void SAL_CALL SvxUnoNameItemTable::removeByName( const OUString& aApiName )
{
SolarMutexGuard aGuard;
+ ::comphelper::ProfileZone aZone("SvxUnoNameItemTable::removeByName");
// a little quickfix for 2.0 to let applications clear api
// created items that are not used
@@ -191,6 +194,7 @@ void SAL_CALL SvxUnoNameItemTable::replaceByName( const OUString& aApiName, cons
uno::Any SAL_CALL SvxUnoNameItemTable::getByName( const OUString& aApiName )
{
SolarMutexGuard aGuard;
+ ::comphelper::ProfileZone aZone("SvxUnoNameItemTable::getByName");
OUString aName = SvxUnogetInternalNameForItem(mnWhich, aApiName);
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 81e9831d1125..70cec6decfbd 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -59,6 +59,7 @@
#include <svx/shapepropertynotifier.hxx>
#include <crstate.hxx>
#include <comphelper/extract.hxx>
+#include <comphelper/profilezone.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <svx/scene3d.hxx>
#include <com/sun/star/drawing/XDrawPageSupplier.hpp>
@@ -2338,6 +2339,8 @@ awt::Size SAL_CALL SwXShape::getSize()
void SAL_CALL SwXShape::setSize( const awt::Size& aSize )
{
+ ::comphelper::ProfileZone aZone("SwXShape::setSize");
+
if ( mxShape.is() )
{
mxShape->setSize( aSize );
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index 7983e3c1a9d5..d2723423f23d 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -106,6 +106,7 @@
#include <unoparaframeenum.hxx>
#include <unoparagraph.hxx>
#include <comphelper/servicehelper.hxx>
+#include <comphelper/profilezone.hxx>
using namespace ::com::sun::star;
@@ -963,6 +964,7 @@ void SAL_CALL
SwXTextCursor::gotoStart(sal_Bool Expand)
{
SolarMutexGuard aGuard;
+ ::comphelper::ProfileZone aZone("gotoStart");
SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
@@ -1019,6 +1021,7 @@ void SAL_CALL
SwXTextCursor::gotoEnd(sal_Bool Expand)
{
SolarMutexGuard aGuard;
+ ::comphelper::ProfileZone aZone("gotoEnd");
SwUnoCursor & rUnoCursor( m_pImpl->GetCursorOrThrow() );
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index d166bba9ad6c..51536228f60a 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -32,6 +32,7 @@
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
+#include <comphelper/profilezone.hxx>
#include <comphelper/sequence.hxx>
#include <comphelper/servicehelper.hxx>
#include <cppuhelper/supportsservice.hxx>
@@ -284,6 +285,7 @@ SwXText::insertString(const uno::Reference< text::XTextRange >& xTextRange,
const OUString& rString, sal_Bool bAbsorb)
{
SolarMutexGuard aGuard;
+ ::comphelper::ProfileZone aZone("SwXText::insertString");
if (!xTextRange.is())
{
@@ -500,6 +502,7 @@ SwXText::insertTextContent(
sal_Bool bAbsorb)
{
SolarMutexGuard aGuard;
+ ::comphelper::ProfileZone aZone("SwXText::insertTextContent");
if (!xRange.is())
{
@@ -849,6 +852,7 @@ uno::Reference< text::XText > SAL_CALL
SwXText::getText()
{
SolarMutexGuard aGuard;
+ ::comphelper::ProfileZone aZone("SwXText::getText");
const uno::Reference< text::XText > xRet(this);
return xRet;
diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx
index 94c19a4872b2..aaeb9e6ae5e1 100644
--- a/sw/source/uibase/uno/unotxvw.cxx
+++ b/sw/source/uibase/uno/unotxvw.cxx
@@ -74,6 +74,7 @@
#include "swdtflvr.hxx"
#include <vcl/svapp.hxx>
#include <comphelper/processfactory.hxx>
+#include <comphelper/profilezone.hxx>
#include <comphelper/servicehelper.hxx>
#include <cppuhelper/supportsservice.hxx>
@@ -481,6 +482,7 @@ void SAL_CALL SwXTextView::setFormDesignMode( sal_Bool DesignMode )
uno::Reference< text::XTextViewCursor > SwXTextView::getViewCursor()
{
SolarMutexGuard aGuard;
+ ::comphelper::ProfileZone aZone("getViewCursor");
if(GetView())
{
if(!mxTextViewCursor.is())
@@ -1139,6 +1141,7 @@ void SwXTextViewCursor::gotoRange(
void SwXTextViewCursor::gotoStart(sal_Bool bExpand)
{
SolarMutexGuard aGuard;
+ ::comphelper::ProfileZone aZone("SwXTextViewCursor::gotoStart");
if(m_pView)
{
if (!IsTextSelection())
@@ -1153,6 +1156,7 @@ void SwXTextViewCursor::gotoStart(sal_Bool bExpand)
void SwXTextViewCursor::gotoEnd(sal_Bool bExpand)
{
SolarMutexGuard aGuard;
+ ::comphelper::ProfileZone aZone("SwXTextViewCursor::gotoEnd");
if(m_pView)
{
if (!IsTextSelection())
@@ -1548,6 +1552,7 @@ Any SwXTextViewCursor::getPropertyDefault( const OUString& rPropertyName )
sal_Bool SwXTextViewCursor::goDown(sal_Int16 nCount, sal_Bool bExpand)
{
SolarMutexGuard aGuard;
+ ::comphelper::ProfileZone aZone("SwXTextViewCursor::goDown");
bool bRet = false;
if(m_pView)
{
@@ -1564,6 +1569,7 @@ sal_Bool SwXTextViewCursor::goDown(sal_Int16 nCount, sal_Bool bExpand)
sal_Bool SwXTextViewCursor::goUp(sal_Int16 nCount, sal_Bool bExpand)
{
SolarMutexGuard aGuard;
+ ::comphelper::ProfileZone aZone("SwXTextViewCursor::goUp");
bool bRet = false;
if(m_pView)
{
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index ae2fc3e0b753..bc221aae7a0c 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -56,6 +56,7 @@
#include <vcl/settings.hxx>
#include <comphelper/asyncnotification.hxx>
#include <comphelper/flagguard.hxx>
+#include <comphelper/profilezone.hxx>
#include "stylesettings.hxx"
#include <tools/urlobj.hxx>
@@ -964,6 +965,7 @@ void VCLXWindow::removeEventListener( const css::uno::Reference< css::lang::XEve
void VCLXWindow::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags )
{
SolarMutexGuard aGuard;
+ ::comphelper::ProfileZone aZone("setPosSize");
if ( GetWindow() )
{
diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx
index e5109bc71f1c..1c52ad170d28 100644
--- a/vcl/source/app/scheduler.cxx
+++ b/vcl/source/app/scheduler.cxx
@@ -22,6 +22,7 @@
#include <vcl/scheduler.hxx>
#include <saltimer.hxx>
#include <salinst.hxx>
+#include <comphelper/profilezone.hxx>
namespace {
const sal_uInt64 MaximumTimeoutMs = 1000 * 60; // 1 minute
@@ -153,6 +154,8 @@ bool Scheduler::ProcessTaskScheduling( bool bIdle )
if ( pMostUrgent )
{
+ ::comphelper::ProfileZone aZone( pMostUrgent->GetDebugName() );
+
SAL_INFO("vcl.schedule", "Invoke task " << pMostUrgent->GetDebugName());
pMostUrgent->mnUpdateTime = nTime;
More information about the Libreoffice-commits
mailing list