[oe-commits] [bitbake] branch master-next updated: ui/knotty.py: Fix signal handling of SIGWINCH in BBProgress

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository bitbake.

The following commit(s) were added to refs/heads/master-next by this push:
       new  812bd49   ui/knotty.py: Fix signal handling of SIGWINCH in BBProgress
812bd49 is described below

commit 812bd49cb569379ee90d5be28a4b6e60645f1e54
Author: Aníbal Limón <anibal.limon at linux.intel.com>
AuthorDate: Thu Oct 6 16:52:07 2016 -0500

    ui/knotty.py: Fix signal handling of SIGWINCH in BBProgress
    
    Add the ability to pass default signal handler for SIGWINCH in BBProgress
    because with multiple instace of BBProgress the original signal handler
    set by TerminalFilter (sigwinch_handle) is lost.
    
    This is a fix for stack trace due to multiple async calls of ProgressBar
    _handle_resize (ioctl to terminal fd), see:
    
    NOTE: Executing SetScene Tasks
    Fatal Python error: Cannot recover from stack overflow.
    
    Current thread 0x00007f70a4793700 (most recent call first):
      File
    "/home/alimonb/repos/poky/bitbake/lib/progressbar/progressbar.py", line
    183 in _handle_resize
      File "/home/alimonb/repos/poky/bitbake/lib/bb/ui/knotty.py", line 58
    in _handle_resize
      File "/home/alimonb/repos/poky/bitbake/lib/bb/ui/knotty.py", line 60
    in _handle_resize
    ...
      File "/home/alimonb/repos/poky/bitbake/lib/bb/ui/knotty.py", line 60
    in _handle_resize
    ...
    Aborted
    
    Signed-off-by: Aníbal Limón <anibal.limon at linux.intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/ui/knotty.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py
index b31a8a1..948f527 100644
--- a/lib/bb/ui/knotty.py
+++ b/lib/bb/ui/knotty.py
@@ -32,6 +32,7 @@ import fcntl
 import struct
 import copy
 import atexit
+
 from bb.ui import uihelper
 
 featureSet = [bb.cooker.CookerFeatures.SEND_SANITYEVENTS]
@@ -40,7 +41,7 @@ logger = logging.getLogger("BitBake")
 interactive = sys.stdout.isatty()
 
 class BBProgress(progressbar.ProgressBar):
-    def __init__(self, msg, maxval, widgets=None, extrapos=-1):
+    def __init__(self, msg, maxval, widgets=None, extrapos=-1, resize_handler=None):
         self.msg = msg
         self.extrapos = extrapos
         if not widgets:
@@ -48,10 +49,10 @@ class BBProgress(progressbar.ProgressBar):
             progressbar.ETA()]
             self.extrapos = 4
 
-        try:
+        if resize_handler:
+            self._resize_default = resize_handler
+        else:
             self._resize_default = signal.getsignal(signal.SIGWINCH)
-        except:
-            self._resize_default = None
         progressbar.ProgressBar.__init__(self, maxval, [self.msg + ": "] + widgets, fd=sys.stdout)
 
     def _handle_resize(self, signum=None, frame=None):
@@ -247,10 +248,10 @@ class TerminalFilter(object):
                 start_time = activetasks[t].get("starttime", None)
                 if not pbar or pbar.bouncing != (progress < 0):
                     if progress < 0:
-                        pbar = BBProgress("0: %s (pid %s) " % (activetasks[t]["title"], t), 100, widgets=[progressbar.BouncingSlider(), ''], extrapos=2)
+                        pbar = BBProgress("0: %s (pid %s) " % (activetasks[t]["title"], t), 100, widgets=[progressbar.BouncingSlider(), ''], extrapos=2, resize_handler=self.sigwinch_handle)
                         pbar.bouncing = True
                     else:
-                        pbar = BBProgress("0: %s (pid %s) " % (activetasks[t]["title"], t), 100, widgets=[progressbar.Percentage(), ' ', progressbar.Bar(), ''], extrapos=4)
+                        pbar = BBProgress("0: %s (pid %s) " % (activetasks[t]["title"], t), 100, widgets=[progressbar.Percentage(), ' ', progressbar.Bar(), ''], extrapos=4, resize_handler=self.sigwinch_handle)
                         pbar.bouncing = False
                     activetasks[t]["progressbar"] = pbar
                 tasks.append((pbar, progress, rate, start_time))
@@ -274,7 +275,7 @@ class TerminalFilter(object):
             maxtask = self.helper.tasknumber_total
             if not self.main_progress or self.main_progress.maxval != maxtask:
                 widgets = [' ', progressbar.Percentage(), ' ', progressbar.Bar()]
-                self.main_progress = BBProgress("Running tasks", maxtask, widgets=widgets)
+                self.main_progress = BBProgress("Running tasks", maxtask, widgets=widgets, resize_handler=self.sigwinch_handle)
                 self.main_progress.start(False)
             self.main_progress.setmessage(content)
             progress = self.helper.tasknumber_current - 1

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.