68630a0dbe
There's still plenty of work that can be done here, particularly re-doing the locking so each LogReaderThread does not mutually exclude the others, but that's out of the scope here. This change primarily removes the public 'mTimes' from LogBuffer and creates a new LogReaderList class instead. It would have merged this into LogReader, but that creates a circular dependency. This change also removes the need to reference LogReader or LogReaderList from LogAudit, LogKLog, and LogListener, instead relying on LogBuffer()::log() to call LogReaderList::NotifyNewLog(). Test: logging unit tests Change-Id: Ia874b57a9ec1254af1295bfa6f7af2f92a75755b
44 lines
1.2 KiB
C++
44 lines
1.2 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.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <sysutils/SocketListener.h>
|
|
|
|
#include "LogReaderList.h"
|
|
#include "LogReaderThread.h"
|
|
|
|
#define LOGD_SNDTIMEO 32
|
|
|
|
class LogBuffer;
|
|
|
|
class LogReader : public SocketListener {
|
|
public:
|
|
explicit LogReader(LogBuffer* logbuf, LogReaderList* reader_list);
|
|
|
|
LogBuffer* log_buffer() const { return log_buffer_; }
|
|
|
|
protected:
|
|
virtual bool onDataAvailable(SocketClient* cli);
|
|
|
|
private:
|
|
static int getLogSocket();
|
|
|
|
void doSocketDelete(SocketClient* cli);
|
|
|
|
LogBuffer* log_buffer_;
|
|
LogReaderList* reader_list_;
|
|
};
|