commit fb232a8d8ff143410e17bfe9672207479697e3ef
author Luboš Luňák <l.lunak@collabora.com> Mon Mar 08 22:50:58 2021 +0100
committer Xisco Fauli <xiscofauli@libreoffice.org> Tue Mar 09 22:25:39 2021 +0100
tree 533c63583ac9e6f99c5564abf4f9a1ae30db1b55
parent b23a3518fd60be26607a1e8e50ddb821d63cc0b6

fix ScFlatBoolSegmentsImpl delayed setup with threads (tdf#140754)

Change-Id: I258263f6a15e7098a2292ba7f3336fcaaf5224ff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112184
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
(cherry picked from commit 2fb274950e5207ca55f4f52325fb522bd44024e1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112212
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>

sc/inc/segmenttree.hxx

diff --git a/sc/inc/segmenttree.hxx b/sc/inc/segmenttree.hxx
index 58e59e6..7e25d23 100644
--- a/sc/inc/segmenttree.hxx
+++ b/sc/inc/segmenttree.hxx
@@ -77,6 +77,9 @@ public:

    SCROW findLastTrue() const;

    // Builds internal data (so that it doesn't build them while used in threads).
    void makeReady();

    OString dumpAsString();

private:
@@ -102,6 +105,9 @@ public:
    void removeSegment(SCCOL nCol1, SCCOL nCol2);
    void insertSegment(SCCOL nCol, SCCOL nSize);

    // Builds internal data (so that it doesn't build them while used in threads).
    void makeReady();

    OString dumpAsString();

private:
@@ -153,6 +159,9 @@ public:

    void enableTreeSearch(bool bEnable);

    // Builds internal data (so that it doesn't build them while used in threads).
    void makeReady();

    OString dumpAsString();

private:

sc/source/core/data/segmenttree.cxx

diff --git a/sc/source/core/data/segmenttree.cxx b/sc/source/core/data/segmenttree.cxx
index 0003343..d6d57f0 100644
--- a/sc/source/core/data/segmenttree.cxx
+++ b/sc/source/core/data/segmenttree.cxx
@@ -24,6 +24,7 @@
#include <algorithm>
#include <limits>
#include <address.hxx>
#include <global.hxx>

using ::std::numeric_limits;

@@ -66,6 +67,8 @@ public:
        mbTreeSearchEnabled = b;
    }

    void makeReady();

private:
    typedef ::mdds::flat_segment_tree<SCCOLROW, ValueType> fst_type;
    fst_type maSegments;
@@ -131,7 +134,10 @@ typename ScFlatSegmentsImpl<ValueType_, ExtValueType_>::ValueType ScFlatSegments
    }

    if (!maSegments.is_tree_valid())
    {
        assert(!ScGlobal::bThreadedGroupCalcInProgress);
        maSegments.build_tree();
    }

    maSegments.search_tree(nPos, nValue);
    return nValue;
@@ -185,7 +191,10 @@ bool ScFlatSegmentsImpl<ValueType_, ExtValueType_>::getRangeData(SCCOLROW nPos, 
        return getRangeDataLeaf(nPos, rData);

    if (!maSegments.is_tree_valid())
    {
        assert(!ScGlobal::bThreadedGroupCalcInProgress);
        maSegments.build_tree();
    }

    if (!maSegments.search_tree(nPos, rData.mnValue, &rData.mnPos1, &rData.mnPos2).second)
        return false;
@@ -267,6 +276,14 @@ bool ScFlatSegmentsImpl<ValueType_, ExtValueType_>::getNext(RangeData& rData)
    return true;
}

template<typename ValueType_, typename ExtValueType_>
void ScFlatSegmentsImpl<ValueType_, ExtValueType_>::makeReady()
{
    assert(!ScGlobal::bThreadedGroupCalcInProgress);
    if (!maSegments.is_tree_valid())
        maSegments.build_tree();
}

class ScFlatUInt16SegmentsImpl : public ScFlatSegmentsImpl<sal_uInt16, sal_uInt32>
{
public:
@@ -416,6 +433,11 @@ SCROW ScFlatBoolRowSegments::findLastTrue() const
    return mpImpl->findLastTrue(false);
}

void ScFlatBoolRowSegments::makeReady()
{
    mpImpl->makeReady();
}

OString ScFlatBoolRowSegments::dumpAsString()
{
    OString aOutput;
@@ -483,6 +505,11 @@ void ScFlatBoolColSegments::insertSegment(SCCOL nCol, SCCOL nSize)
    mpImpl->insertSegment(static_cast<SCCOLROW>(nCol), static_cast<SCCOLROW>(nSize), true/*bSkipStartBoundary*/);
}

void ScFlatBoolColSegments::makeReady()
{
    mpImpl->makeReady();
}

OString ScFlatBoolColSegments::dumpAsString()
{
    OString aOutput;
@@ -596,6 +623,11 @@ void ScFlatUInt16RowSegments::setValueIf(SCROW nRow1, SCROW nRow2, sal_uInt16 nV
    mpImpl->setValueIf(static_cast<SCCOLROW>(nRow1), static_cast<SCCOLROW>(nRow2), nValue, rPredicate);
}

void ScFlatUInt16RowSegments::makeReady()
{
    mpImpl->makeReady();
}

OString ScFlatUInt16RowSegments::dumpAsString()
{
    OString aOutput;

sc/source/core/data/table1.cxx

diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 19ddf61..11ac1f1 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -2460,6 +2460,11 @@ bool ScTable::HandleRefArrayForParallelism( SCCOL nCol, SCROW nRow1, SCROW nRow2
    if ( !IsColValid( nCol ) || !ValidRow( nRow1 ) || !ValidRow( nRow2 ) )
        return false;

    mpHiddenCols->makeReady();
    mpHiddenRows->makeReady();
    mpFilteredCols->makeReady();
    mpFilteredRows->makeReady();

    return aCol[nCol].HandleRefArrayForParallelism(nRow1, nRow2, mxGroup);
}