f6e2296953
logd suffers performance degradation when multiple blocking
readers connect to it. Each time when the writer thread log
new entries, all of the readers are notified regardless of
which log id they are watching.
In this case, only give notification to the readers who are
actually watching new entries' log id. This decreases logd
CPU consumption by skipping unnecessary LogBuffer::flushTo
loops.
Test: liblog-unit-tests, logd-unit-tests & CtsLiblogTestCases
logcat-unit-tests
Test: manual:
1.'logcat –b all' at constant heavy logging load level
2.simultaneously 'logcat –b crash' in another session,
a healthy crash buffer usually keep empty
3.logd CPU consumption doesn't increase after step 2
Change-Id: I4ffc045c9feb7a0998f7e47ae2173f8f6aa28e8a
68 lines
1.9 KiB
C++
Executable file
68 lines
1.9 KiB
C++
Executable file
/*
|
|
* Copyright (C) 2012-2013 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
#ifndef _FLUSH_COMMAND_H
|
|
#define _FLUSH_COMMAND_H
|
|
|
|
#include <private/android_logger.h>
|
|
#include <sysutils/SocketClientCommand.h>
|
|
|
|
class LogBufferElement;
|
|
|
|
#include "LogTimes.h"
|
|
|
|
class LogReader;
|
|
|
|
class FlushCommand : public SocketClientCommand {
|
|
LogReader& mReader;
|
|
bool mNonBlock;
|
|
unsigned long mTail;
|
|
log_mask_t mLogMask;
|
|
pid_t mPid;
|
|
log_time mStart;
|
|
uint64_t mTimeout;
|
|
|
|
public:
|
|
// for opening a reader
|
|
explicit FlushCommand(LogReader& reader, bool nonBlock, unsigned long tail,
|
|
log_mask_t logMask, pid_t pid, log_time start,
|
|
uint64_t timeout)
|
|
: mReader(reader),
|
|
mNonBlock(nonBlock),
|
|
mTail(tail),
|
|
mLogMask(logMask),
|
|
mPid(pid),
|
|
mStart(start),
|
|
mTimeout((start != log_time::EPOCH) ? timeout : 0) {
|
|
}
|
|
|
|
// for notification of an update
|
|
explicit FlushCommand(LogReader& reader, log_mask_t logMask)
|
|
: mReader(reader),
|
|
mNonBlock(false),
|
|
mTail(-1),
|
|
mLogMask(logMask),
|
|
mPid(0),
|
|
mStart(log_time::EPOCH),
|
|
mTimeout(0) {
|
|
}
|
|
|
|
virtual void runSocketCommand(SocketClient* client);
|
|
|
|
static bool hasReadLogs(SocketClient* client);
|
|
static bool hasSecurityLogs(SocketClient* client);
|
|
};
|
|
|
|
#endif
|