sc/source/core/data/formulacell.cxx | 19 +++++++++++-------- sc/source/core/tool/clkernelthread.cxx | 4 +++- 2 files changed, 14 insertions(+), 9 deletions(-)
New commits: commit 49bc2ac28fed51425f257558db4ed1e9c3522e6f Author: Tor Lillqvist <[email protected]> Date: Tue Jan 7 11:53:12 2014 +0200 Add some more logging Change-Id: I637c365626242142a0f6fc0ac002fa9dd5f1340a diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index c15710f..531c7e5 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -3501,13 +3501,15 @@ bool ScFormulaCell::InterpretFormulaGroup() aTopPos.SetRow(mxGroup->mpTopCell->aPos.Row()); ScGroupTokenConverter aConverter(aCode, *pDocument, *this, mxGroup->mpTopCell->aPos); if (!aConverter.convert(*pCode)) - { - mxGroup->meCalcState = sc::GroupCalcDisabled; - return false; - } + { + SAL_INFO("sc.opencl", "conversion of group " << this << " failed, disabling"); + mxGroup->meCalcState = sc::GroupCalcDisabled; + return false; + } mxGroup->meCalcState = sc::GroupCalcRunning; if (!sc::FormulaGroupInterpreter::getStatic()->interpret(*pDocument, mxGroup->mpTopCell->aPos, mxGroup, aCode)) { + SAL_INFO("sc.opencl", "interpreting group " << mxGroup << " (state " << mxGroup->meCalcState << ") failed, disabling"); mxGroup->meCalcState = sc::GroupCalcDisabled; return false; } @@ -3517,10 +3519,11 @@ bool ScFormulaCell::InterpretFormulaGroup() { ScTokenArray aDummy; if (!sc::FormulaGroupInterpreter::getStatic()->interpret(*pDocument, mxGroup->mpTopCell->aPos, mxGroup, aDummy)) - { - mxGroup->meCalcState = sc::GroupCalcDisabled; - return false; - } + { + SAL_INFO("sc.opencl", "interpreting group " << mxGroup << " (state " << mxGroup->meCalcState << ") failed, disabling"); + mxGroup->meCalcState = sc::GroupCalcDisabled; + return false; + } } return true; commit 3c37db6db90564431ebaf85afef1d8c30ddd8f61 Author: Tor Lillqvist <[email protected]> Date: Tue Jan 7 11:33:08 2014 +0200 Avoid assertion failure if group has been disabled Change-Id: I918f2716778ddd9ede56b5df731a531f97a3b24d diff --git a/sc/source/core/tool/clkernelthread.cxx b/sc/source/core/tool/clkernelthread.cxx index 651d369..2a619c5 100644 --- a/sc/source/core/tool/clkernelthread.cxx +++ b/sc/source/core/tool/clkernelthread.cxx @@ -48,7 +48,9 @@ void CLBuildKernelThread::execute() switch (aWorkItem.meWhatToDo) { case CLBuildKernelWorkItem::COMPILE: - SAL_INFO("sc.opencl.thread", "told to compile group " << aWorkItem.mxGroup << " to binary"); + SAL_INFO("sc.opencl.thread", "told to compile group " << aWorkItem.mxGroup << " (state " << aWorkItem.mxGroup->meCalcState << ") to binary"); + if (aWorkItem.mxGroup->meCalcState == sc::GroupCalcDisabled) + break; assert(aWorkItem.mxGroup->meCalcState == sc::GroupCalcOpenCLKernelCompilationScheduled); aWorkItem.mxGroup->mpCompiledFormula = sc::FormulaGroupInterpreter::getStatic()->createCompiledFormula(*aWorkItem.mxGroup->mpTopCell->GetDocument(), _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
