4f22786cc9
LogTimeEntry's lifecycle is spread out in various locations. It further seems incomplete as there is logic that assumes that its associated thread can exit while the underlying LogTimeEntry remains valid, however it doesn't appear that that is actually a supported situation. This change simplifies this logic to have only one valid state for a LogTimeEntry: it must have its thread running and be present in LastLogTimes. A LogTimeEntry will never be placed into LastLogTimes unless its thread is running and its thread will remove its associated LogTimeEntry from LastLogTimes before it has exited. This admittedly breaks situations where a blocking socket gets issued multiple commands with different pid filters, tail lines, etc, however, I'm reasonably sure that these situations were already broken. A check is added to close the socket in this case. Test: multiple logcat instances work, logd.reader.per's are cleaned up Change-Id: Ibe8651e7d530c5e9a8d6ce3150cd247982887cbe
43 lines
1.2 KiB
C++
43 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.
|
|
*/
|
|
#ifndef _FLUSH_COMMAND_H
|
|
#define _FLUSH_COMMAND_H
|
|
|
|
#include <private/android_logger.h>
|
|
#include <sysutils/SocketClientCommand.h>
|
|
|
|
class LogBufferElement;
|
|
|
|
#include "LogTimes.h"
|
|
|
|
class LogReader;
|
|
|
|
class FlushCommand : public SocketClientCommand {
|
|
LogReader& mReader;
|
|
log_mask_t mLogMask;
|
|
|
|
public:
|
|
explicit FlushCommand(LogReader& reader, log_mask_t logMask)
|
|
: mReader(reader), mLogMask(logMask) {
|
|
}
|
|
|
|
virtual void runSocketCommand(SocketClient* client);
|
|
|
|
static bool hasReadLogs(SocketClient* client);
|
|
static bool hasSecurityLogs(SocketClient* client);
|
|
};
|
|
|
|
#endif
|