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
151 lines
4.1 KiB
C++
Executable file
151 lines
4.1 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 _LOGD_LOG_TIMES_H__
|
|
#define _LOGD_LOG_TIMES_H__
|
|
|
|
#include <pthread.h>
|
|
#include <sys/types.h>
|
|
#include <time.h>
|
|
|
|
#include <list>
|
|
|
|
#include <log/log.h>
|
|
#include <sysutils/SocketClient.h>
|
|
|
|
typedef unsigned int log_mask_t;
|
|
|
|
class LogReader;
|
|
class LogBufferElement;
|
|
|
|
class LogTimeEntry {
|
|
static pthread_mutex_t timesLock;
|
|
unsigned int mRefCount;
|
|
bool mRelease;
|
|
bool mError;
|
|
bool threadRunning;
|
|
bool leadingDropped;
|
|
pthread_cond_t threadTriggeredCondition;
|
|
pthread_t mThread;
|
|
LogReader& mReader;
|
|
static void* threadStart(void* me);
|
|
static void threadStop(void* me);
|
|
const log_mask_t mLogMask;
|
|
const pid_t mPid;
|
|
unsigned int skipAhead[LOG_ID_MAX];
|
|
pid_t mLastTid[LOG_ID_MAX];
|
|
unsigned long mCount;
|
|
unsigned long mTail;
|
|
unsigned long mIndex;
|
|
|
|
public:
|
|
LogTimeEntry(LogReader& reader, SocketClient* client, bool nonBlock,
|
|
unsigned long tail, log_mask_t logMask, pid_t pid,
|
|
log_time start, uint64_t timeout);
|
|
|
|
SocketClient* mClient;
|
|
log_time mStart;
|
|
struct timespec mTimeout;
|
|
const bool mNonBlock;
|
|
const log_time mEnd; // only relevant if mNonBlock
|
|
|
|
// Protect List manipulations
|
|
static void wrlock(void) {
|
|
pthread_mutex_lock(×Lock);
|
|
}
|
|
static void rdlock(void) {
|
|
pthread_mutex_lock(×Lock);
|
|
}
|
|
static void unlock(void) {
|
|
pthread_mutex_unlock(×Lock);
|
|
}
|
|
|
|
void startReader_Locked(void);
|
|
|
|
bool runningReader_Locked(void) const {
|
|
return threadRunning || mRelease || mError || mNonBlock;
|
|
}
|
|
void triggerReader_Locked(void) {
|
|
pthread_cond_signal(&threadTriggeredCondition);
|
|
}
|
|
|
|
void triggerSkip_Locked(log_id_t id, unsigned int skip) {
|
|
skipAhead[id] = skip;
|
|
}
|
|
void cleanSkip_Locked(void);
|
|
|
|
// These called after LogTimeEntry removed from list, lock implicitly held
|
|
void release_nodelete_Locked(void) {
|
|
mRelease = true;
|
|
pthread_cond_signal(&threadTriggeredCondition);
|
|
// assumes caller code path will call decRef_Locked()
|
|
}
|
|
|
|
void release_Locked(void) {
|
|
mRelease = true;
|
|
pthread_cond_signal(&threadTriggeredCondition);
|
|
if (mRefCount || threadRunning) {
|
|
return;
|
|
}
|
|
// No one else is holding a reference to this
|
|
delete this;
|
|
}
|
|
|
|
// Called to mark socket in jeopardy
|
|
void error_Locked(void) {
|
|
mError = true;
|
|
}
|
|
void error(void) {
|
|
wrlock();
|
|
error_Locked();
|
|
unlock();
|
|
}
|
|
|
|
bool isError_Locked(void) const {
|
|
return mRelease || mError;
|
|
}
|
|
|
|
// Mark Used
|
|
// Locking implied, grabbed when protection around loop iteration
|
|
void incRef_Locked(void) {
|
|
++mRefCount;
|
|
}
|
|
|
|
bool owned_Locked(void) const {
|
|
return mRefCount != 0;
|
|
}
|
|
|
|
void decRef_Locked(void) {
|
|
if ((mRefCount && --mRefCount) || !mRelease || threadRunning) {
|
|
return;
|
|
}
|
|
// No one else is holding a reference to this
|
|
delete this;
|
|
}
|
|
bool isWatching(log_id_t id) const {
|
|
return mLogMask & (1 << id);
|
|
}
|
|
bool isWatchingMultiple(log_mask_t logMask) const {
|
|
return mLogMask & logMask;
|
|
}
|
|
// flushTo filter callbacks
|
|
static int FilterFirstPass(const LogBufferElement* element, void* me);
|
|
static int FilterSecondPass(const LogBufferElement* element, void* me);
|
|
};
|
|
|
|
typedef std::list<LogTimeEntry*> LastLogTimes;
|
|
|
|
#endif // _LOGD_LOG_TIMES_H__
|