diff options
| -rw-r--r-- | libs/graphicsenv/GraphicsEnv.cpp | 22 | ||||
| -rw-r--r-- | libs/graphicsenv/include/graphicsenv/GraphicsEnv.h | 4 |
2 files changed, 21 insertions, 5 deletions
diff --git a/libs/graphicsenv/GraphicsEnv.cpp b/libs/graphicsenv/GraphicsEnv.cpp index 354703b9e4..f07c23132d 100644 --- a/libs/graphicsenv/GraphicsEnv.cpp +++ b/libs/graphicsenv/GraphicsEnv.cpp @@ -145,6 +145,12 @@ void GraphicsEnv::setDriverPathAndSphalLibraries(const std::string path, void GraphicsEnv::hintActivityLaunch() { ATRACE_CALL(); + { + std::lock_guard<std::mutex> lock(mStatsLock); + if (mActivityLaunched) return; + mActivityLaunched = true; + } + std::thread trySendGpuStatsThread([this]() { // If there's already graphics driver preloaded in the process, just send // the stats info to GpuStats directly through async binder. @@ -228,12 +234,11 @@ void GraphicsEnv::setDriverLoaded(GpuStatsInfo::Api api, bool isDriverLoaded, ATRACE_CALL(); std::lock_guard<std::mutex> lock(mStatsLock); - const bool doNotSend = mGpuStats.appPackageName.empty(); if (api == GpuStatsInfo::Api::API_GL) { - if (doNotSend) mGpuStats.glDriverToSend = true; + mGpuStats.glDriverToSend = true; mGpuStats.glDriverLoadingTime = driverLoadingTime; } else { - if (doNotSend) mGpuStats.vkDriverToSend = true; + mGpuStats.vkDriverToSend = true; mGpuStats.vkDriverLoadingTime = driverLoadingTime; } @@ -250,10 +255,18 @@ static sp<IGpuService> getGpuService() { return interface_cast<IGpuService>(binder); } +bool GraphicsEnv::readyToSendGpuStatsLocked() { + // Only send stats for processes having at least one activity launched and that process doesn't + // skip the GraphicsEnvironment setup. + return mActivityLaunched && !mGpuStats.appPackageName.empty(); +} + void GraphicsEnv::setTargetStats(const GpuStatsInfo::Stats stats, const uint64_t value) { ATRACE_CALL(); std::lock_guard<std::mutex> lock(mStatsLock); + if (!readyToSendGpuStatsLocked()) return; + const sp<IGpuService> gpuService = getGpuService(); if (gpuService) { gpuService->setTargetStats(mGpuStats.appPackageName, mGpuStats.driverVersionCode, stats, @@ -265,8 +278,7 @@ void GraphicsEnv::sendGpuStatsLocked(GpuStatsInfo::Api api, bool isDriverLoaded, int64_t driverLoadingTime) { ATRACE_CALL(); - // Do not sendGpuStats for those skipping the GraphicsEnvironment setup - if (mGpuStats.appPackageName.empty()) return; + if (!readyToSendGpuStatsLocked()) return; ALOGV("sendGpuStats:\n" "\tdriverPackageName[%s]\n" diff --git a/libs/graphicsenv/include/graphicsenv/GraphicsEnv.h b/libs/graphicsenv/include/graphicsenv/GraphicsEnv.h index c6dc1f831a..2219074ec0 100644 --- a/libs/graphicsenv/include/graphicsenv/GraphicsEnv.h +++ b/libs/graphicsenv/include/graphicsenv/GraphicsEnv.h @@ -131,6 +131,8 @@ private: void updateUseAngle(); // Link updatable driver namespace with llndk and vndk-sp libs. bool linkDriverNamespaceLocked(android_namespace_t* vndkNamespace); + // Check whether this process is ready to send stats. + bool readyToSendGpuStatsLocked(); // Send the initial complete GpuStats to GpuService. void sendGpuStatsLocked(GpuStatsInfo::Api api, bool isDriverLoaded, int64_t driverLoadingTime); @@ -141,6 +143,8 @@ private: std::string mSphalLibraries; // This mutex protects mGpuStats and get gpuservice call. std::mutex mStatsLock; + // Cache the activity launch info + bool mActivityLaunched = false; // Information bookkept for GpuStats. GpuStatsInfo mGpuStats; // Path to ANGLE libs. |