804e7d8c4f
- Zero initialize log_time instances by default - Disable implicit conversions by making constructors explicit - Explicitly initialize to EPOCH in most places - Change sniffTime() to avoid in-place modification of a log_time I stopped here, but we could consider following up with a more invasive change to make log_time instances immutable and perhaps also remove the default constructor to force explicit initialization to EPOCH. Test: atest libbase_test netd_unit_test Change-Id: I67e716ef74adaaf40ab2c6e2e0dddb8d309bc7ca
64 lines
2 KiB
C++
64 lines
2 KiB
C++
/*
|
|
* Copyright (C) 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_KLOG_H__
|
|
#define _LOGD_LOG_KLOG_H__
|
|
|
|
#include <private/android_logger.h>
|
|
#include <sysutils/SocketListener.h>
|
|
|
|
class LogBuffer;
|
|
class LogReader;
|
|
|
|
class LogKlog : public SocketListener {
|
|
LogBuffer* logbuf;
|
|
LogReader* reader;
|
|
const log_time signature;
|
|
// Set once thread is started, separates KLOG_ACTION_READ_ALL
|
|
// and KLOG_ACTION_READ phases.
|
|
bool initialized;
|
|
// Used during each of the above phases to control logging.
|
|
bool enableLogging;
|
|
// set if we are also running auditd, to filter out audit reports from
|
|
// our copy of the kernel log
|
|
bool auditd;
|
|
|
|
static log_time correction;
|
|
|
|
public:
|
|
LogKlog(LogBuffer* buf, LogReader* reader, int fdWrite, int fdRead,
|
|
bool auditd);
|
|
int log(const char* buf, ssize_t len);
|
|
void synchronize(const char* buf, ssize_t len);
|
|
|
|
bool isMonotonic() {
|
|
return logbuf->isMonotonic();
|
|
}
|
|
static void convertMonotonicToReal(log_time& real) {
|
|
real += correction;
|
|
}
|
|
static void convertRealToMonotonic(log_time& real) {
|
|
real -= correction;
|
|
}
|
|
|
|
protected:
|
|
log_time sniffTime(const char*& buf, ssize_t len, bool reverse);
|
|
pid_t sniffPid(const char*& buf, ssize_t len);
|
|
void calculateCorrection(const log_time& monotonic, const char* real_string, ssize_t len);
|
|
virtual bool onDataAvailable(SocketClient* cli);
|
|
};
|
|
|
|
#endif
|