diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-10-13 09:02:48 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-10-14 06:00:49 +0200 |
| commit | 8a017d25a62e878fdd32f189f0663b05d2ffb9cf (patch) | |
| tree | c91ee53b5d9276ae30df785b52579a1b77a057df /uui | |
| parent | 17d3cacfb9675268e709cfc95771ad4ce8bde75a (diff) | |
Avoid COW overhead using css::uno::Sequence
The scenarios are:
1. Calling sequence's begin() and end() in pairs to pass to algorithms
(both calls use getArray(), which does the COW checks)
2. In addition to #1, calling end() again when checking result of find
algorithms, and/or begin() to calculate result's distance
3. Using non-const sequences in range-based for loops, which internally
do #1
4. Assigning sequence to another sequence variable, and then modifying
one of them
In many cases, the sequences could be made const, or treated as const
for the purposes of the algorithms (using std::as_const, std::cbegin,
and std::cend). Where algorithm modifies the sequence, it was changed
to only call getArray() once. For that, css::uno::toNonConstRange was
introduced, which returns a struct (sublclass of std::pair) with two
iterators [begin, end], that are calculated using one call to begin()
and one call to getLength().
To handle #4, css::uno::Sequence::swap was introduced, that swaps the
internal pointer to uno_Sequence. So when a local Sequence variable
should be assigned to another variable, and the latter will be modified
further, it's now possible to use swap instead, so the two sequences
are kept independent.
The modified places were found by temporarily removing non-const end().
Change-Id: I8fe2787f200eecb70744e8b77fbdf7a49653f628
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123542
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'uui')
| -rw-r--r-- | uui/source/iahndl-filter.cxx | 4 | ||||
| -rw-r--r-- | uui/source/iahndl-ssl.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/uui/source/iahndl-filter.cxx b/uui/source/iahndl-filter.cxx index 706c568aa40a..b2f0bf71be9c 100644 --- a/uui/source/iahndl-filter.cxx +++ b/uui/source/iahndl-filter.cxx @@ -214,9 +214,9 @@ handleFilterOptionsRequest_( uno::Sequence < beans::PropertyValue > aProps; if ( xFilterCFG->getByName( aFilterName ) >>= aProps ) { - auto pProp = std::find_if(aProps.begin(), aProps.end(), + auto pProp = std::find_if(std::cbegin(aProps), std::cend(aProps), [](const beans::PropertyValue& rProp) { return rProp.Name == "UIComponent"; }); - if (pProp != aProps.end()) + if (pProp != std::cend(aProps)) { OUString aServiceName; pProp->Value >>= aServiceName; diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx index ac7560aa4935..136907da7cc2 100644 --- a/uui/source/iahndl-ssl.cxx +++ b/uui/source/iahndl-ssl.cxx @@ -255,7 +255,7 @@ handleCertificateValidationRequest_( rRequest.Certificate ); } - uno::Sequence< uno::Reference< security::XCertificateExtension > > extensions = rRequest.Certificate->getExtensions(); + const uno::Sequence< uno::Reference< security::XCertificateExtension > > extensions = rRequest.Certificate->getExtensions(); uno::Reference< security::XSanExtension > sanExtension; auto pExtension = std::find_if(extensions.begin(), extensions.end(), [](const uno::Reference< security::XCertificateExtension >& element) { |