Skip to content

Let psutil.disk_usage show free inodes #2029

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jerryc05 wants to merge 2 commits into
base: master
Choose a base branch
from
+14 −2
Open

Let psutil.disk_usage show free inodes #2029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
404b461
Update _psposix.py
jerryc05 Dec 7, 2021
16c768d
Update _common.py
jerryc05 Dec 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion psutil/_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,9 @@ class BatteryTime(enum.IntEnum):
sswap = namedtuple('sswap', ['total', 'used', 'free', 'percent', 'sin',
'sout'])
# psutil.disk_usage()
sdiskusage = namedtuple('sdiskusage', ['total', 'used', 'free', 'percent'])
sdiskusage = namedtuple('sdiskusage', ['total', 'used', 'free', 'percent',
'total_inodes', 'used_inodes',
'free_inodes', 'percent_inodes'])
# psutil.disk_io_counters()
sdiskio = namedtuple('sdiskio', ['read_count', 'write_count',
'read_bytes', 'write_bytes',
Expand Down
12 changes: 11 additions & 1 deletion psutil/_psposix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,11 +200,21 @@ def disk_usage(path):
# to root's because the user has less space (usually -5%).
usage_percent_user = usage_percent(used, total_user, round_=1)

# Save as above, but for inodes
total_inodes = st.f_files
avail_inodes_to_root = st.f_ffree
avail_inodes_to_user = st.f_favail
used_inodes = (total_inodes - avail_inodes_to_root)
total_inodes_user = used_inodes + avail_inodes_to_user
usage_percent_inodes_user = usage_percent(used_inodes, total_inodes_user, round_=1)

# NB: the percentage is -5% than what shown by df due to
# reserved blocks that we are currently not considering:
# https://github.com/giampaolo/psutil/issues/829#issuecomment-223750462
return sdiskusage(
total=total, used=used, free=avail_to_user, percent=usage_percent_user)
total=total, used=used, free=avail_to_user, percent=usage_percent_user,
total_inodes=total_inodes, used_inodes=used_inodes,
free_inodes=avail_inodes_to_user, percent_inodes=usage_percent_inodes_user)


@memoize
Expand Down