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: 57e3d9ee34e2
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: e98fdfa7ca13
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on May 25, 2016

  1. protocols/broadcast: minor fixes

    @sbourdeauducq
    sbourdeauducq committed May 25, 2016
    Copy the full SHA
    7fb6b3d View commit details

  2. manual/installing: mention netmask and gateway. Closes #441

    @sbourdeauducq
    sbourdeauducq committed May 25, 2016
    Copy the full SHA
    e98fdfa View commit details
Showing with 8 additions and 5 deletions.
  1. +6 −5 artiq/protocols/broadcast.py
  2. +2 −0 doc/manual/installing.rst
11 changes: 6 additions & 5 deletions artiq/protocols/broadcast.py
View file
Original file line number Diff line number Diff line change
@@ -52,9 +52,9 @@ async def _receive_cr(self):


class Broadcaster(AsyncioServer):
def __init__(self):
AsyncioServer.__init__(self, maxbuf=1024)
self._maxbuf = maxbuf
def __init__(self, queue_limit=1024):
AsyncioServer.__init__(self)
self._queue_limit = queue_limit
self._recipients = dict()

async def _handle_connection_cr(self, reader, writer):
@@ -68,7 +68,7 @@ async def _handle_connection_cr(self, reader, writer):
return
name = line.decode()[:-1]

queue = asyncio.Queue(self._maxbuf)
queue = asyncio.Queue(self._queue_limit)
if name in self._recipients:
self._recipients[name].add(queue)
else:
@@ -97,5 +97,6 @@ def broadcast(self, name, obj):
try:
recipient.put_nowait(line)
except asyncio.QueueFull:
# do not log as logs may be redirected to a Broadcaster
# do not log: log messages may be sent back to us
# as broadcasts, and cause infinite recursion.
pass
2 changes: 2 additions & 0 deletions doc/manual/installing.rst
View file
Original file line number Diff line number Diff line change
@@ -394,6 +394,8 @@ This should be done after either installation method (conda or source).
.. note:: The reset button of the KC705 board is the "CPU_RST" labeled button.
.. warning:: Both those instructions will result in the flash storage being wiped out. However you can use the test mode to change the IP/MAC without erasing everything if you skip the "fserase" command.

* (optional) You may also want to set ``netmask`` and ``gateway`` in the same way that you set ``ip``.

* (optional) Flash the idle kernel

The idle kernel is the kernel (some piece of code running on the core device) which the core device runs whenever it is not connected to a PC via ethernet.