4f22786cc9
LogTimeEntry's lifecycle is spread out in various locations. It further seems incomplete as there is logic that assumes that its associated thread can exit while the underlying LogTimeEntry remains valid, however it doesn't appear that that is actually a supported situation. This change simplifies this logic to have only one valid state for a LogTimeEntry: it must have its thread running and be present in LastLogTimes. A LogTimeEntry will never be placed into LastLogTimes unless its thread is running and its thread will remove its associated LogTimeEntry from LastLogTimes before it has exited. This admittedly breaks situations where a blocking socket gets issued multiple commands with different pid filters, tail lines, etc, however, I'm reasonably sure that these situations were already broken. A check is added to close the socket in this case. Test: multiple logcat instances work, logd.reader.per's are cleaned up Change-Id: Ibe8651e7d530c5e9a8d6ce3150cd247982887cbe
102 lines
2.8 KiB
C++
102 lines
2.8 KiB
C++
/*
|
|
* 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 <memory>
|
|
|
|
#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;
|
|
bool mRelease = false;
|
|
bool leadingDropped;
|
|
pthread_cond_t threadTriggeredCondition;
|
|
pthread_t mThread;
|
|
LogReader& mReader;
|
|
static void* threadStart(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);
|
|
}
|
|
|
|
bool startReader_Locked();
|
|
|
|
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);
|
|
|
|
void release_Locked(void) {
|
|
mRelease = true;
|
|
pthread_cond_signal(&threadTriggeredCondition);
|
|
}
|
|
|
|
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<std::unique_ptr<LogTimeEntry>> LastLogTimes;
|
|
|
|
#endif // _LOGD_LOG_TIMES_H__
|