M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

worker: also return DummyDevice from ExamineDeviceMgr

This commit is contained in:
Robert Jördens 2016-07-09 16:53:28 +02:00
parent 7a2405146a
commit cfb9fb808c
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
artiq/language/environment.py
View File

@ -213,8 +213,12 @@ class HasEnvironment:
Other initialization steps such as requesting devices may also be Other initialization steps such as requesting devices may also be
performed here. performed here.
When the repository is scanned, any requested devices and arguments There are two situations where the requested devices are replaced by
are set to ``None``. ``DummyDevice()`` and arguments are set to their defaults (or ``None``)
instead: when the repository is scanned to build the list of
available experiments and when the dataset browser ``artiq_browser``
is used to open or run the analysis stage of an experiment. Do not
rely on being able to operate on devices or arguments in ``build()``.
Datasets are read-only in this method. Datasets are read-only in this method.

4
artiq/master/worker_impl.py
View File

@ -11,7 +11,7 @@ import artiq
from artiq.protocols import pipe_ipc, pyon from artiq.protocols import pipe_ipc, pyon
from artiq.protocols.packed_exceptions import raise_packed_exc from artiq.protocols.packed_exceptions import raise_packed_exc
from artiq.tools import multiline_log_config, file_import from artiq.tools import multiline_log_config, file_import
from artiq.master.worker_db import DeviceManager, DatasetManager from artiq.master.worker_db import DeviceManager, DatasetManager, DummyDevice
from artiq.language.environment import (is_experiment, TraceArgumentManager, from artiq.language.environment import (is_experiment, TraceArgumentManager,
ProcessArgumentManager) ProcessArgumentManager)
from artiq.language.core import set_watchdog_factory, TerminationRequested from artiq.language.core import set_watchdog_factory, TerminationRequested
@ -124,7 +124,7 @@ class ExamineDeviceMgr:
get_device_db = make_parent_action("get_device_db") get_device_db = make_parent_action("get_device_db")
def get(name): def get(name):
return None return DummyDevice()
def examine(device_mgr, dataset_mgr, file): def examine(device_mgr, dataset_mgr, file):