4ee37bc91e
(cherry pick from commit 831aa29730)
With part deux we caused an apparent regression by not checking for
stale recorded iterators. This checking was on-purpose bypassesed
when leading prune entries were to be deleted without touching the
statistics engine due to an in-place merge.
Part deux had us leaving iterators we were not focussed on untouched
which in turn because they were left behind, had a much higher
likelihood of being deleted without touching the statistics engine.
Perform the check every delete.
Bug: 23789348
Bug: 23490267
Change-Id: Idc6cc23d1f9e3b6cd9a083139a0de59479fbfe08
94 lines
3 KiB
C++
94 lines
3 KiB
C++
/*
|
|
* Copyright (C) 2012-2014 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_BUFFER_H__
|
|
#define _LOGD_LOG_BUFFER_H__
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <list>
|
|
|
|
#include <log/log.h>
|
|
#include <sysutils/SocketClient.h>
|
|
|
|
#include <private/android_filesystem_config.h>
|
|
|
|
#include "LogBufferElement.h"
|
|
#include "LogTimes.h"
|
|
#include "LogStatistics.h"
|
|
#include "LogWhiteBlackList.h"
|
|
|
|
typedef std::list<LogBufferElement *> LogBufferElementCollection;
|
|
|
|
class LogBuffer {
|
|
LogBufferElementCollection mLogElements;
|
|
pthread_mutex_t mLogElementsLock;
|
|
|
|
LogStatistics stats;
|
|
|
|
PruneList mPrune;
|
|
// watermark of any worst/chatty uid processing
|
|
typedef std::unordered_map<uid_t,
|
|
LogBufferElementCollection::iterator>
|
|
LogBufferIteratorMap;
|
|
LogBufferIteratorMap mLastWorstUid[LOG_ID_MAX];
|
|
|
|
unsigned long mMaxSize[LOG_ID_MAX];
|
|
|
|
public:
|
|
LastLogTimes &mTimes;
|
|
|
|
LogBuffer(LastLogTimes *times);
|
|
void init();
|
|
|
|
int log(log_id_t log_id, log_time realtime,
|
|
uid_t uid, pid_t pid, pid_t tid,
|
|
const char *msg, unsigned short len);
|
|
uint64_t flushTo(SocketClient *writer, const uint64_t start,
|
|
bool privileged,
|
|
int (*filter)(const LogBufferElement *element, void *arg) = NULL,
|
|
void *arg = NULL);
|
|
|
|
void clear(log_id_t id, uid_t uid = AID_ROOT);
|
|
unsigned long getSize(log_id_t id);
|
|
int setSize(log_id_t id, unsigned long size);
|
|
unsigned long getSizeUsed(log_id_t id);
|
|
// *strp uses malloc, use free to release.
|
|
void formatStatistics(char **strp, uid_t uid, unsigned int logMask);
|
|
|
|
void enableStatistics() {
|
|
stats.enableStatistics();
|
|
}
|
|
|
|
int initPrune(char *cp) { return mPrune.init(cp); }
|
|
// *strp uses malloc, use free to release.
|
|
void formatPrune(char **strp) { mPrune.format(strp); }
|
|
|
|
// helper must be protected directly or implicitly by lock()/unlock()
|
|
char *pidToName(pid_t pid) { return stats.pidToName(pid); }
|
|
uid_t pidToUid(pid_t pid) { return stats.pidToUid(pid); }
|
|
char *uidToName(uid_t uid) { return stats.uidToName(uid); }
|
|
void lock() { pthread_mutex_lock(&mLogElementsLock); }
|
|
void unlock() { pthread_mutex_unlock(&mLogElementsLock); }
|
|
|
|
private:
|
|
void maybePrune(log_id_t id);
|
|
void prune(log_id_t id, unsigned long pruneRows, uid_t uid = AID_ROOT);
|
|
LogBufferElementCollection::iterator erase(
|
|
LogBufferElementCollection::iterator it, bool engageStats = true);
|
|
};
|
|
|
|
#endif // _LOGD_LOG_BUFFER_H__
|