[Libreoffice-commits] core.git: desktop/scripts

[Ilmari Lauhakangas (via logerrit)]

 desktop/scripts/soffice.sh |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 35463d886e15d13a81bce36610140e40ae742416
Author:     Ilmari Lauhakangas <ilmari.lauhakangas at libreoffice.org>
AuthorDate: Mon Jun 10 19:27:05 2019 +0300
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Sat Jul 13 16:17:16 2019 +0200

    Add more useful exports to soffice's callgrind mode
    
    Moved from TDF wiki to avoid duplication.
    
    These three stop us getting poor performance from unusual allocators:
    unset MALLOC_CHECK_ MALLOC_PERTURB_ G_SLICE
    
    If we wedge, at least we don't do it while grabbing the mouse:
    export SAL_DISABLE_FLOATGRAB=1
    
    Turns off recovery dialog, which can be a pain:
    export OOO_DISABLE_RECOVERY=1
    
    Turns off GL watchdog. It normally kills the application, if it
    seems to hang in a GL block:
    export SAL_DISABLE_GL_WATCHDOG=1
    
    Change-Id: I4ec30d363280b727cd305a6a81ccb85849697159
    Reviewed-on: https://gerrit.libreoffice.org/73773
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index 579915d1d6b3..026f7f022c78 100755
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -127,6 +127,10 @@ for arg in "$@" $EXTRAOPT ; do
                     export GLIBCXX_FORCE_NEW=1
                     ;;
                 callgrind)
+                    unset MALLOC_CHECK_ MALLOC_PERTURB_ G_SLICE
+                    export SAL_DISABLE_FLOATGRAB=1
+                    export OOO_DISABLE_RECOVERY=1
+                    export SAL_DISABLE_GL_WATCHDOG=1
                     export LD_BIND_NOW=1
                     ;;
                 esac