sascha/devlib
1
0
Fork 0
mirror of https://github.com/ARM-software/devlib.git synced 2025-04-04 08:50:04 +01:00
Code Issues Releases Wiki Activity

target: Remove duplicated disconnection logic

Browse Source 
The logic in Target.disconnect() appears to have been duplicated by
error. While _probably_ harmless, this is at least confusing, and since
this happens outside of the lock, this may actually be a real problem.
This commit is contained in:
Douglas Raillard 2025-01-30 15:21:26 +00:00 committed by Marc Bonnici
parent 20e5bcd2c7
commit a3765cc27d
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
devlib/target.py
View File

@ -548,28 +548,23 @@ class Target(object):
await check(as_root=True) await check(as_root=True)
def disconnect(self): def disconnect(self):
connections = self._conn.get_all_values()
# Now that we have all the connection objects, we simply reset the TLS
# property so that the connections we got will not be reused anywhere.
del self._conn
unused_conns = self._unused_conns
self._unused_conns.clear()
for conn in itertools.chain(connections, self._unused_conns):
conn.close()
pool = self._async_pool
self._async_pool = None
if pool is not None:
pool.__exit__(None, None, None)
with self._lock: with self._lock:
connections = self._conn.get_all_values() thread_conns = self._conn.get_all_values()
for conn in itertools.chain(connections, self._unused_conns): # Now that we have all the connection objects, we simply reset the
# TLS property so that the connections we obtained will not be
# reused anywhere.
del self._conn
unused_conns = list(self._unused_conns)
self._unused_conns.clear()
for conn in itertools.chain(thread_conns, unused_conns):
conn.close() conn.close()
if self._async_pool is not None:
self._async_pool.__exit__(None, None, None) pool = self._async_pool
self._async_pool = None
if pool is not None:
pool.__exit__(None, None, None)
def __enter__(self): def __enter__(self):
return self return self