This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2382

sshpeer: make pipe polling code more explicit
ClosedPublic

Authored by indygreg on Feb 21 2018, 5:08 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG066e6a9d52bb: sshpeer: make pipe polling code more explicit
Summary

"hasbuffer" is a property on our special bufferedinputpipe class.
When reading this code, I thought it might have had something
special to do properties on built-in types. But "hasbuffer" doesn't
appear in the CPython code base for either 2.7 or 3.7, so the
answer is no.

Let's make the code more explicit about the fact that it deals with
our special bufferedinputpipe type.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Feb 21 2018, 5:08 PM
yuja accepted this revision.Feb 22 2018, 9:05 AM
This revision is now accepted and ready to land.Feb 22 2018, 9:05 AM
Closed by commit rHG066e6a9d52bb: sshpeer: make pipe polling code more explicit (authored by indygreg). · Explain WhyFeb 22 2018, 9:18 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/sshpeer.py (7 lines)

Diff 6000

mercurial/sshpeer.py

def _wait(self): def _wait(self):
"""wait until some data are available on main or side """wait until some data are available on main or side
return a pair of boolean (ismainready, issideready) return a pair of boolean (ismainready, issideready)
(This will only wait for data if the setup is supported by `util.poll`) (This will only wait for data if the setup is supported by `util.poll`)
""" """
if getattr(self._main, 'hasbuffer', False): # getattr for classic pipe if (isinstance(self._main, util.bufferedinputpipe) and
return (True, True) # main has data, assume side is worth poking at. self._main.hasbuffer):
# Main has data. Assume side is worth poking at.
return True, True
fds = [self._main.fileno(), self._side.fileno()] fds = [self._main.fileno(), self._side.fileno()]
try: try:
act = util.poll(fds) act = util.poll(fds)
except NotImplementedError: except NotImplementedError:
# non supported yet case, assume all have data. # non supported yet case, assume all have data.
act = fds act = fds
return (self._main.fileno() in act, self._side.fileno() in act) return (self._main.fileno() in act, self._side.fileno() in act)