Merge cherrypicks of ['googleplex-android-review.googlesource.com/23899875'] into udc-release. (a0faf61f) · Commits · e / os / platform_frameworks_native

services/gpuservice/Android.bp

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -71,6 +71,7 @@ filegroup {
	cc_library_shared {		cc_library_shared {
	name: "libgpuservice",		name: "libgpuservice",
	defaults: ["libgpuservice_production_defaults"],		defaults: ["libgpuservice_production_defaults"],
			export_include_dirs: ["include"],
	srcs: [		srcs: [
	":libgpuservice_sources",		":libgpuservice_sources",
	],		],

services/gpuservice/GpuService.cpp

+9 −5

Original line number	Original line	Diff line number	Diff line
	@@ -16,7 +16,7 @@

	#define ATRACE_TAG ATRACE_TAG_GRAPHICS		#define ATRACE_TAG ATRACE_TAG_GRAPHICS

	#include "GpuService.h"		#include "gpuservice/GpuService.h"

	#include <android-base/stringprintf.h>		#include <android-base/stringprintf.h>
	#include <android-base/properties.h>		#include <android-base/properties.h>
	@@ -35,6 +35,7 @@
	#include <vkjson.h>		#include <vkjson.h>

	#include <thread>		#include <thread>
			#include <memory>

	namespace android {		namespace android {

	@@ -58,18 +59,21 @@ GpuService::GpuService()
	mGpuStats(std::make_unique<GpuStats>()),		mGpuStats(std::make_unique<GpuStats>()),
	mGpuMemTracer(std::make_unique<GpuMemTracer>()) {		mGpuMemTracer(std::make_unique<GpuMemTracer>()) {

	std::thread gpuMemAsyncInitThread([this]() {		mGpuMemAsyncInitThread = std::make_unique<std::thread>([this] (){
	mGpuMem->initialize();		mGpuMem->initialize();
	mGpuMemTracer->initialize(mGpuMem);		mGpuMemTracer->initialize(mGpuMem);
	});		});
	gpuMemAsyncInitThread.detach();

	std::thread gpuWorkAsyncInitThread([this]() {		mGpuWorkAsyncInitThread = std::make_unique<std::thread>([this]() {
	mGpuWork->initialize();		mGpuWork->initialize();
	});		});
	gpuWorkAsyncInitThread.detach();
	};		};

			GpuService::~GpuService() {
			mGpuWorkAsyncInitThread->join();
			mGpuMemAsyncInitThread->join();
			}

	void GpuService::setGpuStats(const std::string& driverPackageName,		void GpuService::setGpuStats(const std::string& driverPackageName,
	const std::string& driverVersionName, uint64_t driverVersionCode,		const std::string& driverVersionName, uint64_t driverVersionCode,
	int64_t driverBuildTime, const std::string& appPackageName,		int64_t driverBuildTime, const std::string& appPackageName,

services/gpuservice/GpuService.h→services/gpuservice/include/gpuservice/GpuService.h

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -24,6 +24,7 @@
	#include <serviceutils/PriorityDumper.h>		#include <serviceutils/PriorityDumper.h>

	#include <mutex>		#include <mutex>
			#include <thread>
	#include <vector>		#include <vector>

	namespace android {		namespace android {
	@@ -41,6 +42,7 @@ public:
	static const char* const SERVICE_NAME ANDROID_API;		static const char* const SERVICE_NAME ANDROID_API;

	GpuService() ANDROID_API;		GpuService() ANDROID_API;
			~GpuService();

	protected:		protected:
	status_t shellCommand(int in, int out, int err, std::vector<String16>& args) override;		status_t shellCommand(int in, int out, int err, std::vector<String16>& args) override;
	@@ -90,6 +92,8 @@ private:
	std::unique_ptr<GpuMemTracer> mGpuMemTracer;		std::unique_ptr<GpuMemTracer> mGpuMemTracer;
	std::mutex mLock;		std::mutex mLock;
	std::string mDeveloperDriverPath;		std::string mDeveloperDriverPath;
			std::unique_ptr<std::thread> mGpuMemAsyncInitThread;
			std::unique_ptr<std::thread> mGpuWorkAsyncInitThread;
	};		};

	} // namespace android		} // namespace android

services/gpuservice/main_gpuservice.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -18,7 +18,7 @@
	#include <binder/IServiceManager.h>		#include <binder/IServiceManager.h>
	#include <binder/ProcessState.h>		#include <binder/ProcessState.h>
	#include <sys/resource.h>		#include <sys/resource.h>
	#include "GpuService.h"		#include "gpuservice/GpuService.h"

	using namespace android;		using namespace android;

services/gpuservice/tests/unittests/Android.bp

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -28,6 +28,7 @@ cc_test {
	"GpuMemTest.cpp",		"GpuMemTest.cpp",
	"GpuMemTracerTest.cpp",		"GpuMemTracerTest.cpp",
	"GpuStatsTest.cpp",		"GpuStatsTest.cpp",
			"GpuServiceTest.cpp",
	],		],
	header_libs: ["bpf_headers"],		header_libs: ["bpf_headers"],
	shared_libs: [		shared_libs: [
	@@ -45,6 +46,7 @@ cc_test {
	"libstatslog",		"libstatslog",
	"libstatspull",		"libstatspull",
	"libutils",		"libutils",
			"libgpuservice",
	],		],
	static_libs: [		static_libs: [
	"libgmock",		"libgmock",