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

ssh: Memoize the SshConnection._get_sftp()

Browse Source 
Since we have the guarantee to have a different SshConnection per
thread, we can memoize paramiko's SFTPClient. This provides a great
performance boost.
This commit is contained in:
Douglas Raillard 2021-08-12 15:57:32 +01:00 committed by Marc Bonnici
parent 55d914bf93
commit 79be8bc5ad
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devlib/utils/ssh.py
View File

@ -31,6 +31,7 @@ import contextlib
import weakref import weakref
import select import select
import copy import copy
import functools
from pipes import quote from pipes import quote
from future.utils import raise_from from future.utils import raise_from
@ -406,6 +407,7 @@ class SshConnection(SshConnectionBase):
def _get_progress_cb(self): def _get_progress_cb(self):
return self.transfer_mgr.progress_cb if self.transfer_mgr is not None else None return self.transfer_mgr.progress_cb if self.transfer_mgr is not None else None
@functools.lru_cache()
def _get_sftp(self, timeout): def _get_sftp(self, timeout):
try: try:
sftp = self.client.open_sftp() sftp = self.client.open_sftp()
@ -417,6 +419,7 @@ class SshConnection(SshConnectionBase):
sftp.get_channel().settimeout(timeout) sftp.get_channel().settimeout(timeout)
return sftp return sftp
@functools.lru_cache()
def _get_scp(self, timeout): def _get_scp(self, timeout):
return SCPClient(self.client.get_transport(), socket_timeout=timeout, progress=self._get_progress_cb()) return SCPClient(self.client.get_transport(), socket_timeout=timeout, progress=self._get_progress_cb())