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

Revert "master/worker: pause/resume devices" 

This reverts commit 437b37b158.
This commit is contained in:
Sebastien Bourdeauducq 2016-06-11 10:11:11 -06:00
parent 44724197c5
commit eb359ce50b
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
artiq/master/worker_impl.py
View File

@ -77,19 +77,12 @@ set_watchdog_factory(Watchdog)
class Scheduler: class Scheduler:
def __init__(self, device_mgr):
self.device_mgr = device_mgr
pause_noexc = staticmethod(make_parent_action("pause")) pause_noexc = staticmethod(make_parent_action("pause"))
@host_only @host_only
def pause(self): def pause(self):
self.device_mgr.pause_devices() if self.pause_noexc():
try: raise TerminationRequested
if self.pause_noexc():
raise TerminationRequested
finally:
self.device_mgr.resume_devices()
submit = staticmethod(make_parent_action("scheduler_submit")) submit = staticmethod(make_parent_action("scheduler_submit"))
delete = staticmethod(make_parent_action("scheduler_delete")) delete = staticmethod(make_parent_action("scheduler_delete"))
@ -186,8 +179,8 @@ def main():
exp_inst = None exp_inst = None
repository_path = None repository_path = None
device_mgr = DeviceManager(ParentDeviceDB) device_mgr = DeviceManager(ParentDeviceDB,
device_mgr.virtual_devices["scheduler"] = Scheduler(device_mgr) virtual_devices={"scheduler": Scheduler()})
dataset_mgr = DatasetManager(ParentDatasetDB) dataset_mgr = DatasetManager(ParentDatasetDB)
try: try: