From ccae2b5779e01e885bd7c85e314a2f8f523c4b94 Mon Sep 17 00:00:00 2001 From: Jin Qian Date: Wed, 2 Aug 2017 17:37:40 -0700 Subject: [PATCH] storaged: fix excessive accounting when io usage has negative delta When current io bytes are smaller than previous bytes, add 0 to delta instead of adding current io bytes. Bug: 64317562 Merged-In: If0c9814892ad61b790baa6395649af10b11d5b7c Change-Id: I1ffd7ac33649ab3b8405c83b1328fa9bf49702c0 --- storaged/storaged_uid_monitor.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/storaged/storaged_uid_monitor.cpp b/storaged/storaged_uid_monitor.cpp index 5bb98e1e8..dd398b5ca 100644 --- a/storaged/storaged_uid_monitor.cpp +++ b/storaged/storaged_uid_monitor.cpp @@ -228,13 +228,13 @@ void uid_monitor::update_curr_io_stats_locked() last_uid_io_stats[uid.uid].io[BACKGROUND].write_bytes; usage.bytes[READ][FOREGROUND][charger_stat] += - (fg_rd_delta < 0) ? uid.io[FOREGROUND].read_bytes : fg_rd_delta; + (fg_rd_delta < 0) ? 0 : fg_rd_delta; usage.bytes[READ][BACKGROUND][charger_stat] += - (bg_rd_delta < 0) ? uid.io[BACKGROUND].read_bytes : bg_rd_delta; + (bg_rd_delta < 0) ? 0 : bg_rd_delta; usage.bytes[WRITE][FOREGROUND][charger_stat] += - (fg_wr_delta < 0) ? uid.io[FOREGROUND].write_bytes : fg_wr_delta; + (fg_wr_delta < 0) ? 0 : fg_wr_delta; usage.bytes[WRITE][BACKGROUND][charger_stat] += - (bg_wr_delta < 0) ? uid.io[BACKGROUND].write_bytes : bg_wr_delta; + (bg_wr_delta < 0) ? 0 : bg_wr_delta; } last_uid_io_stats = uid_io_stats;