lkml.org 
[lkml]   [2020]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.7 149/274] iocost_monitor: drop string wrap around numbers when outputting json
    Date
    From: Tejun Heo <tj@kernel.org>

    [ Upstream commit 21f3cfeab304fc07b90d93d98d4d2f62110fe6b2 ]

    Wrapping numbers in strings is used by some to work around bit-width issues in
    some enviroments. The problem isn't innate to json and the workaround seems to
    cause more integration problems than help. Let's drop the string wrapping.

    Signed-off-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/cgroup/iocost_monitor.py | 42 +++++++++++++++++-----------------
    1 file changed, 21 insertions(+), 21 deletions(-)

    diff --git a/tools/cgroup/iocost_monitor.py b/tools/cgroup/iocost_monitor.py
    index 9d8e9613008a..103605f5be8c 100644
    --- a/tools/cgroup/iocost_monitor.py
    +++ b/tools/cgroup/iocost_monitor.py
    @@ -112,14 +112,14 @@ class IocStat:

    def dict(self, now):
    return { 'device' : devname,
    - 'timestamp' : str(now),
    - 'enabled' : str(int(self.enabled)),
    - 'running' : str(int(self.running)),
    - 'period_ms' : str(self.period_ms),
    - 'period_at' : str(self.period_at),
    - 'period_vtime_at' : str(self.vperiod_at),
    - 'busy_level' : str(self.busy_level),
    - 'vrate_pct' : str(self.vrate_pct), }
    + 'timestamp' : now,
    + 'enabled' : self.enabled,
    + 'running' : self.running,
    + 'period_ms' : self.period_ms,
    + 'period_at' : self.period_at,
    + 'period_vtime_at' : self.vperiod_at,
    + 'busy_level' : self.busy_level,
    + 'vrate_pct' : self.vrate_pct, }

    def table_preamble_str(self):
    state = ('RUN' if self.running else 'IDLE') if self.enabled else 'OFF'
    @@ -179,19 +179,19 @@ class IocgStat:

    def dict(self, now, path):
    out = { 'cgroup' : path,
    - 'timestamp' : str(now),
    - 'is_active' : str(int(self.is_active)),
    - 'weight' : str(self.weight),
    - 'weight_active' : str(self.active),
    - 'weight_inuse' : str(self.inuse),
    - 'hweight_active_pct' : str(self.hwa_pct),
    - 'hweight_inuse_pct' : str(self.hwi_pct),
    - 'inflight_pct' : str(self.inflight_pct),
    - 'debt_ms' : str(self.debt_ms),
    - 'use_delay' : str(self.use_delay),
    - 'delay_ms' : str(self.delay_ms),
    - 'usage_pct' : str(self.usage),
    - 'address' : str(hex(self.address)) }
    + 'timestamp' : now,
    + 'is_active' : self.is_active,
    + 'weight' : self.weight,
    + 'weight_active' : self.active,
    + 'weight_inuse' : self.inuse,
    + 'hweight_active_pct' : self.hwa_pct,
    + 'hweight_inuse_pct' : self.hwi_pct,
    + 'inflight_pct' : self.inflight_pct,
    + 'debt_ms' : self.debt_ms,
    + 'use_delay' : self.use_delay,
    + 'delay_ms' : self.delay_ms,
    + 'usage_pct' : self.usage,
    + 'address' : self.address }
    for i in range(len(self.usages)):
    out[f'usage_pct_{i}'] = str(self.usages[i])
    return out
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-09 02:51    [W:2.193 / U:0.244 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site