Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 799c2c77c4e5
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 168113ce554a
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 23, 2016

  1. protocols/pipe_ipc: raise line length limit

    @sbourdeauducq
    sbourdeauducq committed Mar 23, 2016

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    chrischdi Christian Schlotter
    GPG key ID: 0E487122453EB0AC
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    120db8b View commit details

  2. protocols/pc_rpc: support dynamic target creation

    @sbourdeauducq
    sbourdeauducq committed Mar 23, 2016
    Copy the full SHA
    168113c View commit details
Showing with 6 additions and 3 deletions.
  1. +3 −0 artiq/protocols/pc_rpc.py
  2. +3 −3 artiq/protocols/pipe_ipc.py
3 changes: 3 additions & 0 deletions artiq/protocols/pc_rpc.py
View file
Original file line number Diff line number Diff line change
@@ -538,6 +538,9 @@ async def _handle_connection_cr(self, reader, writer):
except KeyError:
return

if callable(target):
target = target()

while True:
line = await reader.readline()
if not line:
6 changes: 3 additions & 3 deletions artiq/protocols/pipe_ipc.py
View file
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ async def read(self, n):

if os.name != "nt":
async def _fds_to_asyncio(rfd, wfd, loop):
reader = asyncio.StreamReader(loop=loop)
reader = asyncio.StreamReader(loop=loop, limit=4*1024*1024)
reader_protocol = asyncio.StreamReaderProtocol(reader, loop=loop)
rf = open(rfd, "rb", 0)
rt, _ = await loop.connect_read_pipe(lambda: reader_protocol, rf)
@@ -128,7 +128,7 @@ async def create_subprocess(self, *args, **kwargs):
loop = asyncio.get_event_loop()

def factory():
reader = asyncio.StreamReader(loop=loop)
reader = asyncio.StreamReader(loop=loop, limit=4*1024*1024)
protocol = asyncio.StreamReaderProtocol(reader,
self._child_connected,
loop=loop)
@@ -189,7 +189,7 @@ def __init__(self, address):

async def connect(self):
loop = asyncio.get_event_loop()
self.reader = asyncio.StreamReader(loop=loop)
self.reader = asyncio.StreamReader(loop=loop, limit=4*1024*1024)
reader_protocol = asyncio.StreamReaderProtocol(
self.reader, loop=loop)
transport, _ = await loop.create_pipe_connection(