Merge changes from topic 'lshal_debug' am: d4f5bb4c17 am: a7f366d411 am: cb0cb2f04e (3d485674) · Commits · e / os / android_frameworks_native-old

cmds/lshal/Android.bp

+40 −3

Original line number	Diff line number	Diff line
		@@ -12,8 +12,8 @@
		// See the License for the specific language governing permissions and
		// limitations under the License.

		cc_binary {
		name: "lshal",
		cc_library_shared {
		name: "liblshal",
		shared_libs: [
		"libbase",
		"libcutils",
		@@ -24,7 +24,44 @@ cc_binary {
		"libvintf",
		],
		srcs: [
		"DebugCommand.cpp",
		"Lshal.cpp",
		"PipeRelay.cpp"
		"ListCommand.cpp",
		"PipeRelay.cpp",
		"utils.cpp",
		],
		}

		cc_defaults {
		name: "lshal_defaults",
		shared_libs: [
		"libbase",
		"libhidlbase",
		"libhidltransport",
		"liblshal",
		"libutils",
		]
		}

		cc_binary {
		name: "lshal",
		defaults: ["lshal_defaults"],
		srcs: [
		"main.cpp"
		]
		}

		cc_test {
		name: "lshal_test",
		defaults: ["lshal_defaults"],
		gtest: true,
		static_libs: [
		"libgmock"
		],
		shared_libs: [
		"android.hardware.tests.baz@1.0"
		],
		srcs: [
		"test.cpp"
		]
		}

cmds/lshal/DebugCommand.cpp

0 → 100644

+54 −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 "DebugCommand.h"

		#include "Lshal.h"

		namespace android {
		namespace lshal {

		DebugCommand::DebugCommand(Lshal &lshal) : mLshal(lshal) {
		}

		Status DebugCommand::parseArgs(const std::string &command, const Arg &arg) {
		if (optind >= arg.argc) {
		mLshal.usage(command);
		return USAGE;
		}
		mInterfaceName = arg.argv[optind];
		++optind;
		for (; optind < arg.argc; ++optind) {
		mOptions.push_back(arg.argv[optind]);
		}
		return OK;
		}

		Status DebugCommand::main(const std::string &command, const Arg &arg) {
		Status status = parseArgs(command, arg);
		if (status != OK) {
		return status;
		}
		auto pair = splitFirst(mInterfaceName, '/');
		return mLshal.emitDebugInfo(
		pair.first, pair.second.empty() ? "default" : pair.second, mOptions,
		mLshal.out().buf(),
		mLshal.err());
		}

		} // namespace lshal
		} // namespace android

cmds/lshal/DebugCommand.h

0 → 100644

+49 −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.
		*/

		#ifndef FRAMEWORK_NATIVE_CMDS_LSHAL_DEBUG_COMMAND_H_
		#define FRAMEWORK_NATIVE_CMDS_LSHAL_DEBUG_COMMAND_H_

		#include <string>

		#include <android-base/macros.h>

		#include "utils.h"

		namespace android {
		namespace lshal {

		class Lshal;

		class DebugCommand {
		public:
		DebugCommand(Lshal &lshal);
		Status main(const std::string &command, const Arg &arg);
		private:
		Status parseArgs(const std::string &command, const Arg &arg);

		Lshal &mLshal;
		std::string mInterfaceName;
		std::vector<std::string> mOptions;

		DISALLOW_COPY_AND_ASSIGN(DebugCommand);
		};


		} // namespace lshal
		} // namespace android

		#endif // FRAMEWORK_NATIVE_CMDS_LSHAL_DEBUG_COMMAND_H_

cmds/lshal/ListCommand.cpp

0 → 100644

+705 −0

File added.

Preview size limit exceeded, changes collapsed.

cmds/lshal/ListCommand.h

0 → 100644

+101 −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.
		*/

		#ifndef FRAMEWORK_NATIVE_CMDS_LSHAL_LIST_COMMAND_H_
		#define FRAMEWORK_NATIVE_CMDS_LSHAL_LIST_COMMAND_H_

		#include <stdint.h>

		#include <fstream>
		#include <string>
		#include <vector>

		#include <android-base/macros.h>
		#include <android/hidl/manager/1.0/IServiceManager.h>

		#include "NullableOStream.h"
		#include "TableEntry.h"
		#include "utils.h"

		namespace android {
		namespace lshal {

		class Lshal;

		class ListCommand {
		public:
		ListCommand(Lshal &lshal);
		Status main(const std::string &command, const Arg &arg);
		private:
		Status parseArgs(const std::string &command, const Arg &arg);
		Status fetch();
		void postprocess();
		void dump();
		void putEntry(TableEntrySource source, TableEntry &&entry);
		Status fetchPassthrough(const sp<::android::hidl::manager::V1_0::IServiceManager> &manager);
		Status fetchBinderized(const sp<::android::hidl::manager::V1_0::IServiceManager> &manager);
		Status fetchAllLibraries(const sp<::android::hidl::manager::V1_0::IServiceManager> &manager);
		bool getReferencedPids(
		pid_t serverPid, std::map<uint64_t, Pids> *objects) const;
		void dumpTable();
		void dumpVintf() const;
		void printLine(
		const std::string &interfaceName,
		const std::string &transport,
		const std::string &arch,
		const std::string &server,
		const std::string &serverCmdline,
		const std::string &address, const std::string &clients,
		const std::string &clientCmdlines) const ;
		// Return /proc/{pid}/cmdline if it exists, else empty string.
		const std::string &getCmdline(pid_t pid);
		// Call getCmdline on all pid in pids. If it returns empty string, the process might
		// have died, and the pid is removed from pids.
		void removeDeadProcesses(Pids *pids);
		void forEachTable(const std::function<void(Table &)> &f);
		void forEachTable(const std::function<void(const Table &)> &f) const;

		Lshal &mLshal;

		Table mServicesTable{};
		Table mPassthroughRefTable{};
		Table mImplementationsTable{};

		NullableOStream<std::ostream> mErr;
		NullableOStream<std::ostream> mOut;
		NullableOStream<std::ofstream> mFileOutput = nullptr;
		TableEntryCompare mSortColumn = nullptr;
		TableEntrySelect mSelectedColumns = 0;
		// If true, cmdlines will be printed instead of pid.
		bool mEnableCmdlines = false;

		// If true, calls IBase::debug(...) on each service.
		bool mEmitDebugInfo = false;

		bool mVintf = false;
		// If an entry does not exist, need to ask /proc/{pid}/cmdline to get it.
		// If an entry exist but is an empty string, process might have died.
		// If an entry exist and not empty, it contains the cached content of /proc/{pid}/cmdline.
		std::map<pid_t, std::string> mCmdlines;

		DISALLOW_COPY_AND_ASSIGN(ListCommand);
		};


		} // namespace lshal
		} // namespace android

		#endif // FRAMEWORK_NATIVE_CMDS_LSHAL_LIST_COMMAND_H_