Fix a lock issue with some virtualbox vm

Fix  https://github.com/GNS3/gns3-gui/issues/1444
This commit is contained in:
Julien Duponchelle committed 2016-08-29 10:51:50 +02:00
1 parent 042a69eecf
commit 0eafb6f06c
3 files changed
+47 -3

No files matched your search

@@ -30,7 +30,7 @@ import asyncio
from gns3server.utils import parse_version
from gns3server.utils.telnet_server import TelnetServer
from gns3server.utils.asyncio import wait_for_file_creation, wait_for_named_pipe_creation
from gns3server.utils.asyncio import wait_for_file_creation, wait_for_named_pipe_creation, locked_coroutine
from .virtualbox_error import VirtualBoxError
from ..nios.nio_udp import NIOUDP
from ..nios.nio_nat import NIONAT
@@ -230,7 +230,7 @@ class VirtualBoxVM(BaseVM):
if (yield from self.check_hw_virtualization()):
self._hw_virtualization = True
@asyncio.coroutine
@locked_coroutine
def stop(self):
"""
Stops this VirtualBox VM.
+21
View File
@@ -127,3 +127,24 @@ def wait_for_named_pipe_creation(pipe_path, timeout=60):
else:
return
raise asyncio.TimeoutError()
def locked_coroutine(f):
"""
Method decorator that replace asyncio.coroutine that warranty
that this specific method of this class instance will not we
executed twice at the same time
"""
@asyncio.coroutine
def new_function(*args, **kwargs):
# In the instance of the class we will store
# a lock has an attribute.
lock_var_name = "__" + f.__name__ + "_lock"
if not hasattr(args[0], lock_var_name):
setattr(args[0], lock_var_name, asyncio.Lock())
with (yield from getattr(args[0], lock_var_name)):
return (yield from f(*args, **kwargs))
return new_function