[Libreoffice-commits] core.git: solenv/gdb

[Jan-Marek Glogowski (via logerrit)]

 solenv/gdb/libreoffice/vcl.py |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 66fc670dd3d06f58286532be2de0189ec955f476
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Thu Jul 1 19:04:25 2021 +0200
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Thu Jul 1 19:47:12 2021 +0200

    GDB vcl.py: actually return a string in to_string
    
    ... and hopefully make it python2.7 compatible... definitly a
    "brown paperbag" fix... well it did work locally ;-)
    
    I just noticed, because Jenkins spilled some errors from GDB on
    hang with:
    
    Traceback (most recent call last):
      File "/.../instdir/program/libvcllo.so-gdb.py", line 23, in <module>
        module = importlib.import_module('libreoffice.' + mod)
      File "/.../python2.7/importlib/__init__.py", line 37, in import_module
        __import__(name)
      File "/.../solenv/gdb/libreoffice/vcl.py", line 101
        print('STACK', end =", ")
    
    Change-Id: I500e8fea07e9865235e37673dee6374108fefbf2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118237
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>

diff --git a/solenv/gdb/libreoffice/vcl.py b/solenv/gdb/libreoffice/vcl.py
index ee9634fd5efc..ce595747587a 100644
--- a/solenv/gdb/libreoffice/vcl.py
+++ b/solenv/gdb/libreoffice/vcl.py
@@ -94,19 +94,17 @@ class ImplSchedulerContextPrinter(object):
         self.prio = gdb.lookup_type('TaskPriority')
 
     def to_string(self):
-        print('{')
+        res = "{\n"
         if self.value['mnTimerPeriod']:
-            print('mnTimerPeriod =', self.value['mnTimerPeriod'])
+            res = res + "mnTimerPeriod = " + str(self.value['mnTimerPeriod']) + "\n"
         if self.value['mpSchedulerStack']:
-            print('STACK', end =", ")
-            print(self.value['mpSchedulerStack'].dereference())
+            res = res + "STACK, " + str(self.value['mpSchedulerStack'].dereference())
         if self.value['mpFirstSchedulerData']:
             for key, value in self.prio.items():
                 first = self.value['mpFirstSchedulerData'][value.enumval]
                 if first:
-                    print(key.replace('TaskPriority::', ''), end =", ")
-                    print(first.dereference())
-        print('}')
+                    res = res + key.replace('TaskPriority::', '') + ", " + str(first.dereference())
+        return res + "}"
 
 printer = None