Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 10:44:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use NativeHandle in MQDescriptor instead of ParcelFileDescriptor

Browse Source 
android.hardware.common.fmq.MQDescriptor needs to handle multiple file
descriptors, so changing from ParcelFileDescriptor to
android.hardware.common.NativeHandle.
android.hardware.common.fmq.GrantorDescriptor needs to keep track of the
fdIndex as well.

Bug: 176912570
Test: atest fmq_unit_tests fmq_test

Change-Id: I15f2393e6c420ae5394322b28c4523fa80f7dcc7
This commit is contained in:
Devin Moore
2021-01-18 16:11:20 -08:00
parent 600b7775ef
commit 17365e56a2
11 changed files with 62 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/msgq/1.0/ITestMsgQ.hal
View File

@@ -41,12 +41,15 @@ interface ITestMsgQ {
*
* @param configureFmq The server sets up a new unsynchronized FMQ if
* this parameter is true.
* @param userFd True to initialize the message queue with a user supplied
* file descriptor for the ring buffer.
* False to let the message queue use a single FD for everything.
*
* @return ret True if successful.
* @return mqDesc This structure describes the unsynchronized FMQ that was
* set up by the service. Client can use it to set up the FMQ at its end.
*/
getFmqUnsyncWrite(bool configureFmq) generates(bool ret, fmq_unsync<int32_t> mqDesc);
getFmqUnsyncWrite(bool configureFmq, bool userFd) generates(bool ret, fmq_unsync<int32_t> mqDesc);
/**
* This method request the service to write into the synchronized read/write

3
tests/msgq/1.0/default/Android.bp
View File

@@ -91,9 +91,10 @@ cc_test {
// These are static libs only for testing purposes and portability. Shared
// libs should be used on device.
static_libs: [
"android.hardware.common-unstable-ndk_platform",
"android.hardware.common.fmq-unstable-ndk_platform",
"android.hardware.tests.msgq@1.0",
"android.fmq.test-ndk_platform",
"android.hardware.common.fmq-unstable-ndk_platform",
],
whole_static_libs: [
"android.hardware.tests.msgq@1.0-impl",

13
tests/msgq/1.0/default/TestMsgQ.cpp
View File

@@ -41,10 +41,19 @@ Return<bool> TestMsgQ::configureFmqSyncReadWrite(
return true;
}
Return<void> TestMsgQ::getFmqUnsyncWrite(bool configureFmq, getFmqUnsyncWrite_cb _hidl_cb) {
Return<void> TestMsgQ::getFmqUnsyncWrite(bool configureFmq, bool userFd,
getFmqUnsyncWrite_cb _hidl_cb) {
if (configureFmq) {
static constexpr size_t kNumElementsInQueue = 1024;
mFmqUnsynchronized.reset(new (std::nothrow) MessageQueueUnsync(kNumElementsInQueue));
static constexpr size_t kElementSizeBytes = sizeof(int32_t);
android::base::unique_fd ringbufferFd;
if (userFd) {
ringbufferFd.reset(
::ashmem_create_region("UnsyncWrite", kNumElementsInQueue * kElementSizeBytes));
}
mFmqUnsynchronized.reset(new (std::nothrow) MessageQueueUnsync(
kNumElementsInQueue, false, std::move(ringbufferFd),
kNumElementsInQueue * kElementSizeBytes));
}
if ((mFmqUnsynchronized == nullptr) ||
(mFmqUnsynchronized->isValid() == false)) {

3
tests/msgq/1.0/default/TestMsgQ.h
View File

@@ -56,7 +56,8 @@ struct TestMsgQ : public ITestMsgQ {
// Methods from ::android::hardware::tests::msgq::V1_0::ITestMsgQ follow.
Return<bool> configureFmqSyncReadWrite(const MQDescriptorSync<int32_t>& mqDesc) override;
Return<void> getFmqUnsyncWrite(bool configureFmq, getFmqUnsyncWrite_cb _hidl_cb) override;
Return<void> getFmqUnsyncWrite(bool configureFmq, bool userFd,
getFmqUnsyncWrite_cb _hidl_cb) override;
Return<bool> requestWriteFmqSync(int32_t count) override;
Return<bool> requestReadFmqSync(int32_t count) override;
Return<bool> requestWriteFmqUnsync(int32_t count) override;