be0f4abfaf
rprichard@ pointed out a bug where LogBufferElement::setDropped() reallocates mMsg to the size of mMsgLen in the case where getTag() != 0. However, mMsgLen is in a union with mDroppedCount and mDroppedCount is the value used when a message is already dropped. Therefore, it's possible that logd uses the wrong value and allocates much more memory than intended. We do call setDropped() on elements that have already been dropped in LogBufferElementLast::coalesce(), so this is not a superfluous issue. To simplify this even more, this code puts an mTag in a union with mMsg, such that if mDropped is true, there will never be an allocated message; mTag will be directly referred to instead. This also reduces the number of allocations needed very slightly. Test: logd/liblog/logcat unit tests. Change-Id: Ia1bfba076439fe31c745a243283d41902bca45ac
103 lines
3 KiB
C++
103 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_ELEMENT_H__
|
|
#define _LOGD_LOG_BUFFER_ELEMENT_H__
|
|
|
|
#include <stdatomic.h>
|
|
#include <stdint.h>
|
|
#include <stdlib.h>
|
|
#include <sys/types.h>
|
|
|
|
#include <log/log.h>
|
|
#include <sysutils/SocketClient.h>
|
|
|
|
class LogBuffer;
|
|
|
|
#define EXPIRE_HOUR_THRESHOLD 24 // Only expire chatty UID logs to preserve
|
|
// non-chatty UIDs less than this age in hours
|
|
#define EXPIRE_THRESHOLD 10 // A smaller expire count is considered too
|
|
// chatty for the temporal expire messages
|
|
#define EXPIRE_RATELIMIT 10 // maximum rate in seconds to report expiration
|
|
|
|
class __attribute__((packed)) LogBufferElement {
|
|
friend LogBuffer;
|
|
|
|
// sized to match reality of incoming log packets
|
|
const uint32_t mUid;
|
|
const uint32_t mPid;
|
|
const uint32_t mTid;
|
|
log_time mRealTime;
|
|
union {
|
|
char* mMsg; // mDropped == false
|
|
int32_t mTag; // mDropped == true
|
|
};
|
|
union {
|
|
const uint16_t mMsgLen; // mDropped == false
|
|
uint16_t mDroppedCount; // mDropped == true
|
|
};
|
|
const uint8_t mLogId;
|
|
bool mDropped;
|
|
|
|
static atomic_int_fast64_t sequence;
|
|
|
|
// assumption: mDropped == true
|
|
size_t populateDroppedMessage(char*& buffer, LogBuffer* parent,
|
|
bool lastSame);
|
|
|
|
public:
|
|
LogBufferElement(log_id_t log_id, log_time realtime, uid_t uid, pid_t pid,
|
|
pid_t tid, const char* msg, uint16_t len);
|
|
LogBufferElement(const LogBufferElement& elem);
|
|
~LogBufferElement();
|
|
|
|
bool isBinary(void) const {
|
|
return (mLogId == LOG_ID_EVENTS) || (mLogId == LOG_ID_SECURITY);
|
|
}
|
|
|
|
log_id_t getLogId() const {
|
|
return static_cast<log_id_t>(mLogId);
|
|
}
|
|
uid_t getUid(void) const {
|
|
return mUid;
|
|
}
|
|
pid_t getPid(void) const {
|
|
return mPid;
|
|
}
|
|
pid_t getTid(void) const {
|
|
return mTid;
|
|
}
|
|
uint32_t getTag() const;
|
|
uint16_t getDropped(void) const {
|
|
return mDropped ? mDroppedCount : 0;
|
|
}
|
|
uint16_t setDropped(uint16_t value);
|
|
uint16_t getMsgLen() const {
|
|
return mDropped ? 0 : mMsgLen;
|
|
}
|
|
const char* getMsg() const {
|
|
return mDropped ? nullptr : mMsg;
|
|
}
|
|
log_time getRealTime(void) const {
|
|
return mRealTime;
|
|
}
|
|
|
|
static const log_time FLUSH_ERROR;
|
|
log_time flushTo(SocketClient* writer, LogBuffer* parent, bool privileged,
|
|
bool lastSame);
|
|
};
|
|
|
|
#endif
|