Create manager lib for StatsBootstrapAtomService
Manages binder lifecycle & provides interfaces for the underlying IPCs. Callers can use StatsBootstrapAtomClient::reportBootstrapAtom. Under the hood, we use checkService, which will not wait for the service. This is so we avoid blocking the client. If StatsBootstrapAtomService is not available, the log will be dropped, and false will be returned. Test: manually verified atoms could be logged to statsd Bug: 206644307 Change-Id: I63ae62f1ce4d1dc337f99c9e3b35b2496131c582
This commit is contained in:
parent
e8e5b5bb28
commit
ff863caa61
5 changed files with 216 additions and 0 deletions
49
libstats/bootstrap/Android.bp
Normal file
49
libstats/bootstrap/Android.bp
Normal file
|
@ -0,0 +1,49 @@
|
|||
//
|
||||
// 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.
|
||||
//
|
||||
|
||||
// =========================================================================
|
||||
// Native library that provide a client to StatsBootstrapAtomService.
|
||||
// This library should only be used by processes that start in the bootstrap namespace.
|
||||
// All other clients should use libstatssocket, provided by the statsd apex.
|
||||
// =========================================================================
|
||||
package {
|
||||
default_applicable_licenses: ["Android-Apache-2.0"],
|
||||
}
|
||||
|
||||
cc_defaults {
|
||||
name: "libstatsbootstrap_defaults",
|
||||
srcs: [
|
||||
"BootstrapClientInternal.cpp",
|
||||
"StatsBootstrapAtomClient.cpp",
|
||||
],
|
||||
cflags: [
|
||||
"-Wall",
|
||||
"-Werror",
|
||||
],
|
||||
shared_libs: [
|
||||
"libbinder",
|
||||
"libutils",
|
||||
"android.os.statsbootstrap_aidl-cpp",
|
||||
],
|
||||
}
|
||||
|
||||
cc_library {
|
||||
name: "libstatsbootstrap",
|
||||
defaults: ["libstatsbootstrap_defaults"],
|
||||
export_include_dirs: ["include"],
|
||||
}
|
||||
|
||||
|
57
libstats/bootstrap/BootstrapClientInternal.cpp
Normal file
57
libstats/bootstrap/BootstrapClientInternal.cpp
Normal file
|
@ -0,0 +1,57 @@
|
|||
/*
|
||||
* 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 "BootstrapClientInternal.h"
|
||||
|
||||
#include <binder/IServiceManager.h>
|
||||
|
||||
namespace android {
|
||||
namespace os {
|
||||
namespace stats {
|
||||
|
||||
sp<BootstrapClientInternal> BootstrapClientInternal::getInstance() {
|
||||
static sp<BootstrapClientInternal> client = new BootstrapClientInternal();
|
||||
return client;
|
||||
}
|
||||
|
||||
sp<IStatsBootstrapAtomService> BootstrapClientInternal::getServiceNonBlocking() {
|
||||
std::lock_guard<std::mutex> lock(mLock);
|
||||
if (mService != nullptr) {
|
||||
return mService;
|
||||
}
|
||||
connectNonBlockingLocked();
|
||||
return mService;
|
||||
}
|
||||
|
||||
void BootstrapClientInternal::binderDied(const wp<IBinder>&) {
|
||||
std::lock_guard<std::mutex> lock(mLock);
|
||||
mService = nullptr;
|
||||
connectNonBlockingLocked();
|
||||
}
|
||||
|
||||
void BootstrapClientInternal::connectNonBlockingLocked() {
|
||||
const String16 name("statsbootstrap");
|
||||
mService =
|
||||
interface_cast<IStatsBootstrapAtomService>(defaultServiceManager()->checkService(name));
|
||||
if (mService != nullptr) {
|
||||
// Set up binder death.
|
||||
IInterface::asBinder(mService)->linkToDeath(this);
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace stats
|
||||
} // namespace os
|
||||
} // namespace android
|
41
libstats/bootstrap/BootstrapClientInternal.h
Normal file
41
libstats/bootstrap/BootstrapClientInternal.h
Normal file
|
@ -0,0 +1,41 @@
|
|||
/*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <android/os/IStatsBootstrapAtomService.h>
|
||||
|
||||
namespace android {
|
||||
namespace os {
|
||||
namespace stats {
|
||||
|
||||
class BootstrapClientInternal : public IBinder::DeathRecipient {
|
||||
public:
|
||||
static sp<BootstrapClientInternal> getInstance();
|
||||
void binderDied(const wp<IBinder>& who) override;
|
||||
sp<IStatsBootstrapAtomService> getServiceNonBlocking();
|
||||
|
||||
private:
|
||||
BootstrapClientInternal() {}
|
||||
void connectNonBlockingLocked();
|
||||
|
||||
mutable std::mutex mLock;
|
||||
sp<IStatsBootstrapAtomService> mService;
|
||||
};
|
||||
|
||||
} // namespace stats
|
||||
} // namespace os
|
||||
} // namespace android
|
37
libstats/bootstrap/StatsBootstrapAtomClient.cpp
Normal file
37
libstats/bootstrap/StatsBootstrapAtomClient.cpp
Normal file
|
@ -0,0 +1,37 @@
|
|||
/*
|
||||
* 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 "include/StatsBootstrapAtomClient.h"
|
||||
|
||||
#include <android/os/IStatsBootstrapAtomService.h>
|
||||
|
||||
#include "BootstrapClientInternal.h"
|
||||
|
||||
namespace android {
|
||||
namespace os {
|
||||
namespace stats {
|
||||
|
||||
bool StatsBootstrapAtomClient::reportBootstrapAtom(const StatsBootstrapAtom& atom) {
|
||||
sp<IStatsBootstrapAtomService> service =
|
||||
BootstrapClientInternal::getInstance()->getServiceNonBlocking();
|
||||
if (service == nullptr) {
|
||||
return false;
|
||||
}
|
||||
return service->reportBootstrapAtom(atom).isOk();
|
||||
}
|
||||
|
||||
} // namespace stats
|
||||
} // namespace os
|
||||
} // namespace android
|
32
libstats/bootstrap/include/StatsBootstrapAtomClient.h
Normal file
32
libstats/bootstrap/include/StatsBootstrapAtomClient.h
Normal file
|
@ -0,0 +1,32 @@
|
|||
/*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <android/os/StatsBootstrapAtom.h>
|
||||
|
||||
namespace android {
|
||||
namespace os {
|
||||
namespace stats {
|
||||
|
||||
class StatsBootstrapAtomClient {
|
||||
public:
|
||||
static bool reportBootstrapAtom(const StatsBootstrapAtom& atom);
|
||||
};
|
||||
|
||||
} // namespace stats
|
||||
} // namespace os
|
||||
} // namespace android
|
Loading…
Reference in a new issue