From eb359ce50b25a51d6319bb6d1d531c9c48cc5dbc Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sat, 11 Jun 2016 10:11:11 -0600 Subject: [PATCH] Revert "master/worker: pause/resume devices" This reverts commit 437b37b158ff66d3573fd8accbdb5cff309aaf9d. --- artiq/master/worker_impl.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/artiq/master/worker_impl.py b/artiq/master/worker_impl.py index 3d6d2dde7..272b271d4 100644 --- a/artiq/master/worker_impl.py +++ b/artiq/master/worker_impl.py @@ -77,19 +77,12 @@ set_watchdog_factory(Watchdog) class Scheduler: - def __init__(self, device_mgr): - self.device_mgr = device_mgr - pause_noexc = staticmethod(make_parent_action("pause")) @host_only def pause(self): - self.device_mgr.pause_devices() - try: - if self.pause_noexc(): - raise TerminationRequested - finally: - self.device_mgr.resume_devices() + if self.pause_noexc(): + raise TerminationRequested submit = staticmethod(make_parent_action("scheduler_submit")) delete = staticmethod(make_parent_action("scheduler_delete")) @@ -186,8 +179,8 @@ def main(): exp_inst = None repository_path = None - device_mgr = DeviceManager(ParentDeviceDB) - device_mgr.virtual_devices["scheduler"] = Scheduler(device_mgr) + device_mgr = DeviceManager(ParentDeviceDB, + virtual_devices={"scheduler": Scheduler()}) dataset_mgr = DatasetManager(ParentDatasetDB) try: