b6bee33182
if ro.logd.timestamp or persist.logd.timestamp are set to the value monotonic then liblog writer, liblog printing and logd all switch to recording/printing monotonic time rather than realtime. If reinit detects a change for presist.logd.timestamp, correct the older entry timestamps in place. ToDo: A corner case condition where new log entries in monotonic time occur before logd reinit detects persist.logd.timestamp, there will be a few out-of-order entries, but with accurate timestamps. This problem does not happen for ro.logd.timestamp as it is set before logd starts. NB: This offers a nano second time accuracy on all log entries that may be more suitable for merging with other system activities, such as systrace, that also use monotonic time. This feature is for debugging. Bug: 23668800 Change-Id: Iee6dab7140061b1a6627254921411f61b01aa5c2
201 lines
6 KiB
C++
201 lines
6 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.
|
|
*/
|
|
|
|
#include <ctype.h>
|
|
#include <poll.h>
|
|
#include <sys/prctl.h>
|
|
#include <sys/socket.h>
|
|
|
|
#include <cutils/sockets.h>
|
|
|
|
#include "LogReader.h"
|
|
#include "FlushCommand.h"
|
|
|
|
LogReader::LogReader(LogBuffer *logbuf) :
|
|
SocketListener(getLogSocket(), true),
|
|
mLogbuf(*logbuf) {
|
|
}
|
|
|
|
// When we are notified a new log entry is available, inform
|
|
// all of our listening sockets.
|
|
void LogReader::notifyNewLog() {
|
|
FlushCommand command(*this);
|
|
runOnEachSocket(&command);
|
|
}
|
|
|
|
bool LogReader::onDataAvailable(SocketClient *cli) {
|
|
static bool name_set;
|
|
if (!name_set) {
|
|
prctl(PR_SET_NAME, "logd.reader");
|
|
name_set = true;
|
|
}
|
|
|
|
char buffer[255];
|
|
|
|
int len = read(cli->getSocket(), buffer, sizeof(buffer) - 1);
|
|
if (len <= 0) {
|
|
doSocketDelete(cli);
|
|
return false;
|
|
}
|
|
buffer[len] = '\0';
|
|
|
|
unsigned long tail = 0;
|
|
static const char _tail[] = " tail=";
|
|
char *cp = strstr(buffer, _tail);
|
|
if (cp) {
|
|
tail = atol(cp + sizeof(_tail) - 1);
|
|
}
|
|
|
|
log_time start(log_time::EPOCH);
|
|
static const char _start[] = " start=";
|
|
cp = strstr(buffer, _start);
|
|
if (cp) {
|
|
// Parse errors will result in current time
|
|
start.strptime(cp + sizeof(_start) - 1, "%s.%q");
|
|
}
|
|
|
|
unsigned int logMask = -1;
|
|
static const char _logIds[] = " lids=";
|
|
cp = strstr(buffer, _logIds);
|
|
if (cp) {
|
|
logMask = 0;
|
|
cp += sizeof(_logIds) - 1;
|
|
while (*cp && *cp != '\0') {
|
|
int val = 0;
|
|
while (isdigit(*cp)) {
|
|
val = val * 10 + *cp - '0';
|
|
++cp;
|
|
}
|
|
logMask |= 1 << val;
|
|
if (*cp != ',') {
|
|
break;
|
|
}
|
|
++cp;
|
|
}
|
|
}
|
|
|
|
pid_t pid = 0;
|
|
static const char _pid[] = " pid=";
|
|
cp = strstr(buffer, _pid);
|
|
if (cp) {
|
|
pid = atol(cp + sizeof(_pid) - 1);
|
|
}
|
|
|
|
bool nonBlock = false;
|
|
if (!fast<strncmp>(buffer, "dumpAndClose", 12)) {
|
|
// Allow writer to get some cycles, and wait for pending notifications
|
|
sched_yield();
|
|
LogTimeEntry::lock();
|
|
LogTimeEntry::unlock();
|
|
sched_yield();
|
|
nonBlock = true;
|
|
}
|
|
|
|
uint64_t sequence = 1;
|
|
// Convert realtime to sequence number
|
|
if (start != log_time::EPOCH) {
|
|
class LogFindStart {
|
|
const pid_t mPid;
|
|
const unsigned mLogMask;
|
|
bool startTimeSet;
|
|
log_time &start;
|
|
uint64_t &sequence;
|
|
uint64_t last;
|
|
bool isMonotonic;
|
|
|
|
public:
|
|
LogFindStart(unsigned logMask, pid_t pid, log_time &start, uint64_t &sequence, bool isMonotonic) :
|
|
mPid(pid),
|
|
mLogMask(logMask),
|
|
startTimeSet(false),
|
|
start(start),
|
|
sequence(sequence),
|
|
last(sequence),
|
|
isMonotonic(isMonotonic) {
|
|
}
|
|
|
|
static int callback(const LogBufferElement *element, void *obj) {
|
|
LogFindStart *me = reinterpret_cast<LogFindStart *>(obj);
|
|
if ((!me->mPid || (me->mPid == element->getPid()))
|
|
&& (me->mLogMask & (1 << element->getLogId()))) {
|
|
if (me->start == element->getRealTime()) {
|
|
me->sequence = element->getSequence();
|
|
me->startTimeSet = true;
|
|
return -1;
|
|
} else if (!me->isMonotonic ||
|
|
android::isMonotonic(element->getRealTime())) {
|
|
if (me->start < element->getRealTime()) {
|
|
me->sequence = me->last;
|
|
me->startTimeSet = true;
|
|
return -1;
|
|
}
|
|
me->last = element->getSequence();
|
|
} else {
|
|
me->last = element->getSequence();
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
bool found() { return startTimeSet; }
|
|
} logFindStart(logMask, pid, start, sequence,
|
|
logbuf().isMonotonic() && android::isMonotonic(start));
|
|
|
|
logbuf().flushTo(cli, sequence, FlushCommand::hasReadLogs(cli),
|
|
logFindStart.callback, &logFindStart);
|
|
|
|
if (!logFindStart.found()) {
|
|
if (nonBlock) {
|
|
doSocketDelete(cli);
|
|
return false;
|
|
}
|
|
sequence = LogBufferElement::getCurrentSequence();
|
|
}
|
|
}
|
|
|
|
FlushCommand command(*this, nonBlock, tail, logMask, pid, sequence);
|
|
command.runSocketCommand(cli);
|
|
return true;
|
|
}
|
|
|
|
void LogReader::doSocketDelete(SocketClient *cli) {
|
|
LastLogTimes × = mLogbuf.mTimes;
|
|
LogTimeEntry::lock();
|
|
LastLogTimes::iterator it = times.begin();
|
|
while(it != times.end()) {
|
|
LogTimeEntry *entry = (*it);
|
|
if (entry->mClient == cli) {
|
|
times.erase(it);
|
|
entry->release_Locked();
|
|
break;
|
|
}
|
|
it++;
|
|
}
|
|
LogTimeEntry::unlock();
|
|
}
|
|
|
|
int LogReader::getLogSocket() {
|
|
static const char socketName[] = "logdr";
|
|
int sock = android_get_control_socket(socketName);
|
|
|
|
if (sock < 0) {
|
|
sock = socket_local_server(socketName,
|
|
ANDROID_SOCKET_NAMESPACE_RESERVED,
|
|
SOCK_SEQPACKET);
|
|
}
|
|
|
|
return sock;
|
|
}
|