Merge "Add "adb shell cmd stats" support to statsd." (cadc8f8d) · Commits · e / os / android_frameworks_base

cmds/statsd/src/StatsService.cpp

+70 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@
		#include <cutils/log.h>
		#include <private/android_filesystem_config.h>
		#include <utils/Looper.h>
		#include <utils/String16.h>

		#include <unistd.h>
		#include <stdio.h>
		@@ -39,6 +40,60 @@ StatsService::~StatsService()
		{
		}

		// Implement our own because the default binder implementation isn't
		// properly handling SHELL_COMMAND_TRANSACTION
		status_t
		StatsService::onTransact(uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags)
		{
		status_t err;

		switch (code) {
		case SHELL_COMMAND_TRANSACTION: {
		int in = data.readFileDescriptor();
		int out = data.readFileDescriptor();
		int err = data.readFileDescriptor();
		int argc = data.readInt32();
		Vector<String8> args;
		for (int i = 0; i < argc && data.dataAvail() > 0; i++) {
		args.add(String8(data.readString16()));
		}
		sp<IShellCallback> shellCallback = IShellCallback::asInterface(
		data.readStrongBinder());
		sp<IResultReceiver> resultReceiver = IResultReceiver::asInterface(
		data.readStrongBinder());

		FILE* fin = fdopen(in, "r");
		FILE* fout = fdopen(out, "w");
		FILE* ferr = fdopen(err, "w");

		if (fin == NULL \|\| fout == NULL \|\| ferr == NULL) {
		resultReceiver->send(NO_MEMORY);
		} else {
		err = command(fin, fout, ferr, args);
		resultReceiver->send(err);
		}

		if (fin != NULL) {
		fflush(fin);
		fclose(fin);
		}
		if (fout != NULL) {
		fflush(fout);
		fclose(fout);
		}
		if (fout != NULL) {
		fflush(ferr);
		fclose(ferr);
		}

		return NO_ERROR;
		}
		default: {
		return BnStatsManager::onTransact(code, data, reply, flags);
		}
		}
		}

		status_t
		StatsService::dump(int fd, const Vector<String16>& args)
		{
		@@ -60,6 +115,21 @@ StatsService::dump(int fd, const Vector<String16>& args)
		return NO_ERROR;
		}

		status_t
		StatsService::command(FILE* in, FILE* out, FILE* err, Vector<String8>& args)
		{
		fprintf(out, "StatsService::command:");
		ALOGD("StatsService::command:");
		const int N = args.size();
		for (int i=0; i<N; i++) {
		fprintf(out, " %s", String8(args[i]).string());
		ALOGD(" %s", String8(args[i]).string());
		}
		fprintf(out, "\n");

		return NO_ERROR;
		}

		Status
		StatsService::systemRunning()
		{

cmds/statsd/src/StatsService.h

+7 −1

Original line number	Diff line number	Diff line
		@@ -18,6 +18,8 @@
		#define STATS_SERVICE_H

		#include <android/os/BnStatsManager.h>
		#include <binder/IResultReceiver.h>
		#include <binder/IShellCallback.h>
		#include <utils/Looper.h>

		#include <deque>
		@@ -36,9 +38,13 @@ public:
		StatsService(const sp<Looper>& handlerLooper);
		virtual ~StatsService();

		virtual status_t onTransact(uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags);

		virtual status_t dump(int fd, const Vector<String16>& args);
		virtual Status systemRunning();

		virtual status_t command(FILE* in, FILE* out, FILE* err, Vector<String8>& args);

		virtual Status systemRunning();
		};

		#endif // STATS_SERVICE_H