diff options
| author | Tor Lillqvist <tml@collabora.com> | 2017-10-04 12:40:20 +0300 |
|---|---|---|
| committer | Dennis Francis <dennis.francis@collabora.co.uk> | 2017-11-21 13:49:52 +0530 |
| commit | b8d13501fd75c8b71f0ab7a0d3f5b965738a2c2e (patch) | |
| tree | 0d68731efb149bb6bc5bbd0a784deb48a4b8f3fd /sc/source/core/data/formulacell.cxx | |
| parent | 0565d230efe0909addf3b9a57edff5d1cb114ae4 (diff) | |
Make threaded calculation the default (when OpenCL is not used)
Introduce a configuration setting to turn it off. For now, can also be
turned off with the environment variable SC_NO_THREADED_CALCULATION,
but that is probably not something we want to keep or guarantee
staility of. (LO looks at way too many environment variables already.)
Change-Id: I469cde259eda72cc2d630814a25f707f1210b0ab
Diffstat (limited to 'sc/source/core/data/formulacell.cxx')
| -rw-r--r-- | sc/source/core/data/formulacell.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index fed52b93ddec..615fbb8056f7 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -54,6 +54,7 @@ #include <svl/intitem.hxx> #include <o3tl/make_unique.hxx> #include <rtl/strbuf.hxx> +#include <officecfg/Office/Calc.hxx> #include <formulagroup.hxx> #include <listenercontext.hxx> #include <types.hxx> @@ -4322,11 +4323,10 @@ bool ScFormulaCell::InterpretFormulaGroup() return false; } - static const bool bThreadingRequested = std::getenv("CPU_THREADED_CALCULATION"); + static const bool bThreadingProhibited = std::getenv("SC_NO_THREADED_CALCULATION"); // To temporarilu use threading for sc unit tests regardless of the size of the formula group, - // add the condition !std::getenv("LO_TESTNAME") below (with &&), and run with - // CPU_THREADED_CALCULATION=yes + // add the condition !std::getenv("LO_TESTNAME") below (with &&) if (GetWeight() < ScInterpreter::GetGlobalConfig().mnOpenCLMinimumFormulaGroupSize) { mxGroup->meCalcState = sc::GroupCalcDisabled; @@ -4341,7 +4341,7 @@ bool ScFormulaCell::InterpretFormulaGroup() return false; } - if (!ScCalcConfig::isOpenCLEnabled() && bThreadingRequested) + if (!bThreadingProhibited && !ScCalcConfig::isOpenCLEnabled() && officecfg::Office::Calc::Formula::Calculation::UseThreadedCalculationForFormulaGroups::get()) { // iterate over code in the formula ... // ensure all input is pre-calculated - |