AIDL BufferPool implementation (HIDL -> AIDL)
Bug: 254050250
Test: m
Merged-In: I0d7bae2c01bd480d1e99f4b39c4a9013a2828897
Change-Id: I0d7bae2c01bd480d1e99f4b39c4a9013a2828897
diff --git a/media/bufferpool/aidl/default/tests/Android.bp b/media/bufferpool/aidl/default/tests/Android.bp
new file mode 100644
index 0000000..549af57
--- /dev/null
+++ b/media/bufferpool/aidl/default/tests/Android.bp
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2022 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.
+ */
+
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "frameworks_av_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["hardware_interfaces_license"],
+}
+
+cc_test {
+ name: "VtsVndkAidlBufferpool2V1_0TargetSingleTest",
+ test_suites: ["device-tests"],
+ defaults: ["VtsHalTargetTestDefaults"],
+ srcs: [
+ "allocator.cpp",
+ "single.cpp",
+ ],
+ shared_libs: [
+ "libbinder_ndk",
+ "libcutils",
+ "libfmq",
+ "liblog",
+ "libutils",
+ "android.hardware.media.bufferpool2-V1-ndk",
+ ],
+ static_libs: [
+ "libaidlcommonsupport",
+ "libstagefright_aidl_bufferpool2"
+ ],
+ compile_multilib: "both",
+}
+
+cc_test {
+ name: "VtsVndkAidlBufferpool2V1_0TargetMultiTest",
+ test_suites: ["device-tests"],
+ defaults: ["VtsHalTargetTestDefaults"],
+ srcs: [
+ "allocator.cpp",
+ "multi.cpp",
+ ],
+ shared_libs: [
+ "libbinder_ndk",
+ "libcutils",
+ "libfmq",
+ "liblog",
+ "libutils",
+ "android.hardware.media.bufferpool2-V1-ndk",
+ ],
+ static_libs: [
+ "libaidlcommonsupport",
+ "libstagefright_aidl_bufferpool2"
+ ],
+ compile_multilib: "both",
+}
+
+cc_test {
+ name: "VtsVndkAidlBufferpool2V1_0TargetCondTest",
+ test_suites: ["device-tests"],
+ defaults: ["VtsHalTargetTestDefaults"],
+ srcs: [
+ "allocator.cpp",
+ "cond.cpp",
+ ],
+ shared_libs: [
+ "libbinder_ndk",
+ "libcutils",
+ "libfmq",
+ "liblog",
+ "libutils",
+ "android.hardware.media.bufferpool2-V1-ndk",
+ ],
+ static_libs: [
+ "libaidlcommonsupport",
+ "libstagefright_aidl_bufferpool2"
+ ],
+ compile_multilib: "both",
+}
diff --git a/media/bufferpool/aidl/default/tests/BufferpoolUnitTest.cpp b/media/bufferpool/aidl/default/tests/BufferpoolUnitTest.cpp
deleted file mode 100644
index b448405..0000000
--- a/media/bufferpool/aidl/default/tests/BufferpoolUnitTest.cpp
+++ /dev/null
@@ -1,541 +0,0 @@
-/*
- * 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.
- */
-
-//#define LOG_NDEBUG 0
-#define LOG_TAG "BufferpoolUnitTest"
-#include <utils/Log.h>
-
-#include <binder/ProcessState.h>
-#include <bufferpool/ClientManager.h>
-#include <gtest/gtest.h>
-#include <hidl/LegacySupport.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <unordered_set>
-#include <vector>
-#include "allocator.h"
-
-using android::hardware::configureRpcThreadpool;
-using android::hardware::media::bufferpool::BufferPoolData;
-using android::hardware::media::bufferpool::V2_0::IClientManager;
-using android::hardware::media::bufferpool::V2_0::ResultStatus;
-using android::hardware::media::bufferpool::V2_0::implementation::BufferId;
-using android::hardware::media::bufferpool::V2_0::implementation::ClientManager;
-using android::hardware::media::bufferpool::V2_0::implementation::ConnectionId;
-using android::hardware::media::bufferpool::V2_0::implementation::TransactionId;
-
-using namespace android;
-
-// communication message types between processes.
-enum PipeCommand : int32_t {
- INIT,
- TRANSFER,
- STOP,
-
- INIT_OK,
- INIT_ERROR,
- TRANSFER_OK,
- TRANSFER_ERROR,
- STOP_OK,
- STOP_ERROR,
-};
-
-// communication message between processes.
-union PipeMessage {
- struct {
- int32_t command;
- int32_t memsetValue;
- BufferId bufferId;
- ConnectionId connectionId;
- TransactionId transactionId;
- int64_t timestampUs;
- } data;
- char array[0];
-};
-
-static int32_t kNumIterationCount = 10;
-
-class BufferpoolTest {
- public:
- BufferpoolTest() : mConnectionValid(false), mManager(nullptr), mAllocator(nullptr) {
- mConnectionId = -1;
- mReceiverId = -1;
- }
-
- ~BufferpoolTest() {
- if (mConnectionValid) {
- mManager->close(mConnectionId);
- }
- }
-
- protected:
- bool mConnectionValid;
- ConnectionId mConnectionId;
- ConnectionId mReceiverId;
-
- android::sp<ClientManager> mManager;
- std::shared_ptr<BufferPoolAllocator> mAllocator;
-
- void setupBufferpoolManager();
-};
-
-void BufferpoolTest::setupBufferpoolManager() {
- // retrieving per process bufferpool object sp<ClientManager>
- mManager = ClientManager::getInstance();
- ASSERT_NE(mManager, nullptr) << "unable to get ClientManager\n";
-
- mAllocator = std::make_shared<TestBufferPoolAllocator>();
- ASSERT_NE(mAllocator, nullptr) << "unable to create TestBufferPoolAllocator\n";
-
- // set-up local bufferpool connection for sender
- ResultStatus status = mManager->create(mAllocator, &mConnectionId);
- ASSERT_EQ(status, ResultStatus::OK)
- << "unable to set-up local bufferpool connection for sender\n";
- mConnectionValid = true;
-}
-
-class BufferpoolUnitTest : public BufferpoolTest, public ::testing::Test {
- public:
- virtual void SetUp() override { setupBufferpoolManager(); }
-
- virtual void TearDown() override {}
-};
-
-class BufferpoolFunctionalityTest : public BufferpoolTest, public ::testing::Test {
- public:
- virtual void SetUp() override {
- mReceiverPid = -1;
-
- ASSERT_TRUE(pipe(mCommandPipeFds) == 0) << "pipe connection failed for commandPipe\n";
- ASSERT_TRUE(pipe(mResultPipeFds) == 0) << "pipe connection failed for resultPipe\n";
-
- mReceiverPid = fork();
- ASSERT_TRUE(mReceiverPid >= 0) << "fork failed\n";
-
- if (mReceiverPid == 0) {
- doReceiver();
- // In order to ignore gtest behaviour, wait for being killed from tearDown
- pause();
- }
- setupBufferpoolManager();
- }
-
- virtual void TearDown() override {
- if (mReceiverPid > 0) {
- kill(mReceiverPid, SIGKILL);
- int wstatus;
- wait(&wstatus);
- }
- }
-
- protected:
- pid_t mReceiverPid;
- int mCommandPipeFds[2];
- int mResultPipeFds[2];
-
- bool sendMessage(int* pipes, const PipeMessage& message) {
- int ret = write(pipes[1], message.array, sizeof(PipeMessage));
- return ret == sizeof(PipeMessage);
- }
-
- bool receiveMessage(int* pipes, PipeMessage* message) {
- int ret = read(pipes[0], message->array, sizeof(PipeMessage));
- return ret == sizeof(PipeMessage);
- }
-
- void doReceiver();
-};
-
-void BufferpoolFunctionalityTest::doReceiver() {
- // Configures the threadpool used for handling incoming RPC calls in this process.
- configureRpcThreadpool(1 /*threads*/, false /*willJoin*/);
- bool receiverRunning = true;
- while (receiverRunning) {
- PipeMessage message;
- receiveMessage(mCommandPipeFds, &message);
- ResultStatus err = ResultStatus::OK;
- switch (message.data.command) {
- case PipeCommand::INIT: {
- // receiver manager creation
- mManager = ClientManager::getInstance();
- if (!mManager) {
- message.data.command = PipeCommand::INIT_ERROR;
- sendMessage(mResultPipeFds, message);
- return;
- }
-
- android::status_t status = mManager->registerAsService();
- if (status != android::OK) {
- message.data.command = PipeCommand::INIT_ERROR;
- sendMessage(mResultPipeFds, message);
- return;
- }
- message.data.command = PipeCommand::INIT_OK;
- sendMessage(mResultPipeFds, message);
- break;
- }
- case PipeCommand::TRANSFER: {
- native_handle_t* receiveHandle = nullptr;
- std::shared_ptr<BufferPoolData> receiveBuffer;
- err = mManager->receive(message.data.connectionId, message.data.transactionId,
- message.data.bufferId, message.data.timestampUs,
- &receiveHandle, &receiveBuffer);
- if (err != ResultStatus::OK) {
- message.data.command = PipeCommand::TRANSFER_ERROR;
- sendMessage(mResultPipeFds, message);
- return;
- }
- if (!TestBufferPoolAllocator::Verify(receiveHandle, message.data.memsetValue)) {
- message.data.command = PipeCommand::TRANSFER_ERROR;
- sendMessage(mResultPipeFds, message);
- return;
- }
- if (receiveHandle) {
- native_handle_close(receiveHandle);
- native_handle_delete(receiveHandle);
- }
- receiveHandle = nullptr;
- receiveBuffer.reset();
- message.data.command = PipeCommand::TRANSFER_OK;
- sendMessage(mResultPipeFds, message);
- break;
- }
- case PipeCommand::STOP: {
- err = mManager->close(message.data.connectionId);
- if (err != ResultStatus::OK) {
- message.data.command = PipeCommand::STOP_ERROR;
- sendMessage(mResultPipeFds, message);
- return;
- }
- message.data.command = PipeCommand::STOP_OK;
- sendMessage(mResultPipeFds, message);
- receiverRunning = false;
- break;
- }
- default:
- ALOGE("unknown command. try again");
- break;
- }
- }
-}
-
-// Buffer allocation test.
-// Check whether each buffer allocation is done successfully with unique buffer id.
-TEST_F(BufferpoolUnitTest, AllocateBuffer) {
- std::vector<uint8_t> vecParams;
- getTestAllocatorParams(&vecParams);
-
- std::vector<std::shared_ptr<BufferPoolData>> buffers{};
- std::vector<native_handle_t*> allocHandle{};
- ResultStatus status;
- for (int i = 0; i < kNumIterationCount; ++i) {
- native_handle_t* handle = nullptr;
- std::shared_ptr<BufferPoolData> buffer{};
- status = mManager->allocate(mConnectionId, vecParams, &handle, &buffer);
- ASSERT_EQ(status, ResultStatus::OK) << "allocate failed for " << i << "iteration";
-
- buffers.push_back(std::move(buffer));
- if (handle) {
- allocHandle.push_back(std::move(handle));
- }
- }
-
- for (int i = 0; i < kNumIterationCount; ++i) {
- for (int j = i + 1; j < kNumIterationCount; ++j) {
- ASSERT_TRUE(buffers[i]->mId != buffers[j]->mId) << "allocated buffers are not unique";
- }
- }
- // delete the buffer handles
- for (auto handle : allocHandle) {
- native_handle_close(handle);
- native_handle_delete(handle);
- }
- // clear the vectors
- buffers.clear();
- allocHandle.clear();
-}
-
-// Buffer recycle test.
-// Check whether de-allocated buffers are recycled.
-TEST_F(BufferpoolUnitTest, RecycleBuffer) {
- std::vector<uint8_t> vecParams;
- getTestAllocatorParams(&vecParams);
-
- ResultStatus status;
- std::vector<BufferId> bid{};
- std::vector<native_handle_t*> allocHandle{};
- for (int i = 0; i < kNumIterationCount; ++i) {
- native_handle_t* handle = nullptr;
- std::shared_ptr<BufferPoolData> buffer;
- status = mManager->allocate(mConnectionId, vecParams, &handle, &buffer);
- ASSERT_EQ(status, ResultStatus::OK) << "allocate failed for " << i << "iteration";
-
- bid.push_back(buffer->mId);
- if (handle) {
- allocHandle.push_back(std::move(handle));
- }
- buffer.reset();
- }
-
- std::unordered_set<BufferId> set(bid.begin(), bid.end());
- ASSERT_EQ(set.size(), 1) << "buffers are not recycled properly";
-
- // delete the buffer handles
- for (auto handle : allocHandle) {
- native_handle_close(handle);
- native_handle_delete(handle);
- }
- allocHandle.clear();
-}
-
-// Validate cache evict and invalidate APIs.
-TEST_F(BufferpoolUnitTest, FlushTest) {
- std::vector<uint8_t> vecParams;
- getTestAllocatorParams(&vecParams);
-
- ResultStatus status = mManager->registerSender(mManager, mConnectionId, &mReceiverId);
- ASSERT_TRUE(status == ResultStatus::ALREADY_EXISTS && mReceiverId == mConnectionId);
-
- // testing empty flush
- status = mManager->flush(mConnectionId);
- ASSERT_EQ(status, ResultStatus::OK) << "failed to flush connection : " << mConnectionId;
-
- std::vector<std::shared_ptr<BufferPoolData>> senderBuffer{};
- std::vector<native_handle_t*> allocHandle{};
- std::vector<TransactionId> tid{};
- std::vector<int64_t> timestampUs{};
-
- std::map<TransactionId, BufferId> bufferMap{};
-
- for (int i = 0; i < kNumIterationCount; i++) {
- int64_t postUs;
- TransactionId transactionId;
- native_handle_t* handle = nullptr;
- std::shared_ptr<BufferPoolData> buffer{};
- status = mManager->allocate(mConnectionId, vecParams, &handle, &buffer);
- ASSERT_EQ(status, ResultStatus::OK) << "allocate failed for " << i << " iteration";
-
- ASSERT_TRUE(TestBufferPoolAllocator::Fill(handle, i));
-
- status = mManager->postSend(mReceiverId, buffer, &transactionId, &postUs);
- ASSERT_EQ(status, ResultStatus::OK) << "unable to post send transaction on bufferpool";
-
- timestampUs.push_back(postUs);
- tid.push_back(transactionId);
- bufferMap.insert({transactionId, buffer->mId});
-
- senderBuffer.push_back(std::move(buffer));
- if (handle) {
- allocHandle.push_back(std::move(handle));
- }
- buffer.reset();
- }
-
- status = mManager->flush(mConnectionId);
- ASSERT_EQ(status, ResultStatus::OK) << "failed to flush connection : " << mConnectionId;
-
- std::shared_ptr<BufferPoolData> receiverBuffer{};
- native_handle_t* recvHandle = nullptr;
- for (int i = 0; i < kNumIterationCount; i++) {
- status = mManager->receive(mReceiverId, tid[i], senderBuffer[i]->mId, timestampUs[i],
- &recvHandle, &receiverBuffer);
- ASSERT_EQ(status, ResultStatus::OK) << "receive failed for buffer " << senderBuffer[i]->mId;
-
- // find the buffer id from transaction id
- auto findIt = bufferMap.find(tid[i]);
- ASSERT_NE(findIt, bufferMap.end()) << "inconsistent buffer mapping";
-
- // buffer id received must be same as the buffer id sent
- ASSERT_EQ(findIt->second, receiverBuffer->mId) << "invalid buffer received";
-
- ASSERT_TRUE(TestBufferPoolAllocator::Verify(recvHandle, i))
- << "Message received not same as that sent";
-
- bufferMap.erase(findIt);
- if (recvHandle) {
- native_handle_close(recvHandle);
- native_handle_delete(recvHandle);
- }
- recvHandle = nullptr;
- receiverBuffer.reset();
- }
-
- ASSERT_EQ(bufferMap.size(), 0) << "buffers received is less than the number of buffers sent";
-
- for (auto handle : allocHandle) {
- native_handle_close(handle);
- native_handle_delete(handle);
- }
- allocHandle.clear();
- senderBuffer.clear();
- timestampUs.clear();
-}
-
-// Buffer transfer test between processes.
-TEST_F(BufferpoolFunctionalityTest, TransferBuffer) {
- // initialize the receiver
- PipeMessage message;
- message.data.command = PipeCommand::INIT;
- sendMessage(mCommandPipeFds, message);
- ASSERT_TRUE(receiveMessage(mResultPipeFds, &message)) << "receiveMessage failed\n";
- ASSERT_EQ(message.data.command, PipeCommand::INIT_OK) << "receiver init failed";
-
- android::sp<IClientManager> receiver = IClientManager::getService();
- ASSERT_NE(receiver, nullptr) << "getService failed for receiver\n";
-
- ConnectionId receiverId;
- ResultStatus status = mManager->registerSender(receiver, mConnectionId, &receiverId);
- ASSERT_EQ(status, ResultStatus::OK)
- << "registerSender failed for connection id " << mConnectionId << "\n";
-
- std::vector<uint8_t> vecParams;
- getTestAllocatorParams(&vecParams);
-
- for (int i = 0; i < kNumIterationCount; ++i) {
- native_handle_t* handle = nullptr;
- std::shared_ptr<BufferPoolData> buffer;
- status = mManager->allocate(mConnectionId, vecParams, &handle, &buffer);
- ASSERT_EQ(status, ResultStatus::OK) << "allocate failed for " << i << "iteration";
-
- ASSERT_TRUE(TestBufferPoolAllocator::Fill(handle, i))
- << "Fill fail for buffer handle " << handle << "\n";
-
- // send the buffer to the receiver
- int64_t postUs;
- TransactionId transactionId;
- status = mManager->postSend(receiverId, buffer, &transactionId, &postUs);
- ASSERT_EQ(status, ResultStatus::OK)
- << "postSend failed for receiver " << receiverId << "\n";
-
- // PipeMessage message;
- message.data.command = PipeCommand::TRANSFER;
- message.data.memsetValue = i;
- message.data.bufferId = buffer->mId;
- message.data.connectionId = receiverId;
- message.data.transactionId = transactionId;
- message.data.timestampUs = postUs;
- sendMessage(mCommandPipeFds, message);
- // delete buffer handle
- if (handle) {
- native_handle_close(handle);
- native_handle_delete(handle);
- }
- ASSERT_TRUE(receiveMessage(mResultPipeFds, &message)) << "receiveMessage failed\n";
- ASSERT_EQ(message.data.command, PipeCommand::TRANSFER_OK)
- << "received error during buffer transfer\n";
- }
- message.data.command = PipeCommand::STOP;
- sendMessage(mCommandPipeFds, message);
- ASSERT_TRUE(receiveMessage(mResultPipeFds, &message)) << "receiveMessage failed\n";
- ASSERT_EQ(message.data.command, PipeCommand::STOP_OK)
- << "received error during buffer transfer\n";
-}
-
-/* Validate bufferpool for following corner cases:
- 1. invalid connectionID
- 2. invalid receiver
- 3. when sender is not registered
- 4. when connection is closed
-*/
-// TODO: Enable when the issue in b/212196495 is fixed
-TEST_F(BufferpoolFunctionalityTest, DISABLED_ValidityTest) {
- std::vector<uint8_t> vecParams;
- getTestAllocatorParams(&vecParams);
-
- std::shared_ptr<BufferPoolData> senderBuffer;
- native_handle_t* allocHandle = nullptr;
-
- // call allocate() on a random connection id
- ConnectionId randomId = rand();
- ResultStatus status = mManager->allocate(randomId, vecParams, &allocHandle, &senderBuffer);
- EXPECT_TRUE(status == ResultStatus::NOT_FOUND);
-
- // initialize the receiver
- PipeMessage message;
- message.data.command = PipeCommand::INIT;
- sendMessage(mCommandPipeFds, message);
- ASSERT_TRUE(receiveMessage(mResultPipeFds, &message)) << "receiveMessage failed\n";
- ASSERT_EQ(message.data.command, PipeCommand::INIT_OK) << "receiver init failed";
-
- allocHandle = nullptr;
- senderBuffer.reset();
- status = mManager->allocate(mConnectionId, vecParams, &allocHandle, &senderBuffer);
-
- ASSERT_TRUE(TestBufferPoolAllocator::Fill(allocHandle, 0x77));
-
- // send buffers w/o registering sender
- int64_t postUs;
- TransactionId transactionId;
-
- // random receiver
- status = mManager->postSend(randomId, senderBuffer, &transactionId, &postUs);
- ASSERT_NE(status, ResultStatus::OK) << "bufferpool shouldn't allow send on random receiver";
-
- // establish connection
- android::sp<IClientManager> receiver = IClientManager::getService();
- ASSERT_NE(receiver, nullptr) << "getService failed for receiver\n";
-
- ConnectionId receiverId;
- status = mManager->registerSender(receiver, mConnectionId, &receiverId);
- ASSERT_EQ(status, ResultStatus::OK)
- << "registerSender failed for connection id " << mConnectionId << "\n";
-
- allocHandle = nullptr;
- senderBuffer.reset();
- status = mManager->allocate(mConnectionId, vecParams, &allocHandle, &senderBuffer);
- ASSERT_EQ(status, ResultStatus::OK) << "allocate failed for connection " << mConnectionId;
-
- ASSERT_TRUE(TestBufferPoolAllocator::Fill(allocHandle, 0x88));
-
- // send the buffer to the receiver
- status = mManager->postSend(receiverId, senderBuffer, &transactionId, &postUs);
- ASSERT_EQ(status, ResultStatus::OK) << "postSend failed for receiver " << receiverId << "\n";
-
- // PipeMessage message;
- message.data.command = PipeCommand::TRANSFER;
- message.data.memsetValue = 0x88;
- message.data.bufferId = senderBuffer->mId;
- message.data.connectionId = receiverId;
- message.data.transactionId = transactionId;
- message.data.timestampUs = postUs;
- sendMessage(mCommandPipeFds, message);
- ASSERT_TRUE(receiveMessage(mResultPipeFds, &message)) << "receiveMessage failed\n";
- ASSERT_EQ(message.data.command, PipeCommand::TRANSFER_OK)
- << "received error during buffer transfer\n";
-
- if (allocHandle) {
- native_handle_close(allocHandle);
- native_handle_delete(allocHandle);
- }
-
- message.data.command = PipeCommand::STOP;
- sendMessage(mCommandPipeFds, message);
- ASSERT_TRUE(receiveMessage(mResultPipeFds, &message)) << "receiveMessage failed\n";
- ASSERT_EQ(message.data.command, PipeCommand::STOP_OK)
- << "received error during buffer transfer\n";
-
- // try to send msg to closed connection
- status = mManager->postSend(receiverId, senderBuffer, &transactionId, &postUs);
- ASSERT_NE(status, ResultStatus::OK) << "bufferpool shouldn't allow send on closed connection";
-}
-
-int main(int argc, char** argv) {
- android::hardware::details::setTrebleTestingOverride(true);
- ::testing::InitGoogleTest(&argc, argv);
- int status = RUN_ALL_TESTS();
- ALOGV("Test result = %d\n", status);
- return status;
-}
diff --git a/media/bufferpool/aidl/default/tests/allocator.cpp b/media/bufferpool/aidl/default/tests/allocator.cpp
index 25b08ef..16b33a6 100644
--- a/media/bufferpool/aidl/default/tests/allocator.cpp
+++ b/media/bufferpool/aidl/default/tests/allocator.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2018 The Android Open Source Project
+ * Copyright (C) 2022 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.
@@ -139,7 +139,7 @@
}
-ResultStatus TestBufferPoolAllocator::allocate(
+BufferPoolStatus TestBufferPoolAllocator::allocate(
const std::vector<uint8_t> ¶ms,
std::shared_ptr<BufferPoolAllocation> *alloc,
size_t *allocSize) {
diff --git a/media/bufferpool/aidl/default/tests/allocator.h b/media/bufferpool/aidl/default/tests/allocator.h
index 862d1a5..7e7203f 100644
--- a/media/bufferpool/aidl/default/tests/allocator.h
+++ b/media/bufferpool/aidl/default/tests/allocator.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2018 The Android Open Source Project
+ * Copyright (C) 2022 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.
@@ -14,17 +14,18 @@
* limitations under the License.
*/
-#ifndef VNDK_HIDL_BUFFERPOOL_V2_0_ALLOCATOR_H
-#define VNDK_HIDL_BUFFERPOOL_V2_0_ALLOCATOR_H
+#pragma once
#include <pthread.h>
-#include <bufferpool/BufferPoolTypes.h>
+#include <bufferpool2/BufferPoolTypes.h>
-using android::hardware::media::bufferpool::V2_0::ResultStatus;
-using android::hardware::media::bufferpool::V2_0::implementation::
+using aidl::android::hardware::media::bufferpool2::implementation::
+ BufferPoolStatus;
+using aidl::android::hardware::media::bufferpool2::implementation::
BufferPoolAllocation;
-using android::hardware::media::bufferpool::V2_0::implementation::
+using aidl::android::hardware::media::bufferpool2::implementation::
BufferPoolAllocator;
+using aidl::android::hardware::media::bufferpool2::ResultStatus;
struct IpcMutex {
pthread_mutex_t lock;
@@ -44,7 +45,7 @@
~TestBufferPoolAllocator() override {}
- ResultStatus allocate(const std::vector<uint8_t> ¶ms,
+ BufferPoolStatus allocate(const std::vector<uint8_t> ¶ms,
std::shared_ptr<BufferPoolAllocation> *alloc,
size_t *allocSize) override;
@@ -60,9 +61,7 @@
static bool UnmapMemoryForMutex(void *mem);
};
-// retrieve buffer allocator paramters
+// retrieve buffer allocator parameters
void getTestAllocatorParams(std::vector<uint8_t> *params);
void getIpcMutexParams(std::vector<uint8_t> *params);
-
-#endif // VNDK_HIDL_BUFFERPOOL_V2_0_ALLOCATOR_H
diff --git a/media/bufferpool/aidl/default/tests/cond.cpp b/media/bufferpool/aidl/default/tests/cond.cpp
index 21beea8..6d469ce 100644
--- a/media/bufferpool/aidl/default/tests/cond.cpp
+++ b/media/bufferpool/aidl/default/tests/cond.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2018 The Android Open Source Project
+ * Copyright (C) 2022 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.
@@ -18,35 +18,36 @@
#include <gtest/gtest.h>
+#include <android/binder_manager.h>
+#include <android/binder_process.h>
+#include <android/binder_stability.h>
#include <android-base/logging.h>
-#include <binder/ProcessState.h>
-#include <bufferpool/ClientManager.h>
+#include <bufferpool2/ClientManager.h>
+
#include <errno.h>
-#include <hidl/HidlSupport.h>
-#include <hidl/HidlTransportSupport.h>
-#include <hidl/LegacySupport.h>
-#include <hidl/Status.h>
#include <signal.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <unistd.h>
+
#include <iostream>
#include <memory>
#include <vector>
+
#include "allocator.h"
-using android::hardware::configureRpcThreadpool;
-using android::hardware::hidl_handle;
-using android::hardware::media::bufferpool::V2_0::IClientManager;
-using android::hardware::media::bufferpool::V2_0::ResultStatus;
-using android::hardware::media::bufferpool::V2_0::implementation::BufferId;
-using android::hardware::media::bufferpool::V2_0::implementation::ClientManager;
-using android::hardware::media::bufferpool::V2_0::implementation::ConnectionId;
-using android::hardware::media::bufferpool::V2_0::implementation::TransactionId;
-using android::hardware::media::bufferpool::BufferPoolData;
+using aidl::android::hardware::media::bufferpool2::IClientManager;
+using aidl::android::hardware::media::bufferpool2::ResultStatus;
+using aidl::android::hardware::media::bufferpool2::implementation::BufferId;
+using aidl::android::hardware::media::bufferpool2::implementation::ClientManager;
+using aidl::android::hardware::media::bufferpool2::implementation::ConnectionId;
+using aidl::android::hardware::media::bufferpool2::implementation::TransactionId;
+using aidl::android::hardware::media::bufferpool2::BufferPoolData;
namespace {
+const std::string testInstance = std::string() + ClientManager::descriptor + "/condtest";
+
// communication message types between processes.
enum PipeCommand : int32_t {
INIT_OK = 0,
@@ -74,7 +75,7 @@
class BufferpoolMultiTest : public ::testing::Test {
public:
virtual void SetUp() override {
- ResultStatus status;
+ BufferPoolStatus status;
mReceiverPid = -1;
mConnectionValid = false;
@@ -119,7 +120,7 @@
RecordProperty("description", description);
}
- android::sp<ClientManager> mManager;
+ std::shared_ptr<ClientManager> mManager;
std::shared_ptr<BufferPoolAllocator> mAllocator;
bool mConnectionValid;
ConnectionId mConnectionId;
@@ -138,7 +139,8 @@
}
void doReceiver() {
- configureRpcThreadpool(1, false);
+ ABinderProcess_setThreadPoolMaxThreadCount(1);
+ ABinderProcess_startThreadPool();
PipeMessage message;
mManager = ClientManager::getInstance();
if (!mManager) {
@@ -146,7 +148,11 @@
sendMessage(mResultPipeFds, message);
return;
}
- android::status_t status = mManager->registerAsService();
+ auto binder = mManager->asBinder();
+ AIBinder_forceDowngradeToSystemStability(binder.get());
+ binder_status_t status =
+ AServiceManager_addService(binder.get(), testInstance.c_str());
+ CHECK_EQ(status, STATUS_OK);
if (status != android::OK) {
message.data.command = PipeCommand::INIT_ERROR;
sendMessage(mResultPipeFds, message);
@@ -162,7 +168,7 @@
std::shared_ptr<BufferPoolData> rbuffer;
void *mem = nullptr;
IpcMutex *mutex = nullptr;
- ResultStatus status = mManager->receive(
+ BufferPoolStatus status = mManager->receive(
message.data.connectionId, message.data.transactionId,
message.data.bufferId, message.data.timestampUs, &rhandle, &rbuffer);
mManager->close(message.data.connectionId);
@@ -201,16 +207,22 @@
// Buffer transfer test between processes.
TEST_F(BufferpoolMultiTest, TransferBuffer) {
- ResultStatus status;
+ BufferPoolStatus status;
PipeMessage message;
ASSERT_TRUE(receiveMessage(mResultPipeFds, &message));
+ ABinderProcess_setThreadPoolMaxThreadCount(1);
+ ABinderProcess_startThreadPool();
- android::sp<IClientManager> receiver = IClientManager::getService();
+
+ std::shared_ptr<IClientManager> receiver =
+ IClientManager::fromBinder(
+ ndk::SpAIBinder(AServiceManager_waitForService(testInstance.c_str())));
+ ASSERT_NE(receiver, nullptr);
ConnectionId receiverId;
- ASSERT_TRUE((bool)receiver);
- status = mManager->registerSender(receiver, mConnectionId, &receiverId);
+ bool isNew = true;
+ status = mManager->registerSender(receiver, mConnectionId, &receiverId, &isNew);
ASSERT_TRUE(status == ResultStatus::OK);
{
native_handle_t *shandle = nullptr;
@@ -261,7 +273,6 @@
} // anonymous namespace
int main(int argc, char** argv) {
- android::hardware::details::setTrebleTestingOverride(true);
::testing::InitGoogleTest(&argc, argv);
int status = RUN_ALL_TESTS();
LOG(INFO) << "Test result = " << status;
diff --git a/media/bufferpool/aidl/default/tests/multi.cpp b/media/bufferpool/aidl/default/tests/multi.cpp
index 43b0a8c..8806eb0 100644
--- a/media/bufferpool/aidl/default/tests/multi.cpp
+++ b/media/bufferpool/aidl/default/tests/multi.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2018 The Android Open Source Project
+ * Copyright (C) 2022 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.
@@ -18,34 +18,35 @@
#include <gtest/gtest.h>
+#include <android/binder_manager.h>
+#include <android/binder_process.h>
+#include <android/binder_stability.h>
#include <android-base/logging.h>
-#include <binder/ProcessState.h>
-#include <bufferpool/ClientManager.h>
-#include <hidl/HidlSupport.h>
-#include <hidl/HidlTransportSupport.h>
-#include <hidl/LegacySupport.h>
-#include <hidl/Status.h>
+#include <bufferpool2/ClientManager.h>
+
#include <signal.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <unistd.h>
+
#include <iostream>
#include <memory>
#include <vector>
+
#include "allocator.h"
-using android::hardware::configureRpcThreadpool;
-using android::hardware::hidl_handle;
-using android::hardware::media::bufferpool::V2_0::IClientManager;
-using android::hardware::media::bufferpool::V2_0::ResultStatus;
-using android::hardware::media::bufferpool::V2_0::implementation::BufferId;
-using android::hardware::media::bufferpool::V2_0::implementation::ClientManager;
-using android::hardware::media::bufferpool::V2_0::implementation::ConnectionId;
-using android::hardware::media::bufferpool::V2_0::implementation::TransactionId;
-using android::hardware::media::bufferpool::BufferPoolData;
+using aidl::android::hardware::media::bufferpool2::IClientManager;
+using aidl::android::hardware::media::bufferpool2::ResultStatus;
+using aidl::android::hardware::media::bufferpool2::implementation::BufferId;
+using aidl::android::hardware::media::bufferpool2::implementation::ClientManager;
+using aidl::android::hardware::media::bufferpool2::implementation::ConnectionId;
+using aidl::android::hardware::media::bufferpool2::implementation::TransactionId;
+using aidl::android::hardware::media::bufferpool2::BufferPoolData;
namespace {
+const std::string testInstance = std::string() + ClientManager::descriptor + "/multitest";
+
// communication message types between processes.
enum PipeCommand : int32_t {
INIT_OK = 0,
@@ -71,7 +72,7 @@
class BufferpoolMultiTest : public ::testing::Test {
public:
virtual void SetUp() override {
- ResultStatus status;
+ BufferPoolStatus status;
mReceiverPid = -1;
mConnectionValid = false;
@@ -87,7 +88,6 @@
// tearDown
pause();
}
-
mManager = ClientManager::getInstance();
ASSERT_NE(mManager, nullptr);
@@ -116,7 +116,7 @@
RecordProperty("description", description);
}
- android::sp<ClientManager> mManager;
+ std::shared_ptr<ClientManager> mManager;
std::shared_ptr<BufferPoolAllocator> mAllocator;
bool mConnectionValid;
ConnectionId mConnectionId;
@@ -135,7 +135,8 @@
}
void doReceiver() {
- configureRpcThreadpool(1, false);
+ ABinderProcess_setThreadPoolMaxThreadCount(1);
+ ABinderProcess_startThreadPool();
PipeMessage message;
mManager = ClientManager::getInstance();
if (!mManager) {
@@ -143,7 +144,11 @@
sendMessage(mResultPipeFds, message);
return;
}
- android::status_t status = mManager->registerAsService();
+ auto binder = mManager->asBinder();
+ AIBinder_forceDowngradeToSystemStability(binder.get());
+ binder_status_t status =
+ AServiceManager_addService(binder.get(), testInstance.c_str());
+ CHECK_EQ(status, STATUS_OK);
if (status != android::OK) {
message.data.command = PipeCommand::INIT_ERROR;
sendMessage(mResultPipeFds, message);
@@ -156,7 +161,7 @@
{
native_handle_t *rhandle = nullptr;
std::shared_ptr<BufferPoolData> rbuffer;
- ResultStatus status = mManager->receive(
+ BufferPoolStatus status = mManager->receive(
message.data.connectionId, message.data.transactionId,
message.data.bufferId, message.data.timestampUs, &rhandle, &rbuffer);
mManager->close(message.data.connectionId);
@@ -182,16 +187,20 @@
// Buffer transfer test between processes.
TEST_F(BufferpoolMultiTest, TransferBuffer) {
- ResultStatus status;
+ BufferPoolStatus status;
PipeMessage message;
ASSERT_TRUE(receiveMessage(mResultPipeFds, &message));
+ ABinderProcess_setThreadPoolMaxThreadCount(1);
+ ABinderProcess_startThreadPool();
- android::sp<IClientManager> receiver = IClientManager::getService();
+ std::shared_ptr<IClientManager> receiver = IClientManager::fromBinder(ndk::SpAIBinder(
+ AServiceManager_waitForService(testInstance.c_str())));
+ ASSERT_NE(receiver, nullptr);
ConnectionId receiverId;
- ASSERT_TRUE((bool)receiver);
- status = mManager->registerSender(receiver, mConnectionId, &receiverId);
+ bool isNew = true;
+ status = mManager->registerSender(receiver, mConnectionId, &receiverId, &isNew);
ASSERT_TRUE(status == ResultStatus::OK);
{
native_handle_t *shandle = nullptr;
@@ -227,7 +236,6 @@
} // anonymous namespace
int main(int argc, char** argv) {
- android::hardware::details::setTrebleTestingOverride(true);
::testing::InitGoogleTest(&argc, argv);
int status = RUN_ALL_TESTS();
LOG(INFO) << "Test result = " << status;
diff --git a/media/bufferpool/aidl/default/tests/single.cpp b/media/bufferpool/aidl/default/tests/single.cpp
index 1e9027b..66aa5e9 100644
--- a/media/bufferpool/aidl/default/tests/single.cpp
+++ b/media/bufferpool/aidl/default/tests/single.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2018 The Android Open Source Project
+ * Copyright (C) 2022 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.
@@ -20,24 +20,19 @@
#include <android-base/logging.h>
#include <binder/ProcessState.h>
-#include <bufferpool/ClientManager.h>
-#include <hidl/HidlSupport.h>
-#include <hidl/HidlTransportSupport.h>
-#include <hidl/LegacySupport.h>
-#include <hidl/Status.h>
+#include <bufferpool2/ClientManager.h>
#include <unistd.h>
#include <iostream>
#include <memory>
#include <vector>
#include "allocator.h"
-using android::hardware::hidl_handle;
-using android::hardware::media::bufferpool::V2_0::ResultStatus;
-using android::hardware::media::bufferpool::V2_0::implementation::BufferId;
-using android::hardware::media::bufferpool::V2_0::implementation::ClientManager;
-using android::hardware::media::bufferpool::V2_0::implementation::ConnectionId;
-using android::hardware::media::bufferpool::V2_0::implementation::TransactionId;
-using android::hardware::media::bufferpool::BufferPoolData;
+using aidl::android::hardware::media::bufferpool2::implementation::BufferId;
+using aidl::android::hardware::media::bufferpool2::implementation::BufferPoolStatus;
+using aidl::android::hardware::media::bufferpool2::implementation::ClientManager;
+using aidl::android::hardware::media::bufferpool2::implementation::ConnectionId;
+using aidl::android::hardware::media::bufferpool2::implementation::TransactionId;
+using aidl::android::hardware::media::bufferpool2::BufferPoolData;
namespace {
@@ -51,7 +46,7 @@
class BufferpoolSingleTest : public ::testing::Test {
public:
virtual void SetUp() override {
- ResultStatus status;
+ BufferPoolStatus status;
mConnectionValid = false;
mManager = ClientManager::getInstance();
@@ -65,8 +60,9 @@
mConnectionValid = true;
- status = mManager->registerSender(mManager, mConnectionId, &mReceiverId);
- ASSERT_TRUE(status == ResultStatus::ALREADY_EXISTS &&
+ bool isNew = true;
+ status = mManager->registerSender(mManager, mConnectionId, &mReceiverId, &isNew);
+ ASSERT_TRUE(status == ResultStatus::OK && isNew == false &&
mReceiverId == mConnectionId);
}
@@ -81,7 +77,7 @@
RecordProperty("description", description);
}
- android::sp<ClientManager> mManager;
+ std::shared_ptr<ClientManager> mManager;
std::shared_ptr<BufferPoolAllocator> mAllocator;
bool mConnectionValid;
ConnectionId mConnectionId;
@@ -93,7 +89,7 @@
// Check whether each buffer allocation is done successfully with
// unique buffer id.
TEST_F(BufferpoolSingleTest, AllocateBuffer) {
- ResultStatus status;
+ BufferPoolStatus status;
std::vector<uint8_t> vecParams;
getTestAllocatorParams(&vecParams);
@@ -118,7 +114,7 @@
// Buffer recycle test.
// Check whether de-allocated buffers are recycled.
TEST_F(BufferpoolSingleTest, RecycleBuffer) {
- ResultStatus status;
+ BufferPoolStatus status;
std::vector<uint8_t> vecParams;
getTestAllocatorParams(&vecParams);
@@ -143,7 +139,7 @@
// Buffer transfer test.
// Check whether buffer is transferred to another client successfully.
TEST_F(BufferpoolSingleTest, TransferBuffer) {
- ResultStatus status;
+ BufferPoolStatus status;
std::vector<uint8_t> vecParams;
getTestAllocatorParams(&vecParams);
std::shared_ptr<BufferPoolData> sbuffer, rbuffer;
@@ -151,14 +147,14 @@
native_handle_t *recvHandle = nullptr;
TransactionId transactionId;
- int64_t postUs;
+ int64_t postMs;
status = mManager->allocate(mConnectionId, vecParams, &allocHandle, &sbuffer);
ASSERT_TRUE(status == ResultStatus::OK);
ASSERT_TRUE(TestBufferPoolAllocator::Fill(allocHandle, 0x77));
- status = mManager->postSend(mReceiverId, sbuffer, &transactionId, &postUs);
+ status = mManager->postSend(mReceiverId, sbuffer, &transactionId, &postMs);
ASSERT_TRUE(status == ResultStatus::OK);
- status = mManager->receive(mReceiverId, transactionId, sbuffer->mId, postUs,
+ status = mManager->receive(mReceiverId, transactionId, sbuffer->mId, postMs,
&recvHandle, &rbuffer);
EXPECT_TRUE(status == ResultStatus::OK);
ASSERT_TRUE(TestBufferPoolAllocator::Verify(recvHandle, 0x77));