Merge "logd: specify clang format" (eb4a9d95) · Commits · e / os / android_system_core

logd/.clang-format

0 → 100644

+11 −0

Original line number	Diff line number	Diff line
		BasedOnStyle: Google
		AllowShortFunctionsOnASingleLine: false

		CommentPragmas: NOLINT:.*
		DerivePointerAlignment: false
		IndentWidth: 4
		PointerAlignment: Left
		TabWidth: 4
		PenaltyExcessCharacter: 32

		Cpp11BracedListStyle: false

logd/CommandListener.cpp

+62 −75

Original line number	Diff line number	Diff line
		@@ -20,8 +20,8 @@
		#include <errno.h>
		#include <fcntl.h>
		#include <netinet/in.h>
		#include <string.h>
		#include <stdlib.h>
		#include <string.h>
		#include <sys/prctl.h>
		#include <sys/socket.h>
		#include <sys/types.h>
		@@ -38,8 +38,8 @@
		#include "LogUtils.h"

		CommandListener::CommandListener(LogBuffer* buf, LogReader* /reader/,
		LogListener * /swl/) :
		FrameworkListener(getLogSocket()) {
		LogListener* /swl/)
		: FrameworkListener(getLogSocket()) {
		// registerCmd(new ShutdownCmd(buf, writer, swl));
		registerCmd(new ClearCmd(buf));
		registerCmd(new GetBufSizeCmd(buf));
		@@ -53,24 +53,19 @@ CommandListener::CommandListener(LogBuffer buf, LogReader /reader/,
		registerCmd(new ExitCmd(this));
		}

		CommandListener::ShutdownCmd::ShutdownCmd(LogReader *reader,
		LogListener *swl) :
		LogCommand("shutdown"),
		mReader(*reader),
		mSwl(*swl) {
		CommandListener::ShutdownCmd::ShutdownCmd(LogReader* reader, LogListener* swl)
		: LogCommand("shutdown"), mReader(reader), mSwl(swl) {
		}

		int CommandListener::ShutdownCmd::runCommand(SocketClient* /cli/,
		int /argc/,
		char ** /argv/) {
		int /argc/, char** /argv/) {
		mSwl.stopListener();
		mReader.stopListener();
		exit(0);
		}

		CommandListener::ClearCmd::ClearCmd(LogBuffer *buf) :
		LogCommand("clear"),
		mBuf(*buf) {
		CommandListener::ClearCmd::ClearCmd(LogBuffer* buf)
		: LogCommand("clear"), mBuf(*buf) {
		}

		static void setname() {
		@@ -81,8 +76,8 @@ static void setname() {
		}
		}

		int CommandListener::ClearCmd::runCommand(SocketClient *cli,
		int argc, char **argv) {
		int CommandListener::ClearCmd::runCommand(SocketClient* cli, int argc,
		char** argv) {
		setname();
		uid_t uid = cli->getUid();
		if (clientHasLogCredentials(cli)) {
		@@ -104,13 +99,12 @@ int CommandListener::ClearCmd::runCommand(SocketClient *cli,
		return 0;
		}

		CommandListener::GetBufSizeCmd::GetBufSizeCmd(LogBuffer *buf) :
		LogCommand("getLogSize"),
		mBuf(*buf) {
		CommandListener::GetBufSizeCmd::GetBufSizeCmd(LogBuffer* buf)
		: LogCommand("getLogSize"), mBuf(*buf) {
		}

		int CommandListener::GetBufSizeCmd::runCommand(SocketClient *cli,
		int argc, char **argv) {
		int CommandListener::GetBufSizeCmd::runCommand(SocketClient* cli, int argc,
		char** argv) {
		setname();
		if (argc < 2) {
		cli->sendMsg("Missing Argument");
		@@ -130,13 +124,12 @@ int CommandListener::GetBufSizeCmd::runCommand(SocketClient *cli,
		return 0;
		}

		CommandListener::SetBufSizeCmd::SetBufSizeCmd(LogBuffer *buf) :
		LogCommand("setLogSize"),
		mBuf(*buf) {
		CommandListener::SetBufSizeCmd::SetBufSizeCmd(LogBuffer* buf)
		: LogCommand("setLogSize"), mBuf(*buf) {
		}

		int CommandListener::SetBufSizeCmd::runCommand(SocketClient *cli,
		int argc, char **argv) {
		int CommandListener::SetBufSizeCmd::runCommand(SocketClient* cli, int argc,
		char** argv) {
		setname();
		if (!clientHasLogCredentials(cli)) {
		cli->sendMsg("Permission Denied");
		@@ -164,13 +157,12 @@ int CommandListener::SetBufSizeCmd::runCommand(SocketClient *cli,
		return 0;
		}

		CommandListener::GetBufSizeUsedCmd::GetBufSizeUsedCmd(LogBuffer *buf) :
		LogCommand("getLogSizeUsed"),
		mBuf(*buf) {
		CommandListener::GetBufSizeUsedCmd::GetBufSizeUsedCmd(LogBuffer* buf)
		: LogCommand("getLogSizeUsed"), mBuf(*buf) {
		}

		int CommandListener::GetBufSizeUsedCmd::runCommand(SocketClient *cli,
		int argc, char **argv) {
		int CommandListener::GetBufSizeUsedCmd::runCommand(SocketClient* cli, int argc,
		char** argv) {
		setname();
		if (argc < 2) {
		cli->sendMsg("Missing Argument");
		@@ -190,22 +182,22 @@ int CommandListener::GetBufSizeUsedCmd::runCommand(SocketClient *cli,
		return 0;
		}

		CommandListener::GetStatisticsCmd::GetStatisticsCmd(LogBuffer *buf) :
		LogCommand("getStatistics"),
		mBuf(*buf) {
		CommandListener::GetStatisticsCmd::GetStatisticsCmd(LogBuffer* buf)
		: LogCommand("getStatistics"), mBuf(*buf) {
		}

		static std::string package_string(const std::string& str) {
		// Calculate total buffer size prefix, count is the string length w/o nul
		char fmt[32];
		for(size_t l = str.length(), y = 0, x = 6; y != x; y = x, x = strlen(fmt) - 2) {
		for (size_t l = str.length(), y = 0, x = 6; y != x;
		y = x, x = strlen(fmt) - 2) {
		snprintf(fmt, sizeof(fmt), "%zu\n%%s\n\f", l + x);
		}
		return android::base::StringPrintf(fmt, str.c_str());
		}

		int CommandListener::GetStatisticsCmd::runCommand(SocketClient *cli,
		int argc, char **argv) {
		int CommandListener::GetStatisticsCmd::runCommand(SocketClient* cli, int argc,
		char** argv) {
		setname();
		uid_t uid = cli->getUid();
		if (clientHasLogCredentials(cli)) {
		@@ -236,14 +228,13 @@ int CommandListener::GetStatisticsCmd::runCommand(SocketClient *cli,
		}
		}

		cli->sendMsg(package_string(mBuf.formatStatistics(uid, pid,
		logMask)).c_str());
		cli->sendMsg(
		package_string(mBuf.formatStatistics(uid, pid, logMask)).c_str());
		return 0;
		}

		CommandListener::GetPruneListCmd::GetPruneListCmd(LogBuffer *buf) :
		LogCommand("getPruneList"),
		mBuf(*buf) {
		CommandListener::GetPruneListCmd::GetPruneListCmd(LogBuffer* buf)
		: LogCommand("getPruneList"), mBuf(*buf) {
		}

		int CommandListener::GetPruneListCmd::runCommand(SocketClient* cli,
		@@ -253,13 +244,12 @@ int CommandListener::GetPruneListCmd::runCommand(SocketClient *cli,
		return 0;
		}

		CommandListener::SetPruneListCmd::SetPruneListCmd(LogBuffer *buf) :
		LogCommand("setPruneList"),
		mBuf(*buf) {
		CommandListener::SetPruneListCmd::SetPruneListCmd(LogBuffer* buf)
		: LogCommand("setPruneList"), mBuf(*buf) {
		}

		int CommandListener::SetPruneListCmd::runCommand(SocketClient *cli,
		int argc, char **argv) {
		int CommandListener::SetPruneListCmd::runCommand(SocketClient* cli, int argc,
		char** argv) {
		setname();
		if (!clientHasLogCredentials(cli)) {
		cli->sendMsg("Permission Denied");
		@@ -286,13 +276,12 @@ int CommandListener::SetPruneListCmd::runCommand(SocketClient *cli,
		return 0;
		}

		CommandListener::GetEventTagCmd::GetEventTagCmd(LogBuffer *buf) :
		LogCommand("getEventTag"),
		mBuf(*buf) {
		CommandListener::GetEventTagCmd::GetEventTagCmd(LogBuffer* buf)
		: LogCommand("getEventTag"), mBuf(*buf) {
		}

		int CommandListener::GetEventTagCmd::runCommand(SocketClient *cli,
		int argc, char ** argv) {
		int CommandListener::GetEventTagCmd::runCommand(SocketClient* cli, int argc,
		char** argv) {
		setname();
		uid_t uid = cli->getUid();
		if (clientHasLogCredentials(cli)) {
		@@ -331,8 +320,8 @@ int CommandListener::GetEventTagCmd::runCommand(SocketClient *cli,
		return 0;
		}

		cli->sendMsg(package_string(mBuf.formatGetEventTag(uid,
		name, format)).c_str());
		cli->sendMsg(
		package_string(mBuf.formatGetEventTag(uid, name, format)).c_str());

		return 0;
		}
		@@ -340,8 +329,8 @@ int CommandListener::GetEventTagCmd::runCommand(SocketClient *cli,
		CommandListener::ReinitCmd::ReinitCmd() : LogCommand("reinit") {
		}

		int CommandListener::ReinitCmd::runCommand(SocketClient *cli,
		int /argc/, char ** /argv/) {
		int CommandListener::ReinitCmd::runCommand(SocketClient* cli, int /argc/,
		char** /argv/) {
		setname();

		reinit_signal_handler(SIGHUP);
		@@ -351,13 +340,12 @@ int CommandListener::ReinitCmd::runCommand(SocketClient *cli,
		return 0;
		}

		CommandListener::ExitCmd::ExitCmd(CommandListener *parent) :
		LogCommand("EXIT"),
		mParent(*parent) {
		CommandListener::ExitCmd::ExitCmd(CommandListener* parent)
		: LogCommand("EXIT"), mParent(*parent) {
		}

		int CommandListener::ExitCmd::runCommand(SocketClient * cli,
		int /argc/, char ** /argv/) {
		int CommandListener::ExitCmd::runCommand(SocketClient* cli, int /argc/,
		char** /argv/) {
		setname();

		cli->sendMsg("success");
		@@ -371,9 +359,8 @@ int CommandListener::getLogSocket() {
		int sock = android_get_control_socket(socketName);

		if (sock < 0) {
		sock = socket_local_server(socketName,
		ANDROID_SOCKET_NAMESPACE_RESERVED,
		SOCK_STREAM);
		sock = socket_local_server(
		socketName, ANDROID_SOCKET_NAMESPACE_RESERVED, SOCK_STREAM);
		}

		return sock;

logd/CommandListener.h

+44 −37

Original line number	Diff line number	Diff line
		@@ -18,19 +18,19 @@
		#define _COMMANDLISTENER_H__

		#include <sysutils/FrameworkListener.h>
		#include "LogCommand.h"
		#include "LogBuffer.h"
		#include "LogReader.h"
		#include "LogCommand.h"
		#include "LogListener.h"
		#include "LogReader.h"

		// See main.cpp for implementation
		void reinit_signal_handler(int /signal/);

		class CommandListener : public FrameworkListener {

		public:
		CommandListener(LogBuffer* buf, LogReader* reader, LogListener* swl);
		virtual ~CommandListener() {}
		virtual ~CommandListener() {
		}

		private:
		static int getLogSocket();
		@@ -41,16 +41,19 @@ private:

		public:
		ShutdownCmd(LogReader* reader, LogListener* swl);
		virtual ~ShutdownCmd() {}
		virtual ~ShutdownCmd() {
		}
		int runCommand(SocketClient* c, int argc, char** argv);
		};

		#define LogBufferCmd(name) \
		class name##Cmd : public LogCommand { \
		LogBuffer& mBuf; \
		\
		public: \
		explicit name##Cmd(LogBuffer* buf); \
		virtual ~name##Cmd() {} \
		virtual ~name##Cmd() { \
		} \
		int runCommand(SocketClient* c, int argc, char** argv); \
		}

		@@ -67,7 +70,8 @@ private:
		class name##Cmd : public LogCommand { \
		public: \
		name##Cmd(); \
		virtual ~name##Cmd() {} \
		virtual ~name##Cmd() { \
		} \
		int runCommand(SocketClient* c, int argc, char** argv); \
		}

		@@ -76,16 +80,19 @@ private:
		#define LogParentCmd(name) \
		class name##Cmd : public LogCommand { \
		CommandListener& mParent; \
		\
		public: \
		name##Cmd(); \
		explicit name##Cmd(CommandListener* parent); \
		virtual ~name##Cmd() {} \
		virtual ~name##Cmd() { \
		} \
		int runCommand(SocketClient* c, int argc, char** argv); \
		void release(SocketClient *c) { mParent.release(c); } \
		void release(SocketClient* c) { \
		mParent.release(c); \
		} \
		}

		LogParentCmd(Exit);

		};

		#endif

logd/FlushCommand.cpp

+18 −22

Original line number	Diff line number	Diff line
		@@ -26,14 +26,10 @@
		#include "LogTimes.h"
		#include "LogUtils.h"

		FlushCommand::FlushCommand(LogReader &reader,
		bool nonBlock,
		unsigned long tail,
		unsigned int logMask,
		pid_t pid,
		uint64_t start,
		uint64_t timeout) :
		mReader(reader),
		FlushCommand::FlushCommand(LogReader& reader, bool nonBlock, unsigned long tail,
		unsigned int logMask, pid_t pid, uint64_t start,
		uint64_t timeout)
		: mReader(reader),
		mNonBlock(nonBlock),
		mTail(tail),
		mLogMask(logMask),

logd/FlushCommand.h

+10 −13

Original line number	Diff line number	Diff line
		@@ -35,12 +35,9 @@ class FlushCommand : public SocketClientCommand {
		uint64_t mTimeout;

		public:
		explicit FlushCommand(LogReader &mReader,
		bool nonBlock = false,
		unsigned long tail = -1,
		unsigned int logMask = -1,
		pid_t pid = 0,
		uint64_t start = 1,
		explicit FlushCommand(LogReader& mReader, bool nonBlock = false,
		unsigned long tail = -1, unsigned int logMask = -1,
		pid_t pid = 0, uint64_t start = 1,
		uint64_t timeout = 0);
		virtual void runSocketCommand(SocketClient* client);