From 8aa793fdf3ffad22040a03f1453228d972ccba5a Mon Sep 17 00:00:00 2001 From: Kalesh Singh Date: Wed, 16 Dec 2020 00:19:38 +0000 Subject: Revert "libmemtrack: Add support for AIDL memtrack HAL" Revert "Add stable aidl memtrack HAL to product packages" Revert "Add stable aidl memtrack hal to vndk list" Revert "Memtrack HAL stable aidl sepolicy" Revert "Add android.hardware.memtrack-unstable-ndk_platform" Revert submission 1518702-memtrack-aidl Reason for revert: Broken tests and boot time regressions Reverted Changes: Ic4dd70e2c:Add android.hardware.memtrack-unstable-ndk_platfor... Iaf99d0ca4:Add stable aidl memtrack HAL to product packages Iac54ae2ba:Add stable aidl memtrack hal to vndk list If310210a3:libmemtrack: Add support for AIDL memtrack HAL Ib6c634def:Memtrack HAL: Add stable AIDL implementation I5e1d0e006:Memtrack HAL stable aidl sepolicy Change-Id: I25c24458138e3c967e0d67a40e103487f10a1a07 --- Android.bp | 2 -- memtrack.cpp | 73 +++--------------------------------------------------------- 2 files changed, 3 insertions(+), 72 deletions(-) diff --git a/Android.bp b/Android.bp index 3696acd..9322746 100644 --- a/Android.bp +++ b/Android.bp @@ -12,14 +12,12 @@ cc_library_shared { local_include_dirs: ["include"], include_dirs: ["hardware/libhardware/include"], shared_libs: [ - "libbinder_ndk", "libhardware", "liblog", "libbase", "libhidlbase", "libutils", "android.hardware.memtrack@1.0", - "android.hardware.memtrack-unstable-ndk_platform", ], cflags: [ "-Wall", diff --git a/memtrack.cpp b/memtrack.cpp index 7726942..3fc24c8 100644 --- a/memtrack.cpp +++ b/memtrack.cpp @@ -14,18 +14,14 @@ * limitations under the License. */ #define LOG_TAG "memtrack" - -#include -#include -#include #include #include #include #include +#include #include #include -#include #include @@ -37,41 +33,6 @@ using android::hardware::memtrack::V1_0::MemtrackStatus; using android::hardware::hidl_vec; using android::hardware::Return; -namespace V1_0 = android::hardware::memtrack::V1_0; -namespace V_aidl = aidl::android::hardware::memtrack; - -// Check Memtrack Flags -static_assert(static_cast(V1_0::MemtrackFlag::SMAPS_ACCOUNTED) == - static_cast(V_aidl::MemtrackRecord::FLAG_SMAPS_ACCOUNTED)); -static_assert(static_cast(V1_0::MemtrackFlag::SMAPS_UNACCOUNTED) == - static_cast(V_aidl::MemtrackRecord::FLAG_SMAPS_UNACCOUNTED)); -static_assert(static_cast(V1_0::MemtrackFlag::SHARED) == - static_cast(V_aidl::MemtrackRecord::FLAG_SHARED)); -static_assert(static_cast(V1_0::MemtrackFlag::SHARED_PSS) == - static_cast(V_aidl::MemtrackRecord::FLAG_SHARED_PSS)); -static_assert(static_cast(V1_0::MemtrackFlag::PRIVATE) == - static_cast(V_aidl::MemtrackRecord::FLAG_PRIVATE)); -static_assert(static_cast(V1_0::MemtrackFlag::SYSTEM) == - static_cast(V_aidl::MemtrackRecord::FLAG_SYSTEM)); -static_assert(static_cast(V1_0::MemtrackFlag::DEDICATED) == - static_cast(V_aidl::MemtrackRecord::FLAG_DEDICATED)); -static_assert(static_cast(V1_0::MemtrackFlag::NONSECURE) == - static_cast(V_aidl::MemtrackRecord::FLAG_NONSECURE)); -static_assert(static_cast(V1_0::MemtrackFlag::SECURE) == - static_cast(V_aidl::MemtrackRecord::FLAG_SECURE)); - -// Check Memtrack Types -static_assert(static_cast(V1_0::MemtrackType::OTHER) == - static_cast(V_aidl::MemtrackType::OTHER)); -static_assert(static_cast(V1_0::MemtrackType::GL) == - static_cast(V_aidl::MemtrackType::GL)); -static_assert(static_cast(V1_0::MemtrackType::GRAPHICS) == - static_cast(V_aidl::MemtrackType::GRAPHICS)); -static_assert(static_cast(V1_0::MemtrackType::MULTIMEDIA) == - static_cast(V_aidl::MemtrackType::MULTIMEDIA)); -static_assert(static_cast(V1_0::MemtrackType::CAMERA) == - static_cast(V_aidl::MemtrackType::CAMERA)); - struct memtrack_proc_type { MemtrackType type; std::vector records; @@ -83,7 +44,7 @@ struct memtrack_proc { }; //TODO(b/31632518) -static android::sp get_hidl_instance() { +static android::sp get_instance() { static android::sp module = IMemtrack::getService(); static bool logged = false; if (module == nullptr && !logged) { @@ -93,14 +54,6 @@ static android::sp get_hidl_instance() { return module; } - -inline std::shared_ptr get_aidl_instance() { - const auto instance = - std::string() + V_aidl::IMemtrack::descriptor + "/default"; - auto memtrackBinder = ndk::SpAIBinder(AServiceManager_getService(instance.c_str())); - return V_aidl::IMemtrack::fromBinder(memtrackBinder); -} - memtrack_proc *memtrack_proc_new(void) { return new memtrack_proc(); @@ -115,27 +68,7 @@ static int memtrack_proc_get_type(memtrack_proc_type *t, pid_t pid, MemtrackType type) { int err = 0; - - std::shared_ptr service= get_aidl_instance(); - if (service) { - std::vector records; - auto status = service->getMemory( - pid, static_cast(static_cast(type)), &records); - - if (!status.isOk()) { - return -1; - } - - t->records.resize(records.size()); - for (size_t i = 0; i < records.size(); i++) { - t->records[i].sizeInBytes = records[i].sizeInBytes; - t->records[i].flags = records[i].flags; - } - - return err; - } - - android::sp memtrack = get_hidl_instance(); + android::sp memtrack = get_instance(); if (memtrack == nullptr) return -1; -- cgit v1.2.3