Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "GpuStats: migrate to new statsd native puller api"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-02-06 07:57:29 +00:00
committed by Android (Google) Code Review
parent 1b65fd963e b761c68119
commit f8df902cbf
5 changed files with 0 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmds/statsd/Android.bp
View File

@@ -65,7 +65,6 @@ cc_defaults {
"src/config/ConfigListener.cpp",
"src/config/ConfigManager.cpp",
"src/experiment_ids.proto",
"src/external/GpuStatsPuller.cpp",
"src/external/Perfetto.cpp",
"src/external/PullResultReceiver.cpp",
"src/external/puller_util.cpp",
@@ -130,7 +129,6 @@ cc_defaults {
],
shared_libs: [
"libbinder",
"libgraphicsenv",
"libhidlbase",
"libincident",
"liblog",
@@ -278,7 +276,6 @@ cc_test {
"tests/e2e/PartialBucket_e2e_test.cpp",
"tests/e2e/ValueMetric_pull_e2e_test.cpp",
"tests/e2e/WakelockDuration_e2e_test.cpp",
"tests/external/GpuStatsPuller_test.cpp",
"tests/external/puller_util_test.cpp",
"tests/external/StatsCallbackPuller_test.cpp",
"tests/external/StatsPuller_test.cpp",

163
cmds/statsd/src/external/GpuStatsPuller.cpp vendored
View File

@@ -1,163 +0,0 @@
/*
* Copyright 2019 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 "GpuStatsPuller.h"
#include <binder/IServiceManager.h>
#include <graphicsenv/GpuStatsInfo.h>
#include <graphicsenv/IGpuService.h>
#include "logd/LogEvent.h"
#include "stats_log_util.h"
#include "statslog.h"
namespace android {
namespace os {
namespace statsd {
using android::util::ProtoReader;
GpuStatsPuller::GpuStatsPuller(const int tagId) : StatsPuller(tagId) {
}
static sp<IGpuService> getGpuService() {
const sp<IBinder> binder = defaultServiceManager()->checkService(String16("gpu"));
if (!binder) {
ALOGE("Failed to get gpu service");
return nullptr;
}
return interface_cast<IGpuService>(binder);
}
static bool pullGpuStatsGlobalInfo(const sp<IGpuService>& gpuService,
std::vector<std::shared_ptr<LogEvent>>* data) {
std::vector<GpuStatsGlobalInfo> stats;
status_t status = gpuService->getGpuStatsGlobalInfo(&stats);
if (status != OK) {
return false;
}
data->clear();
data->reserve(stats.size());
for (const auto& info : stats) {
std::shared_ptr<LogEvent> event = make_shared<LogEvent>(
android::util::GPU_STATS_GLOBAL_INFO, getWallClockNs(), getElapsedRealtimeNs());
if (!event->write(info.driverPackageName)) return false;
if (!event->write(info.driverVersionName)) return false;
if (!event->write((int64_t)info.driverVersionCode)) return false;
if (!event->write(info.driverBuildTime)) return false;
if (!event->write((int64_t)info.glLoadingCount)) return false;
if (!event->write((int64_t)info.glLoadingFailureCount)) return false;
if (!event->write((int64_t)info.vkLoadingCount)) return false;
if (!event->write((int64_t)info.vkLoadingFailureCount)) return false;
if (!event->write(info.vulkanVersion)) return false;
if (!event->write(info.cpuVulkanVersion)) return false;
if (!event->write(info.glesVersion)) return false;
if (!event->write((int64_t)info.angleLoadingCount)) return false;
if (!event->write((int64_t)info.angleLoadingFailureCount)) return false;
event->init();
data->emplace_back(event);
}
return true;
}
static bool pullGpuStatsAppInfo(const sp<IGpuService>& gpuService,
std::vector<std::shared_ptr<LogEvent>>* data) {
std::vector<GpuStatsAppInfo> stats;
status_t status = gpuService->getGpuStatsAppInfo(&stats);
if (status != OK) {
return false;
}
data->clear();
data->reserve(stats.size());
for (const auto& info : stats) {
std::shared_ptr<LogEvent> event = make_shared<LogEvent>(
android::util::GPU_STATS_APP_INFO, getWallClockNs(), getElapsedRealtimeNs());
if (!event->write(info.appPackageName)) return false;
if (!event->write((int64_t)info.driverVersionCode)) return false;
if (!event->writeBytes(int64VectorToProtoByteString(info.glDriverLoadingTime))) {
return false;
}
if (!event->writeBytes(int64VectorToProtoByteString(info.vkDriverLoadingTime))) {
return false;
}
if (!event->writeBytes(int64VectorToProtoByteString(info.angleDriverLoadingTime))) {
return false;
}
if (!event->write(info.cpuVulkanInUse)) return false;
if (!event->write(info.falsePrerotation)) return false;
if (!event->write(info.gles1InUse)) return false;
event->init();
data->emplace_back(event);
}
return true;
}
bool GpuStatsPuller::PullInternal(std::vector<std::shared_ptr<LogEvent>>* data) {
const sp<IGpuService> gpuService = getGpuService();
if (!gpuService) {
return false;
}
switch (mTagId) {
case android::util::GPU_STATS_GLOBAL_INFO:
return pullGpuStatsGlobalInfo(gpuService, data);
case android::util::GPU_STATS_APP_INFO:
return pullGpuStatsAppInfo(gpuService, data);
default:
break;
}
return false;
}
static std::string protoOutputStreamToByteString(ProtoOutputStream& proto) {
if (!proto.size()) return "";
std::string byteString;
sp<ProtoReader> reader = proto.data();
while (reader->readBuffer() != nullptr) {
const size_t toRead = reader->currentToRead();
byteString.append((char*)reader->readBuffer(), toRead);
reader->move(toRead);
}
if (byteString.size() != proto.size()) return "";
return byteString;
}
std::string int64VectorToProtoByteString(const std::vector<int64_t>& value) {
if (value.empty()) return "";
ProtoOutputStream proto;
for (const auto& ele : value) {
proto.write(android::util::FIELD_TYPE_INT64 | android::util::FIELD_COUNT_REPEATED |
1 /* field id */,
(long long)ele);
}
return protoOutputStreamToByteString(proto);
}
} // namespace statsd
} // namespace os
} // namespace android

