Merge "[GPU Service] Separate GPU Service out of SurfaceFlinger." am: ad5fe4dee4 (6fb52505) · Commits · e / os / platform_frameworks_native

services/gpuservice/Android.bp

0 → 100644

+74 −0

Original line number	Diff line number	Diff line
		filegroup {
		name: "gpuservice_sources",
		srcs: [
		"GpuService.cpp",
		],
		}

		filegroup {
		name: "gpuservice_binary_sources",
		srcs: ["main_gpuservice.cpp"],
		}

		cc_defaults {
		name: "gpuservice_defaults",
		cflags: [
		"-DLOG_TAG=\"GpuService\"",
		"-Wall",
		"-Werror",
		"-Wformat",
		"-Wthread-safety",
		"-Wunused",
		"-Wunreachable-code",
		],
		cppflags: ["-std=c++1z"],
		srcs: [
		":gpuservice_sources",
		],
		include_dirs: [
		"frameworks/native/vulkan/vkjson",
		"frameworks/native/vulkan/include",
		],
		shared_libs: [
		"libbinder",
		"liblog",
		"libutils",
		"libvulkan",
		],
		static_libs: [
		"libvkjson",
		],
		}

		cc_defaults {
		name: "gpuservice_production_defaults",
		defaults: ["gpuservice_defaults"],
		cflags: [
		"-fvisibility=hidden",
		"-fwhole-program-vtables", // requires ThinLTO
		],
		lto: {
		thin: true,
		},
		}

		cc_defaults {
		name: "gpuservice_binary",
		defaults: ["gpuservice_defaults"],
		whole_static_libs: [
		"libsigchain",
		],
		shared_libs: [
		"libbinder",
		"liblog",
		"libutils",
		],
		ldflags: ["-Wl,--export-dynamic"],
		}

		cc_binary {
		name: "gpuservice",
		defaults: ["gpuservice_binary"],
		init_rc: ["gpuservice.rc"],
		srcs: [":gpuservice_binary_sources"],
		}

services/surfaceflinger/GpuService.cpp→services/gpuservice/GpuService.cpp

+7 −19

Original line number	Diff line number	Diff line
		@@ -23,10 +23,7 @@

		namespace android {

		// ----------------------------------------------------------------------------

		class BpGpuService : public BpInterface<IGpuService>
		{
		class BpGpuService : public BpInterface<IGpuService> {
		public:
		explicit BpGpuService(const sp<IBinder>& impl) : BpInterface<IGpuService>(impl) {}
		};
		@@ -34,19 +31,15 @@ public:
		IMPLEMENT_META_INTERFACE(GpuService, "android.ui.IGpuService");

		status_t BnGpuService::onTransact(uint32_t code, const Parcel& data,
		Parcel* reply, uint32_t flags)
		{
		Parcel* reply, uint32_t flags) {
		status_t status;
		switch (code) {
		case SHELL_COMMAND_TRANSACTION: {
		int in = data.readFileDescriptor();
		int out = data.readFileDescriptor();
		int err = data.readFileDescriptor();
		int argc = data.readInt32();
		Vector<String16> args;
		for (int i = 0; i < argc && data.dataAvail() > 0; i++) {
		args.add(data.readString16());
		}
		std::vector<String16> args;
		data.readString16Vector(&args);
		sp<IBinder> unusedCallback;
		sp<IResultReceiver> resultReceiver;
		if ((status = data.readNullableStrongBinder(&unusedCallback)) != OK)
		@@ -64,20 +57,17 @@ status_t BnGpuService::onTransact(uint32_t code, const Parcel& data,
		}
		}

		// ----------------------------------------------------------------------------

		namespace {
		status_t cmd_help(int out);
		status_t cmd_vkjson(int out, int err);
		}

		const char* const GpuService::SERVICE_NAME = "gpu";
		const char* const GpuService::SERVICE_NAME = "gpuservice";

		GpuService::GpuService() {}
		GpuService::GpuService() = default;

		status_t GpuService::shellCommand(int /in/, int out, int err,
		Vector<String16>& args)
		{
		std::vector<String16>& args) {
		ALOGV("GpuService::shellCommand");
		for (size_t i = 0, n = args.size(); i < n; i++)
		ALOGV(" arg[%zu]: '%s'", i, String8(args[i]).string());
		@@ -93,8 +83,6 @@ status_t GpuService::shellCommand(int /in/, int out, int err,
		return BAD_VALUE;
		}

		// ----------------------------------------------------------------------------

		namespace {

		status_t cmd_help(int out) {

services/surfaceflinger/GpuService.h→services/gpuservice/GpuService.h

+7 −6

Original line number	Diff line number	Diff line
		@@ -17,6 +17,8 @@
		#ifndef ANDROID_GPUSERVICE_H
		#define ANDROID_GPUSERVICE_H

		#include <vector>

		#include <binder/IInterface.h>
		#include <cutils/compiler.h>

		@@ -34,22 +36,21 @@ public:
		class BnGpuService: public BnInterface<IGpuService> {
		protected:
		virtual status_t shellCommand(int in, int out, int err,
		Vector<String16>& args) = 0;
		std::vector<String16>& args) = 0;

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

		class GpuService : public BnGpuService
		{
		class GpuService : public BnGpuService {
		public:
		static const char* const SERVICE_NAME ANDROID_API;

		GpuService() ANDROID_API;

		protected:
		virtual status_t shellCommand(int in, int out, int err,
		Vector<String16>& args) override;
		status_t shellCommand(int in, int out, int err,
		std::vector<String16>& args) override;
		};

		} // namespace android

services/gpuservice/gpuservice.rc

0 → 100644

+4 −0

Original line number	Diff line number	Diff line
		service gpuservice /system/bin/gpuservice
		class core
		user gpu_service
		group graphics

services/gpuservice/main_gpuservice.cpp

0 → 100644

+43 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2018 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 <binder/IPCThreadState.h>
		#include <binder/IServiceManager.h>
		#include <binder/ProcessState.h>
		#include <sys/resource.h>
		#include "GpuService.h"

		using namespace android;

		int main(int /* argc /, char* /* argv */) {
		signal(SIGPIPE, SIG_IGN);

		// publish GpuService
		sp<GpuService> gpuservice = new GpuService();
		sp<IServiceManager> sm(defaultServiceManager());
		sm->addService(String16(GpuService::SERVICE_NAME), gpuservice, false);

		// limit the number of binder threads to 4.
		ProcessState::self()->setThreadPoolMaxThreadCount(4);

		// start the thread pool
		sp<ProcessState> ps(ProcessState::self());
		ps->startThreadPool();
		ps->giveThreadPoolName();
		IPCThreadState::self()->joinThreadPool();

		return 0;
		}