Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bug in statsd with uid memory guardrail"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-01-19 03:31:56 +00:00
committed by Android (Google) Code Review
parent 504039b1d3 c0f6f63e27
commit bfff5d705a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmds/statsd/src/packages/UidMap.cpp
View File

@@ -106,9 +106,9 @@ void UidMap::updateMap(const int64_t& timestamp, const vector<int32_t>& uid,
t->set_uid(uid[j]);
}
mBytesUsed += snapshot->ByteSize();
ensureBytesUsedBelowLimit();
StatsdStats::getInstance().setCurrentUidMapMemory(mBytesUsed);
StatsdStats::getInstance().setUidMapSnapshots(mOutput.snapshots_size());
ensureBytesUsedBelowLimit();
getListenerListCopyLocked(&broadcastList);
}
// To avoid invoking callback while holding the internal lock. we get a copy of the listener
@@ -142,9 +142,9 @@ void UidMap::updateApp(const int64_t& timestamp, const String16& app_16, const i
log->set_uid(uid);
log->set_version(versionCode);
mBytesUsed += log->ByteSize();
ensureBytesUsedBelowLimit();
StatsdStats::getInstance().setCurrentUidMapMemory(mBytesUsed);
StatsdStats::getInstance().setUidMapChanges(mOutput.changes_size());
ensureBytesUsedBelowLimit();
auto range = mMap.equal_range(int(uid));
bool found = false;
@@ -222,9 +222,9 @@ void UidMap::removeApp(const int64_t& timestamp, const String16& app_16, const i
log->set_app(app);
log->set_uid(uid);
mBytesUsed += log->ByteSize();
ensureBytesUsedBelowLimit();
StatsdStats::getInstance().setCurrentUidMapMemory(mBytesUsed);
StatsdStats::getInstance().setUidMapChanges(mOutput.changes_size());
ensureBytesUsedBelowLimit();
auto range = mMap.equal_range(int(uid));
for (auto it = range.first; it != range.second; ++it) {

4
cmds/statsd/src/packages/UidMap.h
View File

@@ -152,9 +152,9 @@ private:
// until the memory consumed by mOutput is below the specified limit.
void ensureBytesUsedBelowLimit();
// Override used for testing the max memory allowed by uid map. -1 means we use the value
// Override used for testing the max memory allowed by uid map. 0 means we use the value
// specified in StatsdStats.h with the rest of the guardrails.
size_t maxBytesOverride = -1;
size_t maxBytesOverride = 0;
// Cache the size of mOutput;
size_t mBytesUsed;