openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge changes If992b53b,Ieab60fd1 am: 7c50033e9f am: 11b2dbca15 

am: 64bad84ece

Change-Id: I40d34ecce4a35fb8f50200c2b1ec45bd957f6bbf
This commit is contained in:
Mark Salyzyn 2016-07-15 22:45:02 +00:00 committed by android-build-merger
parent 5b080a2a16 64bad84ece
commit 866327f751
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
logd/LogBuffer.cpp
View File

@ -573,8 +573,8 @@ bool LogBuffer::prune(log_id_t id, unsigned long pruneRows, uid_t caller_uid) {
if ((worst == AID_SYSTEM) && mPrune.worstPidOfSystemEnabled()) {
// begin scope of PID sorted list
std::unique_ptr<const PidEntry *[]> sorted = stats.sort(
worst, (pid_t)0, 2, id, worst);
std::unique_ptr<const PidEntry *[]> sorted = stats.sortPids(
worst, (pid_t)0, 2, id);
if (sorted.get() && sorted[0] && sorted[1]) {
worstPid = sorted[0]->getKey();
second_worst_sizes = worst_sizes

4
logd/LogStatistics.h
View File

@ -455,8 +455,8 @@ public:
size_t len, log_id id) {
return uidTable[id].sort(uid, pid, len);
}
std::unique_ptr<const PidEntry *[]> sort(uid_t uid, pid_t pid,
size_t len, log_id id, uid_t) {
std::unique_ptr<const PidEntry *[]> sortPids(uid_t uid, pid_t pid,
size_t len, log_id id) {
return pidSystemTable[id].sort(uid, pid, len);
}

2
logd/main.cpp
View File

@ -212,7 +212,7 @@ bool property_get_bool(const char *key, int flag) {
}
static int fdDmesg = -1;
void inline android::prdebug(const char *fmt, ...) {
void android::prdebug(const char *fmt, ...) {
if (fdDmesg < 0) {
return;
}