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

am d8ab8fc7: Merge "logd: persistent reader threads" 

* commit 'd8ab8fc71c986e49a2608d77aacb3d152d175a72':
  logd: persistent reader threads
This commit is contained in:
Mark Salyzyn 2014-08-12 19:04:54 +00:00 committed by Android Git Automerger
parent af83392e5a d8ab8fc71c
commit e4ec1e94ed
2 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
logd/LogTimes.cpp
View File

@ -33,7 +33,6 @@ LogTimeEntry::LogTimeEntry(LogReader &reader, SocketClient *client,
, mRelease(false)
, mError(false)
, threadRunning(false)
, threadTriggered(true)
, mReader(reader)
, mLogMask(logMask)
, mPid(pid)
@ -45,7 +44,9 @@ LogTimeEntry::LogTimeEntry(LogReader &reader, SocketClient *client,
, mStart(start)
, mNonBlock(nonBlock)
, mEnd(CLOCK_MONOTONIC)
{ }
{
pthread_cond_init(&threadTriggeredCondition, NULL);
}
void LogTimeEntry::startReader_Locked(void) {
pthread_attr_t attr;
@ -74,7 +75,6 @@ void LogTimeEntry::threadStop(void *obj) {
lock();
me->threadRunning = false;
if (me->mNonBlock) {
me->error_Locked();
}
@ -103,6 +103,7 @@ void LogTimeEntry::threadStop(void *obj) {
client->decRef();
}
me->threadRunning = false;
me->decRef_Locked();
unlock();
@ -118,7 +119,7 @@ void *LogTimeEntry::threadStart(void *obj) {
SocketClient *client = me->mClient;
if (!client) {
me->error();
pthread_exit(NULL);
return NULL;
}
LogBuffer &logbuf = me->mReader.logbuf();
@ -127,12 +128,7 @@ void *LogTimeEntry::threadStart(void *obj) {
lock();
me->threadTriggered = true;
while(me->threadTriggered && !me->isError_Locked()) {
me->threadTriggered = false;
while (me->threadRunning && !me->isError_Locked()) {
log_time start = me->mStart;
unlock();
@ -142,24 +138,21 @@ void *LogTimeEntry::threadStart(void *obj) {
}
start = logbuf.flushTo(client, start, privileged, FilterSecondPass, me);
lock();
if (start == LogBufferElement::FLUSH_ERROR) {
me->error();
me->error_Locked();
}
if (me->mNonBlock) {
lock();
if (me->mNonBlock || !me->threadRunning || me->isError_Locked()) {
break;
}
sched_yield();
lock();
pthread_cond_wait(&me->threadTriggeredCondition, &timesLock);
}
unlock();
pthread_exit(NULL);
pthread_cleanup_pop(true);
return NULL;

10
logd/LogTimes.h
View File

@ -31,7 +31,7 @@ class LogTimeEntry {
bool mRelease;
bool mError;
bool threadRunning;
bool threadTriggered;
pthread_cond_t threadTriggeredCondition;
pthread_t mThread;
LogReader &mReader;
static void *threadStart(void *me);
@ -63,12 +63,16 @@ public:
bool runningReader_Locked(void) const {
return threadRunning || mRelease || mError || mNonBlock;
}
void triggerReader_Locked(void) { threadTriggered = true; }
void triggerReader_Locked(void) {
pthread_cond_signal(&threadTriggeredCondition);
}
void triggerSkip_Locked(unsigned int skip) { skipAhead = skip; }
// Called after LogTimeEntry removed from list, lock implicitly held
void release_Locked(void) {
mRelease = true;
pthread_cond_signal(&threadTriggeredCondition);
if (mRefCount || threadRunning) {
return;
}
@ -78,7 +82,7 @@ public:
// Called to mark socket in jeopardy
void error_Locked(void) { mError = true; }
void error(void) { lock(); mError = true; unlock(); }
void error(void) { lock(); error_Locked(); unlock(); }
bool isError_Locked(void) const { return mRelease || mError; }