42
cmds/statsd/src/external/GpuStatsPuller.h vendored
View File

@@ -1,42 +0,0 @@
/*
* Copyright 2019 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.
*/
#pragma once
#include "StatsPuller.h"
namespace android {
namespace os {
namespace statsd {
/**
* Pull GpuStats from GpuService.
*/
class GpuStatsPuller : public StatsPuller {
public:
explicit GpuStatsPuller(const int tagId);
bool PullInternal(std::vector<std::shared_ptr<LogEvent>>* data) override;
};
// convert a int64_t vector into a byte string for proto message like:
// message RepeatedInt64Wrapper {
// repeated int64 value = 1;
// }
std::string int64VectorToProtoByteString(const std::vector<int64_t>& value);
} // namespace statsd
} // namespace os
} // namespace android

10
cmds/statsd/src/external/StatsPullerManager.cpp vendored
View File

@@ -32,7 +32,6 @@
#include "../logd/LogEvent.h"
#include "../stats_log_util.h"
#include "../statscompanion_util.h"
#include "GpuStatsPuller.h"
#include "StatsCallbackPuller.h"
#include "TrainInfoPuller.h"
#include "statslog.h"
@@ -51,15 +50,6 @@ StatsPullerManager::StatsPullerManager()
: kAllPullAtomInfo({
// TrainInfo.
{{.atomTag = android::util::TRAIN_INFO}, new TrainInfoPuller()},
// GpuStatsGlobalInfo
{{.atomTag = android::util::GPU_STATS_GLOBAL_INFO},
new GpuStatsPuller(android::util::GPU_STATS_GLOBAL_INFO)},
// GpuStatsAppInfo
{{.atomTag = android::util::GPU_STATS_APP_INFO},
new GpuStatsPuller(android::util::GPU_STATS_APP_INFO)},
}),
mNextPullTimeNs(NO_ALARM_UPDATE) {
}

185
cmds/statsd/tests/external/GpuStatsPuller_test.cpp vendored
View File

