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

use asyncio get/new_event_loop as recommended

This commit is contained in:
Sebastien Bourdeauducq 2022-05-31 22:25:43 +08:00
parent 8bf6bc4d1f
commit ca614a3eea
7 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
artiq/frontend/aqctl_corelog.py
View File

@ -76,7 +76,8 @@ def main():
args = get_argparser().parse_args() args = get_argparser().parse_args()
common_args.init_logger_from_args(args) common_args.init_logger_from_args(args)
loop = asyncio.get_event_loop() loop = asyncio.new_event_loop()
asyncio.set_event_loop(loop)
try: try:
signal_handler = SignalHandler() signal_handler = SignalHandler()
signal_handler.setup() signal_handler.setup()

3
artiq/frontend/aqctl_moninj_proxy.py
View File

@ -196,7 +196,8 @@ def main():
bind_address = common_args.bind_address_from_args(args) bind_address = common_args.bind_address_from_args(args)
loop = asyncio.get_event_loop() loop = asyncio.new_event_loop()
asyncio.set_event_loop(loop)
try: try:
signal_handler = SignalHandler() signal_handler = SignalHandler()
signal_handler.setup() signal_handler.setup()

3
artiq/frontend/artiq_client.py
View File

@ -245,7 +245,8 @@ def _show_datasets(datasets):
def _run_subscriber(host, port, subscriber): def _run_subscriber(host, port, subscriber):
loop = asyncio.get_event_loop() loop = asyncio.new_event_loop()
asyncio.set_event_loop(loop)
try: try:
loop.run_until_complete(subscriber.connect(host, port)) loop.run_until_complete(subscriber.connect(host, port))
try: try:

3
artiq/frontend/artiq_master.py
View File

@ -74,7 +74,8 @@ class MasterConfig:
def main(): def main():
args = get_argparser().parse_args() args = get_argparser().parse_args()
log_forwarder = init_log(args) log_forwarder = init_log(args)
loop = asyncio.get_event_loop() loop = asyncio.new_event_loop()
asyncio.set_event_loop(loop)
atexit.register(loop.close) atexit.register(loop.close)
signal_handler = SignalHandler() signal_handler = SignalHandler()
signal_handler.setup() signal_handler.setup()

3
artiq/frontend/artiq_rtiomon.py
View File

@ -21,7 +21,8 @@ def get_argparser():
def main(): def main():
args = get_argparser().parse_args() args = get_argparser().parse_args()
loop = asyncio.get_event_loop() loop = asyncio.new_event_loop()
asyncio.set_event_loop(loop)
try: try:
signal_handler = SignalHandler() signal_handler = SignalHandler()
signal_handler.setup() signal_handler.setup()

3
artiq/test/coredevice/test_moninj.py
View File

@ -28,7 +28,8 @@ class MonInjTest(ExperimentCase):
def injection_status_cb(channel, override, value): def injection_status_cb(channel, override, value):
injection_statuses.append((channel, override, value)) injection_statuses.append((channel, override, value))
loop = asyncio.get_event_loop() loop = asyncio.new_event_loop()
asyncio.set_event_loop(loop)
try: try:
moninj_comm = CommMonInj(monitor_cb, injection_status_cb) moninj_comm = CommMonInj(monitor_cb, injection_status_cb)
loop.run_until_complete(moninj_comm.connect(core_host)) loop.run_until_complete(moninj_comm.connect(core_host))

12
flake.lock
View File

@ -10,11 +10,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1654001815, "lastModified": 1654007592,
"narHash": "sha256-wMVXlnMh64cWfG0LNpDExAGL5iHNoCstmVkOVr31NSE=", "narHash": "sha256-vaDFhE1ItjqtIcinC/6RAJGbj44pxxMUEeQUa3FtgEE=",
"owner": "m-labs", "owner": "m-labs",
"repo": "artiq-comtools", "repo": "artiq-comtools",
"rev": "2b4899ecddfaac160f92341377262ac61d6329b7", "rev": "cb73281154656ee8f74db1866859e31bf42755cd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -73,11 +73,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1654001788, "lastModified": 1654006751,
"narHash": "sha256-vUSep33N66pcvy7ojnBLSmyyVfN20+WZvP/c4b0T2CI=", "narHash": "sha256-OWAnoTCutvTQcYdtdtLQuL6uRtG+7Jz7sbRhcScv8bo=",
"owner": "m-labs", "owner": "m-labs",
"repo": "sipyco", "repo": "sipyco",
"rev": "951de4cf198419712ea3f52991d8f9293f3d9d15", "rev": "b3d03a94c751a24769c54a61a0dbe9d6af52dade",
"type": "github" "type": "github"
}, },
"original": { "original": {