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

Merge "Better error message for missing page reads." into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-03-08 21:27:53 +00:00
committed by Android (Google) Code Review
parent e15c6dd81a 7620bcb54c
commit e32ebc9312
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/core/jni/com_android_server_pm_PackageManagerShellCommandDataLoader.cpp
View File

@@ -643,7 +643,7 @@ private:
}
TracedRead last = {};
auto lastSerialNo = mLastSerialNo;
auto lastSerialNo = mLastSerialNo < 0 ? pageReads[0].serialNo : mLastSerialNo;
for (auto&& read : pageReads) {
const auto expectedSerialNo = lastSerialNo + last.count;
#ifdef VERBOSE_READ_LOGS
@@ -676,8 +676,7 @@ private:
// Second, report missing reads, if any.
if (read.serialNo != expectedSerialNo) {
const auto readsMissing = read.serialNo - expectedSerialNo;
traceMissingReads(readsMissing);
traceMissingReads(expectedSerialNo, read.serialNo);
}
last = TracedRead{
@@ -721,9 +720,13 @@ private:
ATRACE_END();
}
void traceMissingReads(int64_t count) {
const auto trace = android::base::StringPrintf("missing_page_reads: count=%lld",
static_cast<long long>(count));
void traceMissingReads(int64_t expectedSerialNo, int64_t readSerialNo) {
const auto readsMissing = readSerialNo - expectedSerialNo;
const auto trace =
android::base::StringPrintf("missing_page_reads: count=%lld, range [%lld,%lld)",
static_cast<long long>(readsMissing),
static_cast<long long>(expectedSerialNo),
static_cast<long long>(readSerialNo));
ATRACE_BEGIN(trace.c_str());
ATRACE_END();
}
@@ -874,7 +877,7 @@ private:
std::atomic<bool> mStopReceiving = false;
std::atomic<bool> mReadLogsEnabled = false;
std::chrono::milliseconds mWaitOnEofInterval{WaitOnEofMinInterval};
int64_t mLastSerialNo{1};
int64_t mLastSerialNo{-1};
/** Tracks which files have been requested */
std::unordered_set<FileIdx> mRequestedFiles;
};