Revert "Trusty metrics reporter service" am: b39a771980
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/14453915 Change-Id: I04ce220b3434834bc35be4d09ece9b419a6676af
This commit is contained in:
Tri Vo
Automerger Merge Worker
commit
0ee2eab28f
4 changed files with 0 additions and 242 deletions
|
|
@ -761,10 +761,6 @@ PRODUCT_PACKAGES += \
|
||||||
PRODUCT_PACKAGES += \
|
PRODUCT_PACKAGES += \
|
||||||
securedpud.slider
|
securedpud.slider
|
||||||
|
|
||||||
# Trusty Metrics Daemon
|
|
||||||
PRODUCT_PACKAGES += \
|
|
||||||
trusty_metricsd.gs101
|
|
||||||
|
|
||||||
PRODUCT_PACKAGES += \
|
PRODUCT_PACKAGES += \
|
||||||
android.hardware.graphics.composer@2.4-impl \
|
android.hardware.graphics.composer@2.4-impl \
|
||||||
android.hardware.graphics.composer@2.4-service
|
android.hardware.graphics.composer@2.4-service
|
||||||
|
|
|
||||||
|
|
@ -1,31 +0,0 @@
|
||||||
// Copyright (C) 2021 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.
|
|
||||||
|
|
||||||
cc_binary {
|
|
||||||
name: "trusty_metricsd.gs101",
|
|
||||||
vendor: true,
|
|
||||||
init_rc: ["trusty_metricsd.gs101.rc"],
|
|
||||||
srcs: ["main.cpp"],
|
|
||||||
shared_libs: [
|
|
||||||
"android.frameworks.stats-V1-ndk_platform",
|
|
||||||
"libbase",
|
|
||||||
"libbinder_ndk",
|
|
||||||
"libtrusty_metrics",
|
|
||||||
"vendor-pixelatoms-cpp",
|
|
||||||
],
|
|
||||||
cflags: [
|
|
||||||
"-Wall",
|
|
||||||
"-Werror",
|
|
||||||
],
|
|
||||||
}
|
|
||||||
|
|
@ -1,189 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2021 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 <aidl/android/frameworks/stats/IStats.h>
|
|
||||||
#include <android/binder_manager.h>
|
|
||||||
#include <android/binder_process.h>
|
|
||||||
#include <android-base/logging.h>
|
|
||||||
#include <getopt.h>
|
|
||||||
#include <poll.h>
|
|
||||||
#include <trusty/metrics/metrics.h>
|
|
||||||
#include <vendor/google/libraries/pixelatoms/pixelatoms.pb.h>
|
|
||||||
|
|
||||||
#include <memory>
|
|
||||||
#include <string>
|
|
||||||
|
|
||||||
using aidl::android::frameworks::stats::IStats;
|
|
||||||
using aidl::android::frameworks::stats::VendorAtom;
|
|
||||||
using aidl::android::frameworks::stats::VendorAtomValue;
|
|
||||||
using android::hardware::google::pixel::vendor::PixelAtoms::Atom;
|
|
||||||
using android::hardware::google::pixel::vendor::PixelAtoms::ReverseDomainNames;
|
|
||||||
|
|
||||||
static void show_usage_and_exit(int code) {
|
|
||||||
LOG(ERROR) << "usage: trusty_metricsd -d <trusty_dev>";
|
|
||||||
exit(code);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void parse_device_name(int argc, char* argv[], char*& device_name) {
|
|
||||||
static const char* _sopts = "h:d:";
|
|
||||||
static const struct option _lopts[] = {{"help", no_argument, NULL, 'h'},
|
|
||||||
{"trusty_dev", required_argument, NULL, 'd'},
|
|
||||||
{0, 0, 0, 0}};
|
|
||||||
int opt;
|
|
||||||
int oidx = 0;
|
|
||||||
|
|
||||||
while ((opt = getopt_long(argc, argv, _sopts, _lopts, &oidx)) != -1) {
|
|
||||||
switch (opt) {
|
|
||||||
case 'd':
|
|
||||||
device_name = strdup(optarg);
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
LOG(ERROR) << "unrecognized option: " << opt;
|
|
||||||
show_usage_and_exit(EXIT_FAILURE);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (device_name == nullptr) {
|
|
||||||
LOG(ERROR) << "missing required argument(s)";
|
|
||||||
show_usage_and_exit(EXIT_FAILURE);
|
|
||||||
}
|
|
||||||
|
|
||||||
LOG(INFO) << "starting trusty_metricsd";
|
|
||||||
LOG(INFO) << "trusty dev: " << device_name;
|
|
||||||
}
|
|
||||||
|
|
||||||
namespace android {
|
|
||||||
namespace trusty {
|
|
||||||
namespace metrics {
|
|
||||||
|
|
||||||
class TrustyMetricsPixel : public TrustyMetrics {
|
|
||||||
private:
|
|
||||||
TrustyMetricsPixel(std::string tipc_dev, std::shared_ptr<IStats> stats_client)
|
|
||||||
: TrustyMetrics(std::move(tipc_dev)), stats_client_(stats_client) {}
|
|
||||||
|
|
||||||
std::shared_ptr<IStats> stats_client_;
|
|
||||||
|
|
||||||
public:
|
|
||||||
static std::unique_ptr<TrustyMetricsPixel> Create(std::string tipc_dev) {
|
|
||||||
const std::string stats_service_name =
|
|
||||||
std::string(IStats::descriptor).append("/default");
|
|
||||||
std::shared_ptr<IStats> stats_client = IStats::fromBinder(ndk::SpAIBinder(
|
|
||||||
AServiceManager_waitForService(stats_service_name.c_str())));
|
|
||||||
if (!stats_client) {
|
|
||||||
LOG(ERROR) << "failed to open IStats client";
|
|
||||||
return nullptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
std::unique_ptr<TrustyMetricsPixel> metrics(
|
|
||||||
new TrustyMetricsPixel(std::move(tipc_dev), stats_client));
|
|
||||||
if (!metrics) {
|
|
||||||
LOG(ERROR) << "failed to allocate TrustyMetricsPixel";
|
|
||||||
return nullptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
auto ret = metrics->Open();
|
|
||||||
if (!ret.ok()) {
|
|
||||||
LOG(ERROR) << "failed to open TrustyMetricsPixel: " << ret.error();
|
|
||||||
return nullptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
return metrics;
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual void HandleCrash(const std::string& app_id) override {
|
|
||||||
LOG(ERROR) << "TA crashed: " << app_id;
|
|
||||||
|
|
||||||
std::vector<VendorAtomValue> v(1);
|
|
||||||
v[0].set<VendorAtomValue::stringValue>(app_id);
|
|
||||||
|
|
||||||
VendorAtom atom{
|
|
||||||
.reverseDomainName = ReverseDomainNames().pixel(),
|
|
||||||
.atomId = Atom::kTrustyAppCrashed,
|
|
||||||
.values = std::move(v),
|
|
||||||
};
|
|
||||||
|
|
||||||
auto ret = stats_client_->reportVendorAtom(atom);
|
|
||||||
if (!ret.isOk()) {
|
|
||||||
LOG(ERROR) << "failed to report Trusty app crash to IStats";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual void HandleEventDrop() override {
|
|
||||||
LOG(ERROR) << "Trusty metrics event dropped!";
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
} // namespace metrics
|
|
||||||
} // namespace trusty
|
|
||||||
} // namespace android
|
|
||||||
|
|
||||||
int main(int argc, char* argv[]) {
|
|
||||||
char* device_name;
|
|
||||||
parse_device_name(argc, argv, device_name);
|
|
||||||
|
|
||||||
auto metrics = android::trusty::metrics::TrustyMetricsPixel::Create(device_name);
|
|
||||||
if (!metrics) {
|
|
||||||
LOG(ERROR) << "failed to open Trusty metrics client";
|
|
||||||
return EXIT_FAILURE;
|
|
||||||
}
|
|
||||||
|
|
||||||
int binder_fd;
|
|
||||||
binder_status_t status = ABinderProcess_setupPolling(&binder_fd);
|
|
||||||
if (status != STATUS_OK || binder_fd < 0) {
|
|
||||||
LOG(ERROR) << "failed to setup binder polling";
|
|
||||||
return EXIT_FAILURE;
|
|
||||||
}
|
|
||||||
|
|
||||||
struct pollfd pfds[] = {
|
|
||||||
{
|
|
||||||
.fd = binder_fd,
|
|
||||||
.events = POLLIN,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
.fd = metrics->GetRawFd(),
|
|
||||||
.events = POLLIN,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
while (1) {
|
|
||||||
int rc = poll(pfds, 2, -1 /* no timeout */);
|
|
||||||
if (rc <= 0) {
|
|
||||||
LOG(ERROR) << "failed poll()";
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
short binder_revents = pfds[0].revents;
|
|
||||||
short metrics_revents = pfds[1].revents;
|
|
||||||
|
|
||||||
short error_mask = POLLHUP | POLLERR | POLLNVAL;
|
|
||||||
if ((binder_revents & error_mask) || (metrics_revents & error_mask)) {
|
|
||||||
LOG(ERROR) << "received an error event from poll()";
|
|
||||||
/* irrecoverable error */
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (binder_revents & POLLIN) {
|
|
||||||
ABinderProcess_handlePolledCommands();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (metrics_revents & POLLIN) {
|
|
||||||
metrics->HandleEvent();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return EXIT_FAILURE;
|
|
||||||
}
|
|
||||||
|
|
@ -1,18 +0,0 @@
|
||||||
# Copyright (C) 2021 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.
|
|
||||||
|
|
||||||
service trusty_metricsd /vendor/bin/trusty_metricsd.gs101 -d /dev/trusty-ipc-dev0
|
|
||||||
class main
|
|
||||||
user system
|
|
||||||
group system
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue