Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87edc66e authored by Andy Hung's avatar Andy Hung Committed by Mikhail Naganov
Browse files

Audio: Add memory leak checking for HAL 

$ adb shell setprop libc.debug.malloc.program android.hardware.audio.service
$ adb shell setprop libc.debug.malloc.options backtrace=8
$ adb shell setenforce 0
$ adb shell pkill audioserver
$ adb shell dumpsys media.audio_flinger

Test: Check the audio flinger dumpsys as above.
Bug: 186054996
Bug: 187462632
Change-Id: I2e8db14b816cc4cd7e1420c538505bf71fa58c97
(cherry picked from commit 8f836b94)
Merged-In: I2e8db14b816cc4cd7e1420c538505bf71fa58c97
parent 8b389e11

audio/core/all-versions/default/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ cc_defaults { 
        "libhidlbase",

        "liblog",

        "libmedia_helper",

        "libmediautils_vendor",

        "libmemunreachable",

        "libutils",

        "android.hardware.audio.common-util",

    ],

audio/core/all-versions/default/Device.cpp

+27 −2
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ 
#include <algorithm>



#include <android/log.h>

#include <mediautils/MemoryLeakTrackUtil.h>

#include <memunreachable/memunreachable.h>



#include <HidlUtils.h>
@@ -501,9 +503,32 @@ Return<void> Device::debugDump(const hidl_handle& fd) { 
}

#endif



Return<void> Device::debug(const hidl_handle& fd, const hidl_vec<hidl_string>& /* options */) {

Return<void> Device::debug(const hidl_handle& fd, const hidl_vec<hidl_string>& options) {

    if (fd.getNativeHandle() != nullptr && fd->numFds == 1) {

        analyzeStatus("dump", mDevice->dump(mDevice, fd->data[0]));

        const int fd0 = fd->data[0];

        bool dumpMem = false;

        bool unreachableMemory = false;

        for (const auto& option : options) {

            if (option == "-m") {

                dumpMem = true;

            } else if (option == "--unreachable") {

                unreachableMemory = true;

            }

        }



        if (dumpMem) {

            dprintf(fd0, "\nDumping memory:\n");

            std::string s = dumpMemoryAddresses(100 /* limit */);

            write(fd0, s.c_str(), s.size());

        }

        if (unreachableMemory) {

            dprintf(fd0, "\nDumping unreachable memory:\n");

            // TODO - should limit be an argument parameter?

            std::string s = GetUnreachableMemoryString(true /* contents */, 100 /* limit */);

            write(fd0, s.c_str(), s.size());

        }



        analyzeStatus("dump", mDevice->dump(mDevice, fd0));

    }

    return Void();

}