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 the disk_io_counter bug in kernel 2.6 to 2.6.25 #530

Merged
merged 2 commits into from
Sep 15, 2014
Merged

Fix the disk_io_counter bug in kernel 2.6 to 2.6.25 #530

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f2e2a0
Fix the disk_io_counter bug in kernel 2.6 to 2.6.25
airekans Sep 4, 2014
1cb3605
Fix the comment space problem.
airekans Sep 4, 2014
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
9 changes: 7 additions & 2 deletions psutil/_pslinux.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,8 +638,13 @@ def disk_io_counters():
f.close()
for line in lines:
# http://www.mjmwired.net/kernel/Documentation/iostats.txt
_, _, name, reads, _, rbytes, rtime, writes, _, wbytes, wtime = \
line.split()[:11]
fields = line.split()
if len(fields) > 7:
_, _, name, reads, _, rbytes, rtime, writes, _, wbytes, wtime = \
fields[:11]
else: # from kernel 2.6 to 2.6.25
_, _, name, reads, rbytes, writes, wbytes = fields
rtime, wtime = 0, 0
if name in partitions:
rbytes = int(rbytes) * SECTOR_SIZE
wbytes = int(wbytes) * SECTOR_SIZE
Expand Down