@@ -1,185 +0,0 @@
/*
* Copyright 2019 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.
*/
#undef LOG_TAG
#define LOG_TAG "GpuStatsPuller_test"
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include <graphicsenv/GpuStatsInfo.h>
#include <log/log.h>
#include "src/external/GpuStatsPuller.h"
#include "statslog.h"
#ifdef __ANDROID__
namespace android {
namespace os {
namespace statsd {
// clang-format off
static const std::string DRIVER_PACKAGE_NAME = "TEST_DRIVER";
static const std::string DRIVER_VERSION_NAME = "TEST_DRIVER_VERSION";
static const std::string APP_PACKAGE_NAME = "TEST_APP";
static const int64_t TIMESTAMP_WALLCLOCK = 111;
static const int64_t TIMESTAMP_ELAPSED = 222;
static const int64_t DRIVER_VERSION_CODE = 333;
static const int64_t DRIVER_BUILD_TIME = 444;
static const int64_t GL_LOADING_COUNT = 3;
static const int64_t GL_LOADING_FAILURE_COUNT = 1;
static const int64_t VK_LOADING_COUNT = 4;
static const int64_t VK_LOADING_FAILURE_COUNT = 0;
static const int64_t ANGLE_LOADING_COUNT = 2;
static const int64_t ANGLE_LOADING_FAILURE_COUNT = 1;
static const int64_t GL_DRIVER_LOADING_TIME_0 = 555;
static const int64_t GL_DRIVER_LOADING_TIME_1 = 666;
static const int64_t VK_DRIVER_LOADING_TIME_0 = 777;
static const int64_t VK_DRIVER_LOADING_TIME_1 = 888;
static const int64_t VK_DRIVER_LOADING_TIME_2 = 999;
static const int64_t ANGLE_DRIVER_LOADING_TIME_0 = 1010;
static const int64_t ANGLE_DRIVER_LOADING_TIME_1 = 1111;
static const int32_t VULKAN_VERSION = 1;
static const int32_t CPU_VULKAN_VERSION = 2;
static const int32_t GLES_VERSION = 3;
static const bool CPU_VULKAN_IN_USE = true;
static const bool FALSE_PREROTATION = true;
static const bool GLES_1_IN_USE = true;
static const size_t NUMBER_OF_VALUES_GLOBAL = 13;
static const size_t NUMBER_OF_VALUES_APP = 8;
// clang-format on
class MockGpuStatsPuller : public GpuStatsPuller {
public:
MockGpuStatsPuller(const int tagId, vector<std::shared_ptr<LogEvent>>* data)
: GpuStatsPuller(tagId), mData(data){};
private:
bool PullInternal(vector<std::shared_ptr<LogEvent>>* data) override {
*data = *mData;
return true;
}
vector<std::shared_ptr<LogEvent>>* mData;
};
class GpuStatsPuller_test : public ::testing::Test {
public:
GpuStatsPuller_test() {
const ::testing::TestInfo* const test_info =
::testing::UnitTest::GetInstance()->current_test_info();
ALOGD("**** Setting up for %s.%s\n", test_info->test_case_name(), test_info->name());
}
~GpuStatsPuller_test() {
const ::testing::TestInfo* const test_info =
::testing::UnitTest::GetInstance()->current_test_info();
ALOGD("**** Tearing down after %s.%s\n", test_info->test_case_name(), test_info->name());
}
};
TEST_F(GpuStatsPuller_test, PullGpuStatsGlobalInfo) {
vector<std::shared_ptr<LogEvent>> inData, outData;
std::shared_ptr<LogEvent> event = make_shared<LogEvent>(android::util::GPU_STATS_GLOBAL_INFO,
TIMESTAMP_WALLCLOCK, TIMESTAMP_ELAPSED);
EXPECT_TRUE(event->write(DRIVER_PACKAGE_NAME));
EXPECT_TRUE(event->write(DRIVER_VERSION_NAME));
EXPECT_TRUE(event->write(DRIVER_VERSION_CODE));
EXPECT_TRUE(event->write(DRIVER_BUILD_TIME));
EXPECT_TRUE(event->write(GL_LOADING_COUNT));
EXPECT_TRUE(event->write(GL_LOADING_FAILURE_COUNT));
EXPECT_TRUE(event->write(VK_LOADING_COUNT));
EXPECT_TRUE(event->write(VK_LOADING_FAILURE_COUNT));
EXPECT_TRUE(event->write(VULKAN_VERSION));
EXPECT_TRUE(event->write(CPU_VULKAN_VERSION));
EXPECT_TRUE(event->write(GLES_VERSION));
EXPECT_TRUE(event->write(ANGLE_LOADING_COUNT));
EXPECT_TRUE(event->write(ANGLE_LOADING_FAILURE_COUNT));
event->init();
inData.emplace_back(event);
MockGpuStatsPuller mockPuller(android::util::GPU_STATS_GLOBAL_INFO, &inData);
mockPuller.ForceClearCache();
mockPuller.Pull(&outData);
ASSERT_EQ(1, outData.size());
EXPECT_EQ(android::util::GPU_STATS_GLOBAL_INFO, outData[0]->GetTagId());
ASSERT_EQ(NUMBER_OF_VALUES_GLOBAL, outData[0]->size());
EXPECT_EQ(DRIVER_PACKAGE_NAME, outData[0]->getValues()[0].mValue.str_value);
EXPECT_EQ(DRIVER_VERSION_NAME, outData[0]->getValues()[1].mValue.str_value);
EXPECT_EQ(DRIVER_VERSION_CODE, outData[0]->getValues()[2].mValue.long_value);
EXPECT_EQ(DRIVER_BUILD_TIME, outData[0]->getValues()[3].mValue.long_value);
EXPECT_EQ(GL_LOADING_COUNT, outData[0]->getValues()[4].mValue.long_value);
EXPECT_EQ(GL_LOADING_FAILURE_COUNT, outData[0]->getValues()[5].mValue.long_value);
EXPECT_EQ(VK_LOADING_COUNT, outData[0]->getValues()[6].mValue.long_value);
EXPECT_EQ(VK_LOADING_FAILURE_COUNT, outData[0]->getValues()[7].mValue.long_value);
EXPECT_EQ(VULKAN_VERSION, outData[0]->getValues()[8].mValue.int_value);
EXPECT_EQ(CPU_VULKAN_VERSION, outData[0]->getValues()[9].mValue.int_value);
EXPECT_EQ(GLES_VERSION, outData[0]->getValues()[10].mValue.int_value);
EXPECT_EQ(ANGLE_LOADING_COUNT, outData[0]->getValues()[11].mValue.long_value);
EXPECT_EQ(ANGLE_LOADING_FAILURE_COUNT, outData[0]->getValues()[12].mValue.long_value);
}
TEST_F(GpuStatsPuller_test, PullGpuStatsAppInfo) {
vector<std::shared_ptr<LogEvent>> inData, outData;
std::shared_ptr<LogEvent> event = make_shared<LogEvent>(android::util::GPU_STATS_APP_INFO,
TIMESTAMP_WALLCLOCK, TIMESTAMP_ELAPSED);
EXPECT_TRUE(event->write(APP_PACKAGE_NAME));
EXPECT_TRUE(event->write(DRIVER_VERSION_CODE));
std::vector<int64_t> glDriverLoadingTime;
glDriverLoadingTime.emplace_back(GL_DRIVER_LOADING_TIME_0);
glDriverLoadingTime.emplace_back(GL_DRIVER_LOADING_TIME_1);
std::vector<int64_t> vkDriverLoadingTime;
vkDriverLoadingTime.emplace_back(VK_DRIVER_LOADING_TIME_0);
vkDriverLoadingTime.emplace_back(VK_DRIVER_LOADING_TIME_1);
vkDriverLoadingTime.emplace_back(VK_DRIVER_LOADING_TIME_2);
std::vector<int64_t> angleDriverLoadingTime;
angleDriverLoadingTime.emplace_back(ANGLE_DRIVER_LOADING_TIME_0);
angleDriverLoadingTime.emplace_back(ANGLE_DRIVER_LOADING_TIME_1);
EXPECT_TRUE(event->write(int64VectorToProtoByteString(glDriverLoadingTime)));
EXPECT_TRUE(event->write(int64VectorToProtoByteString(vkDriverLoadingTime)));
EXPECT_TRUE(event->write(int64VectorToProtoByteString(angleDriverLoadingTime)));
EXPECT_TRUE(event->write(CPU_VULKAN_IN_USE));
EXPECT_TRUE(event->write(FALSE_PREROTATION));
EXPECT_TRUE(event->write(GLES_1_IN_USE));
event->init();
inData.emplace_back(event);
MockGpuStatsPuller mockPuller(android::util::GPU_STATS_APP_INFO, &inData);
mockPuller.ForceClearCache();
mockPuller.Pull(&outData);
ASSERT_EQ(1, outData.size());
EXPECT_EQ(android::util::GPU_STATS_APP_INFO, outData[0]->GetTagId());
ASSERT_EQ(NUMBER_OF_VALUES_APP, outData[0]->size());
EXPECT_EQ(APP_PACKAGE_NAME, outData[0]->getValues()[0].mValue.str_value);
EXPECT_EQ(DRIVER_VERSION_CODE, outData[0]->getValues()[1].mValue.long_value);
EXPECT_EQ(int64VectorToProtoByteString(glDriverLoadingTime),
outData[0]->getValues()[2].mValue.str_value);
EXPECT_EQ(int64VectorToProtoByteString(vkDriverLoadingTime),
outData[0]->getValues()[3].mValue.str_value);
EXPECT_EQ(int64VectorToProtoByteString(angleDriverLoadingTime),
outData[0]->getValues()[4].mValue.str_value);
EXPECT_EQ(CPU_VULKAN_IN_USE, outData[0]->getValues()[5].mValue.int_value);
EXPECT_EQ(FALSE_PREROTATION, outData[0]->getValues()[6].mValue.int_value);
EXPECT_EQ(GLES_1_IN_USE, outData[0]->getValues()[7].mValue.int_value);
}
} // namespace statsd
} // namespace os
} // namespace android
#else
GTEST_LOG_(INFO) << "This test does nothing.\n";
#endif