summaryrefslogtreecommitdiffstats
path: root/pym/portage/util/_eventloop/PollSelectAdapter.py
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-09-25 19:25:49 -0700
committerZac Medico <zmedico@gentoo.org>2012-09-25 19:25:49 -0700
commit2b2580d9dac62aa720e5d996fa5102ee5caeffe7 (patch)
treed71e437f6ccb82181cfc81e776031a62744e1655 /pym/portage/util/_eventloop/PollSelectAdapter.py
parentf7648d050e9f3936ff2bc278f6927aa0b901be50 (diff)
downloadportage-2b2580d9dac62aa720e5d996fa5102ee5caeffe7.tar.gz
portage-2b2580d9dac62aa720e5d996fa5102ee5caeffe7.tar.bz2
portage-2b2580d9dac62aa720e5d996fa5102ee5caeffe7.zip
EventLoop: fix busy loop waiting for child pid
This fixes a case where EventLoop could consume 100% CPU while waiting for a child process. It also fixes timeout calculations in python 2.x, where it was using integer division instead of float.
Diffstat (limited to 'pym/portage/util/_eventloop/PollSelectAdapter.py')
-rw-r--r--pym/portage/util/_eventloop/PollSelectAdapter.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pym/portage/util/_eventloop/PollSelectAdapter.py b/pym/portage/util/_eventloop/PollSelectAdapter.py
index 17e63d918..244788c57 100644
--- a/pym/portage/util/_eventloop/PollSelectAdapter.py
+++ b/pym/portage/util/_eventloop/PollSelectAdapter.py
@@ -64,7 +64,7 @@ class PollSelectAdapter(object):
if timeout is not None and timeout < 0:
timeout = None
if timeout is not None:
- select_args.append(timeout / 1000)
+ select_args.append(float(timeout) / 1000)
select_events = select.select(*select_args)
poll_events = []