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

Fix incorrect range for Solaris swap output (#1874) #1914

Merged
merged 2 commits into from
Feb 21, 2021
Merged

Fix incorrect range for Solaris swap output (#1874) #1914

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
b2f8b62
Fix incorrect range for Solaris swap output (#1874)
jomann09 Feb 4, 2021
abffe52
Merge branch 'master' into solaris-typo
giampaolo Feb 21, 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
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 @@ -20,6 +20,7 @@ XXXX-XX-XX
- 1892_: [macOS] psutil.cpu_freq() broken on Apple M1.
- 1904_: [Windows] OpenProcess fails with ERROR_SUCCESS due to GetLastError()
called after sprintf(). (patch by alxchk)
- 1874_: [Solaris] swap output error due to incorrect range.
- 1913_: [Linux] wait_procs seemingly ignoring timeout, TimeoutExpired thrown

5.8.0
Expand Down
2 changes: 1 addition & 1 deletion psutil/_pssunos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ def swap_memory():
total = free = 0
for line in lines:
line = line.split()
t, f = line[3:4]
t, f = line[3:5]
total += int(int(t) * 512)
free += int(int(f) * 512)
used = total - free
Expand Down