ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove extra indirection in native puller API

Browse source 
The indirection is unneeded since we already take a function pointer.

Test: builds
Change-Id: Ice426d7dcb090aaf87a377ede233a4eb18f5eb30
This commit is contained in:
Tej Singh 2020-01-09 11:48:36 -08:00
parent cde63fd301
commit 7e1b190832
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libstats/pull/include/stats_pull_atom_callback.h
View file

@ -38,7 +38,7 @@ typedef bool (*stats_pull_atom_callback_t)(int32_t atom_tag, pulled_stats_event_
const void* cookie);
struct stats_event* add_stats_event_to_pull_data(pulled_stats_event_list* pull_data);
void register_stats_pull_atom_callback(int32_t atom_tag, stats_pull_atom_callback_t* callback,
void register_stats_pull_atom_callback(int32_t atom_tag, stats_pull_atom_callback_t callback,
pull_atom_metadata* metadata, void* cookie);
#ifdef __cplusplus

8
libstats/pull/stats_pull_atom_callback.cpp
View file

@ -42,7 +42,7 @@ static const int64_t DEFAULT_TIMEOUT_NS = 10000000000LL; // 10 seconds.
class StatsPullAtomCallbackInternal : public android::os::BnPullAtomCallback {
public:
StatsPullAtomCallbackInternal(const stats_pull_atom_callback_t* callback, const void* cookie,
StatsPullAtomCallbackInternal(const stats_pull_atom_callback_t callback, const void* cookie,
const int64_t coolDownNs, const int64_t timeoutNs,
const std::vector<int32_t> additiveFields)
: mCallback(callback),
@ -55,7 +55,7 @@ class StatsPullAtomCallbackInternal : public android::os::BnPullAtomCallback {
int32_t atomTag,
const ::android::sp<::android::os::IPullAtomResultReceiver>& resultReceiver) override {
pulled_stats_event_list statsEventList;
bool success = (*mCallback)(atomTag, &statsEventList, mCookie);
bool success = mCallback(atomTag, &statsEventList, mCookie);
// Convert stats_events into StatsEventParcels.
std::vector<android::util::StatsEventParcel> parcels;
@ -82,7 +82,7 @@ class StatsPullAtomCallbackInternal : public android::os::BnPullAtomCallback {
const std::vector<int32_t>& getAdditiveFields() const { return mAdditiveFields; }
private:
const stats_pull_atom_callback_t* mCallback;
const stats_pull_atom_callback_t mCallback;
const void* mCookie;
const int64_t mCoolDownNs;
const int64_t mTimeoutNs;
@ -134,7 +134,7 @@ static android::sp<android::os::IStatsd> getStatsServiceLocked() {
return sStatsd;
}
void register_stats_pull_atom_callback(int32_t atom_tag, stats_pull_atom_callback_t* callback,
void register_stats_pull_atom_callback(int32_t atom_tag, stats_pull_atom_callback_t callback,
pull_atom_metadata* metadata, void* cookie) {
int64_t coolDownNs = metadata == nullptr ? DEFAULT_COOL_DOWN_NS : metadata->cool_down_ns;
int64_t timeoutNs = metadata == nullptr ? DEFAULT_TIMEOUT_NS : metadata->timeout_ns;