summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tej Singh <singhtejinder@google.com> 2019-11-01 10:45:22 -0700
committer Tej Singh <singhtejinder@google.com> 2019-11-01 17:30:36 -0700
commitca782ac5ff24f52e43543da51330948c294fbb48 (patch)
treec1c8e6c6b3c512d66a30cbf88356e557a29c9419
parent7ab5b4928f7b7c6375553ee79f68c204d6b46f28 (diff)
Store elapsedRealtimeNs as int64 instead of long
long can be 32 bits, which will overflow in ~2 seconds if signed. Test: builds Change-Id: I78e69e2c2ceb21a5748d9d5d860b45e5a3fae865 Merged-In: I78e69e2c2ceb21a5748d9d5d860b45e5a3fae865
-rw-r--r--cmds/statsd/src/StatsLogProcessor.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/cmds/statsd/src/StatsLogProcessor.h b/cmds/statsd/src/StatsLogProcessor.h
index f0db1b0128a1..313e16d19b62 100644
--- a/cmds/statsd/src/StatsLogProcessor.h
+++ b/cmds/statsd/src/StatsLogProcessor.h
@@ -128,13 +128,13 @@ private:
std::unordered_map<ConfigKey, sp<MetricsManager>> mMetricsManagers;
- std::unordered_map<ConfigKey, long> mLastBroadcastTimes;
+ std::unordered_map<ConfigKey, int64_t> mLastBroadcastTimes;
// Last time we sent a broadcast to this uid that the active configs had changed.
- std::unordered_map<int, long> mLastActivationBroadcastTimes;
+ std::unordered_map<int, int64_t> mLastActivationBroadcastTimes;
// Tracks when we last checked the bytes consumed for each config key.
- std::unordered_map<ConfigKey, long> mLastByteSizeTimes;
+ std::unordered_map<ConfigKey, int64_t> mLastByteSizeTimes;
// Tracks which config keys has metric reports on disk
std::set<ConfigKey> mOnDiskDataConfigs;
@@ -205,7 +205,7 @@ private:
int64_t mLastTimestampSeen = 0;
- long mLastPullerCacheClearTimeSec = 0;
+ int64_t mLastPullerCacheClearTimeSec = 0;
// Last time we wrote data to disk.
int64_t mLastWriteTimeNs = 0;