Skip to content

Commit 104057b

Browse files
Vova SharaienkoAndroid (Google) Code Review
Vova Sharaienko
authored and
Android (Google) Code Review
committed
Merge "Removed dependency on libstatslog" into main
2 parents 932fff8 + 539577f commit 104057b

File tree

6 files changed

+65
-27
lines changed

6 files changed

+65
-27
lines changed

‎services/gpuservice/gpustats/Android.bp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ cc_defaults {
1414
"libgraphicsenv",
1515
"liblog",
1616
"libprotoutil",
17-
"libstatslog",
17+
"libstatslog_gpustats",
1818
"libstatspull",
1919
"libstatssocket",
2020
"libutils",
@@ -39,7 +39,7 @@ cc_library_static {
3939
"-Werror",
4040
"-Wformat",
4141
"-Wthread-safety",
42-
"-Wunused",
4342
"-Wunreachable-code",
43+
"-Wunused",
4444
],
4545
}

‎services/gpuservice/gpustats/GpuStats.cpp‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include <cutils/properties.h>
2424
#include <log/log.h>
2525
#include <stats_event.h>
26-
#include <statslog.h>
26+
#include <statslog_gpustats.h>
2727
#include <utils/Trace.h>
2828

2929
#include <unordered_set>
@@ -32,8 +32,8 @@ namespace android {
3232

3333
GpuStats::~GpuStats() {
3434
if (mStatsdRegistered) {
35-
AStatsManager_clearPullAtomCallback(android::util::GPU_STATS_GLOBAL_INFO);
36-
AStatsManager_clearPullAtomCallback(android::util::GPU_STATS_APP_INFO);
35+
AStatsManager_clearPullAtomCallback(android::gpustats::GPU_STATS_GLOBAL_INFO);
36+
AStatsManager_clearPullAtomCallback(android::gpustats::GPU_STATS_APP_INFO);
3737
}
3838
}
3939

@@ -296,9 +296,9 @@ void GpuStats::interceptSystemDriverStatsLocked() {
296296

297297
void GpuStats::registerStatsdCallbacksIfNeeded() {
298298
if (!mStatsdRegistered) {
299-
AStatsManager_setPullAtomCallback(android::util::GPU_STATS_GLOBAL_INFO, nullptr,
299+
AStatsManager_setPullAtomCallback(android::gpustats::GPU_STATS_GLOBAL_INFO, nullptr,
300300
GpuStats::pullAtomCallback, this);
301-
AStatsManager_setPullAtomCallback(android::util::GPU_STATS_APP_INFO, nullptr,
301+
AStatsManager_setPullAtomCallback(android::gpustats::GPU_STATS_APP_INFO, nullptr,
302302
GpuStats::pullAtomCallback, this);
303303
mStatsdRegistered = true;
304304
}
@@ -421,16 +421,16 @@ AStatsManager_PullAtomCallbackReturn GpuStats::pullAppInfoAtom(AStatsEventList*
421421
engineNames.push_back(engineName.c_str());
422422
}
423423

424-
android::util::addAStatsEvent(
424+
android::gpustats::addAStatsEvent(
425425
data,
426-
android::util::GPU_STATS_APP_INFO,
426+
android::gpustats::GPU_STATS_APP_INFO,
427427
ele.second.appPackageName.c_str(),
428428
ele.second.driverVersionCode,
429-
android::util::BytesField(glDriverBytes.c_str(),
429+
android::gpustats::BytesField(glDriverBytes.c_str(),
430430
glDriverBytes.length()),
431-
android::util::BytesField(vkDriverBytes.c_str(),
431+
android::gpustats::BytesField(vkDriverBytes.c_str(),
432432
vkDriverBytes.length()),
433-
android::util::BytesField(angleDriverBytes.c_str(),
433+
android::gpustats::BytesField(angleDriverBytes.c_str(),
434434
angleDriverBytes.length()),
435435
ele.second.cpuVulkanInUse,
436436
ele.second.falsePrerotation,
@@ -461,9 +461,9 @@ AStatsManager_PullAtomCallbackReturn GpuStats::pullGlobalInfoAtom(AStatsEventLis
461461

462462
if (data) {
463463
for (const auto& ele : mGlobalStats) {
464-
android::util::addAStatsEvent(
464+
android::gpustats::addAStatsEvent(
465465
data,
466-
android::util::GPU_STATS_GLOBAL_INFO,
466+
android::gpustats::GPU_STATS_GLOBAL_INFO,
467467
ele.second.driverPackageName.c_str(),
468468
ele.second.driverVersionName.c_str(),
469469
ele.second.driverVersionCode,
@@ -491,9 +491,9 @@ AStatsManager_PullAtomCallbackReturn GpuStats::pullAtomCallback(int32_t atomTag,
491491
ATRACE_CALL();
492492

493493
GpuStats* pGpuStats = reinterpret_cast<GpuStats*>(cookie);
494-
if (atomTag == android::util::GPU_STATS_GLOBAL_INFO) {
494+
if (atomTag == android::gpustats::GPU_STATS_GLOBAL_INFO) {
495495
return pGpuStats->pullGlobalInfoAtom(data);
496-
} else if (atomTag == android::util::GPU_STATS_APP_INFO) {
496+
} else if (atomTag == android::gpustats::GPU_STATS_APP_INFO) {
497497
return pGpuStats->pullAppInfoAtom(data);
498498
}
499499

‎services/gpuservice/gpuwork/Android.bp‎

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,9 @@ cc_library_shared {
3131
"libbpf_bcc",
3232
"libcutils",
3333
"liblog",
34-
"libstatslog",
34+
"libstatslog_gpustats",
3535
"libstatspull",
36+
"libstatssocket",
3637
"libutils",
3738
],
3839
export_include_dirs: [
@@ -50,11 +51,48 @@ cc_library_shared {
5051
"-Werror",
5152
"-Wformat",
5253
"-Wthread-safety",
53-
"-Wunused",
5454
"-Wunreachable-code",
55+
"-Wunused",
5556
],
5657
required: [
5758
"bpfloader",
5859
"gpuWork.o",
5960
],
6061
}
62+
63+
cc_library_shared {
64+
name: "libstatslog_gpustats",
65+
host_supported: true,
66+
generated_sources: ["statslog_gpustats.cpp"],
67+
generated_headers: ["statslog_gpustats.h"],
68+
export_generated_headers: ["statslog_gpustats.h"],
69+
shared_libs: [
70+
"libstatspull",
71+
"libstatssocket",
72+
],
73+
export_shared_lib_headers: [
74+
"libstatspull",
75+
"libstatssocket",
76+
],
77+
}
78+
79+
genrule {
80+
name: "statslog_gpustats.h",
81+
tools: ["stats-log-api-gen"],
82+
cmd: "$(location stats-log-api-gen) --header $(genDir)/statslog_gpustats.h" +
83+
" --module gpustats --namespace android,gpustats",
84+
out: [
85+
"statslog_gpustats.h",
86+
],
87+
}
88+
89+
genrule {
90+
name: "statslog_gpustats.cpp",
91+
tools: ["stats-log-api-gen"],
92+
cmd: "$(location stats-log-api-gen) --cpp $(genDir)/statslog_gpustats.cpp" +
93+
" --module gpustats --namespace android,gpustats" +
94+
" --importHeader statslog_gpustats.h",
95+
out: [
96+
"statslog_gpustats.cpp",
97+
],
98+
}

‎services/gpuservice/gpuwork/GpuWork.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include <log/log.h>
2828
#include <random>
2929
#include <stats_event.h>
30-
#include <statslog.h>
30+
#include <statslog_gpustats.h>
3131
#include <unistd.h>
3232
#include <utils/Timers.h>
3333
#include <utils/Trace.h>
@@ -110,7 +110,7 @@ GpuWork::~GpuWork() {
110110
{
111111
std::scoped_lock<std::mutex> lock(mMutex);
112112
if (mStatsdRegistered) {
113-
AStatsManager_clearPullAtomCallback(android::util::GPU_WORK_PER_UID);
113+
AStatsManager_clearPullAtomCallback(android::gpustats::GPU_WORK_PER_UID);
114114
}
115115
}
116116

@@ -155,7 +155,7 @@ void GpuWork::initialize() {
155155

156156
{
157157
std::lock_guard<std::mutex> lock(mMutex);
158-
AStatsManager_setPullAtomCallback(int32_t{android::util::GPU_WORK_PER_UID}, nullptr,
158+
AStatsManager_setPullAtomCallback(int32_t{android::gpustats::GPU_WORK_PER_UID}, nullptr,
159159
GpuWork::pullAtomCallback, this);
160160
mStatsdRegistered = true;
161161
}
@@ -260,7 +260,7 @@ AStatsManager_PullAtomCallbackReturn GpuWork::pullAtomCallback(int32_t atomTag,
260260
ATRACE_CALL();
261261

262262
GpuWork* gpuWork = reinterpret_cast<GpuWork*>(cookie);
263-
if (atomTag == android::util::GPU_WORK_PER_UID) {
263+
if (atomTag == android::gpustats::GPU_WORK_PER_UID) {
264264
return gpuWork->pullWorkAtoms(data);
265265
}
266266

@@ -417,7 +417,7 @@ AStatsManager_PullAtomCallbackReturn GpuWork::pullWorkAtoms(AStatsEventList* dat
417417
}
418418

419419
ALOGI("pullWorkAtoms: adding stats for GPU ID %" PRIu32 "; UID %" PRIu32, gpuId, uid);
420-
android::util::addAStatsEvent(data, int32_t{android::util::GPU_WORK_PER_UID},
420+
android::gpustats::addAStatsEvent(data, int32_t{android::gpustats::GPU_WORK_PER_UID},
421421
// uid
422422
bitcast_int32(uid),
423423
// gpu_id

‎services/gpuservice/tests/unittests/Android.bp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ cc_test {
9898
"liblog",
9999
"libprotobuf-cpp-lite",
100100
"libprotoutil",
101-
"libstatslog",
101+
"libstatslog_gpustats",
102102
"libstatspull",
103103
"libutils",
104104
],

‎services/gpuservice/tests/unittests/GpuStatsTest.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include <gpustats/GpuStats.h>
2525
#include <gtest/gtest.h>
2626
#include <stats_pull_atom_callback.h>
27-
#include <statslog.h>
27+
#include <statslog_gpustats.h>
2828
#include <utils/Looper.h>
2929
#include <utils/String16.h>
3030
#include <utils/Vector.h>
@@ -520,7 +520,7 @@ TEST_F(GpuStatsTest, canPullGlobalAtom) {
520520
EXPECT_FALSE(inputCommand(InputCommand::DUMP_GLOBAL).empty());
521521
EXPECT_FALSE(inputCommand(InputCommand::DUMP_APP).empty());
522522

523-
EXPECT_TRUE(testableGpuStats.makePullAtomCallback(android::util::GPU_STATS_GLOBAL_INFO) ==
523+
EXPECT_TRUE(testableGpuStats.makePullAtomCallback(android::gpustats::GPU_STATS_GLOBAL_INFO) ==
524524
AStatsManager_PULL_SUCCESS);
525525

526526
EXPECT_TRUE(inputCommand(InputCommand::DUMP_GLOBAL).empty());
@@ -537,7 +537,7 @@ TEST_F(GpuStatsTest, canPullAppAtom) {
537537
EXPECT_FALSE(inputCommand(InputCommand::DUMP_GLOBAL).empty());
538538
EXPECT_FALSE(inputCommand(InputCommand::DUMP_APP).empty());
539539

540-
EXPECT_TRUE(testableGpuStats.makePullAtomCallback(android::util::GPU_STATS_APP_INFO) ==
540+
EXPECT_TRUE(testableGpuStats.makePullAtomCallback(android::gpustats::GPU_STATS_APP_INFO) ==
541541
AStatsManager_PULL_SUCCESS);
542542

543543
EXPECT_FALSE(inputCommand(InputCommand::DUMP_GLOBAL).empty());

0 commit comments

Comments
 (0)