motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-07-31 14:23:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

python/qemu/console_socket.py: avoid encoding to/from string

Browse source 
We can work directly in bytes instead of translating back and forth to
string, which removes the question of which encodings to use.

Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-id: 20201006235817.3280413-17-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
This commit is contained in:
John Snow 2020-10-06 19:58:13 -04:00
parent e35c138267
commit af0db88254
1 changed files with 5 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

20
python/qemu/console_socket.py
View file

@ -34,12 +34,12 @@ class ConsoleSocket(socket.socket):
drain: bool = False): drain: bool = False):
self._recv_timeout_sec = 300.0 self._recv_timeout_sec = 300.0
self._sleep_time = 0.5 self._sleep_time = 0.5
self._buffer: Deque[str] = deque() self._buffer: Deque[int] = deque()
socket.socket.__init__(self, socket.AF_UNIX, socket.SOCK_STREAM) socket.socket.__init__(self, socket.AF_UNIX, socket.SOCK_STREAM)
self.connect(address) self.connect(address)
self._logfile = None self._logfile = None
if file: if file:
self._logfile = open(file, "w") self._logfile = open(file, "bw")
self._open = True self._open = True
self._drain_thread = None self._drain_thread = None
if drain: if drain:
@ -83,15 +83,10 @@ class ConsoleSocket(socket.socket):
def _drain_socket(self) -> None: def _drain_socket(self) -> None:
"""process arriving characters into in memory _buffer""" """process arriving characters into in memory _buffer"""
data = socket.socket.recv(self, 1) data = socket.socket.recv(self, 1)
# latin1 is needed since there are some chars
# we are receiving that cannot be encoded to utf-8
# such as 0xe2, 0x80, 0xA6.
string = data.decode("latin1")
if self._logfile: if self._logfile:
self._logfile.write("{}".format(string)) self._logfile.write(data)
self._logfile.flush() self._logfile.flush()
for c in string: self._buffer.extend(data)
self._buffer.extend(c)
def recv(self, bufsize: int = 1, flags: int = 0) -> bytes: def recv(self, bufsize: int = 1, flags: int = 0) -> bytes:
"""Return chars from in memory buffer. """Return chars from in memory buffer.
@ -107,12 +102,7 @@ class ConsoleSocket(socket.socket):
elapsed_sec = time.time() - start_time elapsed_sec = time.time() - start_time
if elapsed_sec > self._recv_timeout_sec: if elapsed_sec > self._recv_timeout_sec:
raise socket.timeout raise socket.timeout
chars = ''.join([self._buffer.popleft() for i in range(bufsize)]) return bytes((self._buffer.popleft() for i in range(bufsize)))
# We choose to use latin1 to remain consistent with
# handle_read() and give back the same data as the user would
# receive if they were reading directly from the
# socket w/o our intervention.
return chars.encode("latin1")
def setblocking(self, value: bool) -> None: def setblocking(self, value: bool) -> None:
"""When not draining we pass thru to the socket, """When not draining we pass thru to the socket,