Merge branch 'main' into bugfix/ignore-dot-directories-on-model-scan

This commit is contained in:
blessedcoolant
2023-10-15 17:23:02 +05:30
committed by GitHub
16 changed files with 2116 additions and 1040 deletions

View File

@ -55,8 +55,10 @@ class MemorySnapshot:
try:
malloc_info = LibcUtil().mallinfo2()
except OSError:
# This is expected in environments that do not have the 'libc.so.6' shared library.
except (OSError, AttributeError):
# OSError: This is expected in environments that do not have the 'libc.so.6' shared library.
# AttributeError: This is expected in environments that have `libc.so.6` but do not have the `mallinfo2` (e.g. glibc < 2.33)
# TODO: Does `mallinfo` work?
malloc_info = None
return cls(process_ram, vram, malloc_info)