Merge changes from topic 'logcatd -L' into oc-dev (c155fbed) · Commits · e / os / android_system_core

logcat/Android.mk

+10 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,16 @@ include $(BUILD_EXECUTABLE)

		include $(CLEAR_VARS)

		LOCAL_MODULE := logcatd
		LOCAL_MODULE_TAGS := debug
		LOCAL_SRC_FILES := logcatd_main.cpp event.logtags
		LOCAL_SHARED_LIBRARIES := liblogcat $(logcatLibs)
		LOCAL_CFLAGS := -Werror

		include $(BUILD_EXECUTABLE)

		include $(CLEAR_VARS)

		LOCAL_MODULE := liblogcat
		LOCAL_SRC_FILES := logcat.cpp getopt_long.cpp logcat_system.cpp
		LOCAL_SHARED_LIBRARIES := $(logcatLibs)

logcat/logcat.cpp

+8 −3

Original line number	Diff line number	Diff line
		@@ -882,6 +882,7 @@ static int __logcat(android_logcat_context_internal* context) {
		{ "grep", required_argument, nullptr, 'e' },
		// hidden and undocumented reserved alias for --max-count
		{ "head", required_argument, nullptr, 'm' },
		{ "help", no_argument, nullptr, 'h' },
		{ id_str, required_argument, nullptr, 0 },
		{ "last", no_argument, nullptr, 'L' },
		{ "max-count", required_argument, nullptr, 'm' },
		@@ -900,9 +901,8 @@ static int __logcat(android_logcat_context_internal* context) {
		};
		// clang-format on

		ret = getopt_long_r(argc, argv,
		":cdDLt:T:gG:sQf:r:n:v:b:BSpP:m:e:", long_options,
		&option_index, &optctx);
		ret = getopt_long_r(argc, argv, ":cdDhLt:T:gG:sQf:r:n:v:b:BSpP:m:e:",
		long_options, &option_index, &optctx);
		if (ret < 0) break;

		switch (ret) {
		@@ -1304,6 +1304,11 @@ static int __logcat(android_logcat_context_internal* context) {
		"Option -%c needs an argument\n", optctx.optopt);
		goto exit;

		case 'h':
		show_help(context);
		show_format_help(context);
		goto exit;

		default:
		logcat_panic(context, HELP_TRUE, "Unrecognized Option %c\n",
		optctx.optopt);

logcat/logcatd.rc

+1 −4

Original line number	Diff line number	Diff line
		@@ -34,9 +34,6 @@ on load_persist_props_action
		on property:logd.logpersistd.enable=true && property:logd.logpersistd=logcatd
		# all exec/services are called with umask(077), so no gain beyond 0700
		mkdir /data/misc/logd 0700 logd log
		# logd for write to /data/misc/logd, log group for read from pstore (-L)
		# b/28788401 b/30041146 b/30612424
		# exec - logd log -- /system/bin/logcat -L -b ${logd.logpersistd.buffer:-all} -v threadtime -v usec -v printable -D -f /data/misc/logd/logcat -r 1024 -n ${logd.logpersistd.size:-256} --id=${ro.build.id}
		start logcatd

		# stop logcatd service and clear data
		@@ -57,7 +54,7 @@ on property:logd.logpersistd.enable=false
		stop logcatd

		# logcatd service
		service logcatd /system/bin/logcat -b ${logd.logpersistd.buffer:-all} -v threadtime -v usec -v printable -D -f /data/misc/logd/logcat -r 1024 -n ${logd.logpersistd.size:-256} --id=${ro.build.id}
		service logcatd /system/bin/logcatd -L -b ${logd.logpersistd.buffer:-all} -v threadtime -v usec -v printable -D -f /data/misc/logd/logcat -r 1024 -n ${logd.logpersistd.size:-256} --id=${ro.build.id}
		class late_start
		disabled
		# logd for write to /data/misc/logd, log group for read from log daemon

logcat/logcatd_main.cpp

0 → 100644

+71 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 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 <signal.h>
		#include <stdlib.h>
		#include <string.h>

		#include <string>
		#include <vector>

		#include <log/logcat.h>

		int main(int argc, char argv, char envp) {
		android_logcat_context ctx = create_android_logcat();
		if (!ctx) return -1;

		signal(SIGPIPE, exit);

		// Save and detect presence of -L or --last flag
		std::vector<std::string> args;
		bool last = false;
		for (int i = 0; i < argc; ++i) {
		if (!argv[i]) continue;
		args.push_back(std::string(argv[i]));
		if (!strcmp(argv[i], "-L") \|\| !strcmp(argv[i], "--last")) last = true;
		}

		// Generate argv from saved content
		std::vector<const char*> argv_hold;
		for (auto& str : args) argv_hold.push_back(str.c_str());
		argv_hold.push_back(nullptr);

		int ret = 0;
		if (last) {
		// Run logcat command with -L flag
		ret = android_logcat_run_command(ctx, -1, -1, argv_hold.size() - 1,
		(char* const*)&argv_hold[0], envp);
		// Remove -L and --last flags from argument list
		for (std::vector<const char*>::iterator it = argv_hold.begin();
		it != argv_hold.end();) {
		if (!it \|\| (strcmp(it, "-L") && strcmp(*it, "--last"))) {
		++it;
		} else {
		it = argv_hold.erase(it);
		}
		}
		// fall through to re-run the command regardless of the arguments
		// passed in. For instance, we expect -h to report help stutter.
		}

		// Run logcat command without -L flag
		int retval = android_logcat_run_command(ctx, -1, -1, argv_hold.size() - 1,
		(char* const*)&argv_hold[0], envp);
		if (!ret) ret = retval;
		retval = android_logcat_destroy(&ctx);
		if (!ret) ret = retval;
		return ret;
		}

logcat/tests/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@ include $(BUILD_NATIVE_BENCHMARK)

		test_src_files := \
		logcat_test.cpp \
		logcatd_test.cpp \
		liblogcat_test.cpp \

		# Build tests for the device (with .so). Run with: