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

Commit 16db9b7c authored by Mikhail Naganov's avatar Mikhail Naganov
Browse files

audio: Improve debug logging in the AIDL version, fix bugs 

- Make sure the AIDL default implementation has debug output enabled.
- Log additional info in the AIDL VTS to facilitate debugging.
- Make resource handler classes move-only types.

Bug: 205884982
Test: atest VtsHalAudioCoreTargetTest
Merged-In: I111b72aaf12962f00b4d31b8ac87186bca5eb853
Change-Id: I111b72aaf12962f00b4d31b8ac87186bca5eb853
(cherry picked from commit f82fc647)
parent f84d6401

audio/aidl/default/Module.cpp

+1 −0
Original line number Diff line number Diff line
@@ -424,6 +424,7 @@ ndk::ScopedAStatus Module::openOutputStream(int32_t in_portConfigId, 
}



ndk::ScopedAStatus Module::setAudioPatch(const AudioPatch& in_requested, AudioPatch* _aidl_return) {

    LOG(DEBUG) << __func__ << ": requested patch " << in_requested.toString();

    if (in_requested.sourcePortConfigIds.empty()) {

        LOG(ERROR) << __func__ << ": requested patch has empty sources list";

        return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);

audio/aidl/default/main.cpp

+6 −4
Original line number Diff line number Diff line
@@ -25,20 +25,22 @@ using aidl::android::hardware::audio::core::Config; 
using aidl::android::hardware::audio::core::Module;



int main() {

    // This is a debug implementation, always enable debug logging.

    android::base::SetMinimumLogSeverity(::android::base::DEBUG);

    ABinderProcess_setThreadPoolMaxThreadCount(16);



    // make the default config service

    // Make the default config service

    auto config = ndk::SharedRefBase::make<Config>();

    const std::string configName = std::string() + Config::descriptor + "/default";

    binder_status_t status =

            AServiceManager_addService(config->asBinder().get(), configName.c_str());

    CHECK(status == STATUS_OK);

    CHECK_EQ(STATUS_OK, status);



    // make the default module

    // Make the default module

    auto moduleDefault = ndk::SharedRefBase::make<Module>();

    const std::string moduleDefaultName = std::string() + Module::descriptor + "/default";

    status = AServiceManager_addService(moduleDefault->asBinder().get(), moduleDefaultName.c_str());

    CHECK(status == STATUS_OK);

    CHECK_EQ(STATUS_OK, status);



    ABinderProcess_joinThreadPool();

    return EXIT_FAILURE;  // should not reach

audio/aidl/vts/ModuleConfig.cpp

+5 −5
Original line number Diff line number Diff line
@@ -251,15 +251,15 @@ std::string ModuleConfig::toString() const { 
    std::string result;

    result.append("Ports: ");

    result.append(android::internal::ToString(mPorts));

    result.append("Initial configs: ");

    result.append("\nInitial configs: ");

    result.append(android::internal::ToString(mInitialConfigs));

    result.append("Attached sink device ports: ");

    result.append("\nAttached sink device ports: ");

    result.append(android::internal::ToString(mAttachedSinkDevicePorts));

    result.append("Attached source device ports: ");

    result.append("\nAttached source device ports: ");

    result.append(android::internal::ToString(mAttachedSourceDevicePorts));

    result.append("External device ports: ");

    result.append("\nExternal device ports: ");

    result.append(android::internal::ToString(mExternalDevicePorts));

    result.append("Routes: ");

    result.append("\nRoutes: ");

    result.append(android::internal::ToString(mRoutes));

    return result;

}

audio/aidl/vts/VtsHalAudioCoreTargetTest.cpp

+46 −9
Original line number Diff line number Diff line
@@ -138,12 +138,18 @@ constexpr IsInput<IStreamOut>::operator bool() const { 
    return false;

}



// All 'With*' classes are move-only because they are associated with some

// resource or state of a HAL module.

class WithDebugFlags {

  public:

    static WithDebugFlags createNested(const WithDebugFlags& parent) {

        return WithDebugFlags(parent.mFlags);

    }



    WithDebugFlags() {}

    explicit WithDebugFlags(const ModuleDebug& initial) : mInitial(initial), mFlags(initial) {}

    explicit WithDebugFlags(const WithDebugFlags& initial)

        : mInitial(initial.mFlags), mFlags(initial.mFlags) {}

    WithDebugFlags(const WithDebugFlags&) = delete;

    WithDebugFlags& operator=(const WithDebugFlags&) = delete;

    ~WithDebugFlags() {

        if (mModule != nullptr) {

            ScopedAStatus status = mModule->setModuleDebug(mInitial);
@@ -170,6 +176,8 @@ class WithAudioPortConfig { 
  public:

    WithAudioPortConfig() {}

    explicit WithAudioPortConfig(const AudioPortConfig& config) : mInitialConfig(config) {}

    WithAudioPortConfig(const WithAudioPortConfig&) = delete;

    WithAudioPortConfig& operator=(const WithAudioPortConfig&) = delete;

    ~WithAudioPortConfig() {

        if (mModule != nullptr) {

            ScopedAStatus status = mModule->resetAudioPortConfig(getId());
@@ -326,6 +334,8 @@ class WithDevicePortConnectedState { 
    explicit WithDevicePortConnectedState(const AudioPort& idAndData) : mIdAndData(idAndData) {}

    WithDevicePortConnectedState(const AudioPort& id, const AudioDeviceAddress& address)

        : mIdAndData(setAudioPortAddress(id, address)) {}

    WithDevicePortConnectedState(const WithDevicePortConnectedState&) = delete;

    WithDevicePortConnectedState& operator=(const WithDevicePortConnectedState&) = delete;

    ~WithDevicePortConnectedState() {

        if (mModule != nullptr) {

            ScopedAStatus status = mModule->disconnectExternalDevice(getId());
@@ -362,6 +372,8 @@ class WithStream { 
  public:

    WithStream() {}

    explicit WithStream(const AudioPortConfig& portConfig) : mPortConfig(portConfig) {}

    WithStream(const WithStream&) = delete;

    WithStream& operator=(const WithStream&) = delete;

    ~WithStream() {

        if (mStream != nullptr) {

            ScopedAStatus status = mStream->close();
@@ -421,6 +433,8 @@ class WithAudioPatch { 
    WithAudioPatch() {}

    WithAudioPatch(const AudioPortConfig& srcPortConfig, const AudioPortConfig& sinkPortConfig)

        : mSrcPortConfig(srcPortConfig), mSinkPortConfig(sinkPortConfig) {}

    WithAudioPatch(const WithAudioPatch&) = delete;

    WithAudioPatch& operator=(const WithAudioPatch&) = delete;

    ~WithAudioPatch() {

        if (mModule != nullptr && mPatch.id != 0) {

            ScopedAStatus status = mModule->resetAudioPatch(mPatch.id);
@@ -655,6 +669,12 @@ TEST_P(AudioCoreModule, GetAudioPort) { 
    }

}



TEST_P(AudioCoreModule, SetUpModuleConfig) {

    ASSERT_NO_FATAL_FAILURE(SetUpModuleConfig());

    // Send the module config to logcat to facilitate failures investigation.

    LOG(INFO) << "SetUpModuleConfig: " << moduleConfig->toString();

}



// Verify that HAL module reports for a connected device port at least one non-dynamic profile,

// that is, a profile with actual supported configuration.

// Note: This test relies on simulation of external device connections by the HAL module.
@@ -882,7 +902,7 @@ TEST_P(AudioCoreModule, TryConnectMissingDevice) { 
        GTEST_SKIP() << "No external devices in the module.";

    }

    AudioPort ignored;

    WithDebugFlags doNotSimulateConnections(debug);

    WithDebugFlags doNotSimulateConnections = WithDebugFlags::createNested(debug);

    doNotSimulateConnections.flags().simulateDeviceConnections = false;

    ASSERT_NO_FATAL_FAILURE(doNotSimulateConnections.SetUp(module.get()));

    for (const auto& port : ports) {
@@ -1134,9 +1154,8 @@ class AudioStream : public AudioCoreModule { 
                    ScopedAStatus status = stream.SetUpNoChecks(module.get());

                    EXPECT_EQ(EX_ILLEGAL_STATE, status.getExceptionCode())

                            << status << " open" << direction(true)

                            << "Stream"

                               " returned for port config ID "

                            << stream.getPortId() << ", maxOpenStreamCount is " << maxStreamCount;

                            << "Stream returned for port config ID " << stream.getPortId()

                            << ", maxOpenStreamCount is " << maxStreamCount;

                }

            }

        }
@@ -1331,11 +1350,12 @@ class AudioModulePatch : public AudioCoreModule { 
        }

        for (const auto& srcSinkGroup : srcSinkGroups) {

            const auto& route = srcSinkGroup.first;

            std::vector<WithAudioPatch> patches;

            std::vector<std::unique_ptr<WithAudioPatch>> patches;

            for (const auto& srcSink : srcSinkGroup.second) {

                if (!route.isExclusive) {

                    patches.emplace_back(srcSink.first, srcSink.second);

                    EXPECT_NO_FATAL_FAILURE(patches[patches.size() - 1].SetUp(module.get()));

                    patches.push_back(

                            std::make_unique<WithAudioPatch>(srcSink.first, srcSink.second));

                    EXPECT_NO_FATAL_FAILURE(patches[patches.size() - 1]->SetUp(module.get()));

                } else {

                    WithAudioPatch patch(srcSink.first, srcSink.second);

                    EXPECT_NO_FATAL_FAILURE(patch.SetUp(module.get()));
@@ -1423,8 +1443,25 @@ INSTANTIATE_TEST_SUITE_P(AudioPatchTest, AudioModulePatch, 
                         android::PrintInstanceNameToString);

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(AudioModulePatch);



class TestExecutionTracer : public ::testing::EmptyTestEventListener {

  public:

    void OnTestStart(const ::testing::TestInfo& test_info) override {

        TraceTestState("Started", test_info);

    }



    void OnTestEnd(const ::testing::TestInfo& test_info) override {

        TraceTestState("Completed", test_info);

    }



  private:

    static void TraceTestState(const std::string& state, const ::testing::TestInfo& test_info) {

        LOG(INFO) << state << " " << test_info.test_suite_name() << "::" << test_info.name();

    }

};



int main(int argc, char** argv) {

    ::testing::InitGoogleTest(&argc, argv);

    ::testing::UnitTest::GetInstance()->listeners().Append(new TestExecutionTracer());

    ABinderProcess_setThreadPoolMaxThreadCount(1);

    ABinderProcess_startThreadPool();

    return RUN_ALL_TESTS();