comparison mercurial/debugcommands.py @ 36851:31581528f242

debugwireproto: close the write end before consuming all available data

And make it read all available data deterministically. Otherwise util.poll()
may deadlock because both stdout and stderr could have no data.

Spotted by the next patch which removes stderr from the fds.

36850:ff541b8cdee0

    Flush data written to the server.

    readavailable
    -------------

    Read all available data from the server.

    If the connection to the server encompasses multiple pipes, we poll both
    pipes and read available data.

    readline

            batchedcommands = None
        elif action == 'close':
            peer.close()
        elif action == 'readavailable':
            fds = [stdout.fileno(), stderr.fileno()]
            try:
                act = util.poll(fds)
            except NotImplementedError:
                # non supported yet case, assume all have data.
                act = fds

            if stdout.fileno() in act:
                util.readpipe(stdout)
            if stderr.fileno() in act:
                util.readpipe(stderr)
        elif action == 'readline':
            stdout.readline()
        else:
            raise error.Abort(_('unknown action: %s') % action)

36851:31581528f242

    Flush data written to the server.

    readavailable
    -------------

    Close the write end of the connection and read all available data from
    the server.

    If the connection to the server encompasses multiple pipes, we poll both
    pipes and read available data.

    readline

            batchedcommands = None
        elif action == 'close':
            peer.close()
        elif action == 'readavailable':
            stdin.close()
            stdout.read()
            stderr.read()
        elif action == 'readline':
            stdout.readline()
        else:
            raise error.Abort(_('unknown action: %s') % action)