|
|
807b2d |
diff -up iotop-0.6/iotop/data.py.delayacctmsg iotop-0.6/iotop/data.py
|
|
|
807b2d |
--- iotop-0.6/iotop/data.py.delayacctmsg 2022-02-15 21:52:27.206378348 +0100
|
|
|
807b2d |
+++ iotop-0.6/iotop/data.py 2022-02-15 21:52:27.208378321 +0100
|
|
|
807b2d |
@@ -32,7 +32,6 @@ import time
|
|
|
807b2d |
# Check for requirements:
|
|
|
807b2d |
# o Linux >= 2.6.20 with I/O accounting and VM event counters
|
|
|
807b2d |
#
|
|
|
807b2d |
-
|
|
|
807b2d |
ioaccounting = os.path.exists('/proc/self/io')
|
|
|
807b2d |
|
|
|
807b2d |
try:
|
|
|
807b2d |
@@ -77,7 +76,7 @@ class Stats(DumpableObject):
|
|
|
807b2d |
('cancelled_write_bytes', 264)
|
|
|
807b2d |
]
|
|
|
807b2d |
|
|
|
807b2d |
- has_blkio_delay_total = False
|
|
|
807b2d |
+ has_blkio_delay_total = None
|
|
|
807b2d |
|
|
|
807b2d |
def __init__(self, task_stats_buffer):
|
|
|
807b2d |
sd = self.__dict__
|
|
|
807b2d |
@@ -88,7 +87,7 @@ class Stats(DumpableObject):
|
|
|
807b2d |
# This is a heuristic to detect if CONFIG_TASK_DELAY_ACCT is enabled in
|
|
|
807b2d |
# the kernel.
|
|
|
807b2d |
if not Stats.has_blkio_delay_total:
|
|
|
807b2d |
- Stats.has_blkio_delay_total = self.blkio_delay_total != 0
|
|
|
807b2d |
+ Stats.has_blkio_delay_total = sysctl_task_delayacct()
|
|
|
807b2d |
|
|
|
807b2d |
def accumulate(self, other_stats, destination, coeff=1):
|
|
|
807b2d |
"""Update destination from operator(self, other_stats)"""
|
|
|
807b2d |
diff -up iotop-0.6/iotop/ui.py.delayacctmsg iotop-0.6/iotop/ui.py
|
|
|
807b2d |
--- iotop-0.6/iotop/ui.py.delayacctmsg 2022-02-15 21:52:27.208378321 +0100
|
|
|
807b2d |
+++ iotop-0.6/iotop/ui.py 2022-02-15 21:52:54.607013860 +0100
|
|
|
807b2d |
@@ -489,7 +489,7 @@ class IOTopUI(object):
|
|
|
807b2d |
title = title[:remaining_cols]
|
|
|
807b2d |
remaining_cols -= len(title)
|
|
|
807b2d |
self.win.addstr(title, attr)
|
|
|
807b2d |
- if self.has_swapin_io:
|
|
|
807b2d |
+ if self.has_swapin_io is not False:
|
|
|
807b2d |
status_msg = None
|
|
|
807b2d |
else:
|
|
|
807b2d |
status_msg = ('CONFIG_TASK_DELAY_ACCT '
|