Skip to content
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

[Windows] psutil.swap_memory() show swap instead of committed memory #1927

Merged
merged 1 commit into from
Apr 8, 2021
Merged

[Windows] psutil.swap_memory() show swap instead of committed memory #1927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 0 deletions CREDITS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,3 +740,7 @@ I: 1851
N: guille
W: https://github.com/guille
I: 1913

N: David Knaack
W: https://github.com/davidkna
I: 1921
1 change: 1 addition & 0 deletions HISTORY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ XXXX-XX-XX
called after sprintf(). (patch by alxchk)
- 1874_: [Solaris] swap output error due to incorrect range.
- 1913_: [Linux] wait_procs seemingly ignoring timeout, TimeoutExpired thrown
- 1921_: [Windows] psutil.swap_memory() shows committed memory instead of swap

5.8.0
=====
Expand Down
12 changes: 10 additions & 2 deletions psutil/_pswindows.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,8 +241,16 @@ def virtual_memory():
def swap_memory():
"""Swap system memory as a (total, used, free, sin, sout) tuple."""
mem = cext.virtual_mem()
total = mem[2]
free = mem[3]

total_phys = mem[0]
free_phys = mem[1]
total_system = mem[2]
free_system = mem[3]

# Despite the name PageFile refers to total system memory here
# thus physical memory values need to be substracted to get swap values
total = total_system - total_phys
free = min(total, free_system - free_phys)
used = total - free
percent = usage_percent(used, total, round_=1)
return _common.sswap(total, used, free, percent, 0, 0)
Expand Down