public inbox for libabigail@sourceware.org
 help / color / mirror / Atom feed
* [PATCH, applied] fedabipkgdiff: Remove busy loop when forking abipkgdiff
@ 2023-04-07 18:13 Dodji Seketeli
  0 siblings, 0 replies; only message in thread
From: Dodji Seketeli @ 2023-04-07 18:13 UTC (permalink / raw)
  To: libabigail

Hello,

The function abipkgdiff() introduced a busy loop instead of using
subprocess.communicate() because it was randomly hanging back in the
python2 days.

This patch removes the busy loop altogether as I could not reproduce
the hanging anymore.

	* tools/fedabipkgdiff (abipkgdiff): Remove the busy looping and
	use subprocess.communicate() instead.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>
---
 tools/fedabipkgdiff | 26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/tools/fedabipkgdiff b/tools/fedabipkgdiff
index 960b15a6..e9c211cf 100755
--- a/tools/fedabipkgdiff
+++ b/tools/fedabipkgdiff
@@ -1182,30 +1182,8 @@ def abipkgdiff(cmp_half1, cmp_half2):
     proc = subprocess.Popen(' '.join(cmd), shell=True,
                             stdout=subprocess.PIPE, stderr=subprocess.PIPE,
                             universal_newlines=True)
-    # So we could have done: stdout, stderr = proc.communicate()
-    # But then the documentatin of proc.communicate says:
-    #
-    #    Note: The data read is buffered in memory, so do not use this
-    #    method if the data size is large or unlimited. "
-    #
-    # In practice, we are seeing random cases where this
-    # proc.communicate() function does *NOT* terminate and seems to be
-    # in a deadlock state.  So we are avoiding it altogether.  We are
-    # then busy looping, waiting for the spawn process to finish, and
-    # then we get its output.
-    #
-
-    sleeptime = 0.2
-    while True:
-        if proc.poll() != None:
-            break
-        time.sleep(sleeptime)
-        # cap the sleep time at 1.6s
-        if sleeptime < 2.0:
-            sleeptime = sleeptime * 2
-
-    stdout = ''.join(proc.stdout.readlines())
-    stderr = ''.join(proc.stderr.readlines())
+
+    stdout, stderr = proc.communicate()
 
     is_ok = proc.returncode == ABIDIFF_OK
     is_internal_error = proc.returncode & ABIDIFF_ERROR or proc.returncode & ABIDIFF_USAGE_ERROR
-- 
2.39.2


-- 
		Dodji


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2023-04-07 18:13 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-07 18:13 [PATCH, applied] fedabipkgdiff: Remove busy loop when forking abipkgdiff Dodji Seketeli

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).