occheung
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

artiq_devtool: make locking reentrant.

This commit is contained in:
whitequark 2018-01-19 07:58:58 +00:00
parent b553804e5a
commit 3922a7c64b
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
artiq/frontend/artiq_devtool.py
View File

@ -13,6 +13,7 @@ import select
import threading import threading
import os import os
import shutil import shutil
import re
from artiq.tools import verbosity_args, init_logger, logger, SSHClient from artiq.tools import verbosity_args, init_logger, logger, SSHClient
@ -93,6 +94,15 @@ def main():
nonlocal flock_file nonlocal flock_file
if not flock_acquired: if not flock_acquired:
fuser_args = ["fuser", "-u", lockfile]
fuser = client.spawn_command(fuser_args)
fuser_file = fuser.makefile('r')
fuser_match = re.search(r"\((.+?)\)", fuser_file.readline())
if fuser_match.group(1) == os.getenv("USER"):
logger.info("Lock already acquired by {}".format(os.getenv("USER")))
flock_acquired = True
return
logger.info("Acquiring device lock") logger.info("Acquiring device lock")
flock_args = ["flock"] flock_args = ["flock"]
if not args.wait: if not args.wait: