commit ceb6f04ecd8f30b97a9e64c0f9e9452828aa8798
author Devin Moore <devinmoore@google.com> Wed Jul 17 22:57:36 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 17 22:57:36 2024 +0000
tree 066fb847e22a9737a3e9e0b01ef7bacbfc89b61a
parent df1cb877b5e4ae1c119120f4aabb93d0a0e75301
parent 6c1d3b6b4dc0c44c032c03d115720f2e0fecc004

Merge changes from topic "fmq_not_full" into main

* changes:
  fmq_unit_tests: Write a log msg before tracking open FDs
  Update AIDL EventFlagBits to have the correct values

tests/aidl/android/fmq/test/EventFlagBits.aidl

diff --git a/tests/aidl/android/fmq/test/EventFlagBits.aidl b/tests/aidl/android/fmq/test/EventFlagBits.aidl
index 202a67c..1a9e44d 100644
--- a/tests/aidl/android/fmq/test/EventFlagBits.aidl
+++ b/tests/aidl/android/fmq/test/EventFlagBits.aidl
@@ -4,6 +4,6 @@
 
 @Backing(type="int")
 enum EventFlagBits {
-    FMQ_NOT_EMPTY = 1 << 0,
-    FMQ_NOT_FULL = 1 << 1,
+    FMQ_NOT_FULL = 1 << 0,
+    FMQ_NOT_EMPTY = 1 << 1,
 }

tests/fmq_unit_tests.cpp

diff --git a/tests/fmq_unit_tests.cpp b/tests/fmq_unit_tests.cpp
index 7abe74d..ee04670 100644
--- a/tests/fmq_unit_tests.cpp
+++ b/tests/fmq_unit_tests.cpp
@@ -35,8 +35,8 @@
 using android::hardware::kUnsynchronizedWrite;
 
 enum EventFlagBits : uint32_t {
-    kFmqNotEmpty = 1 << 0,
-    kFmqNotFull = 1 << 1,
+    kFmqNotFull = 1 << 0,
+    kFmqNotEmpty = 1 << 1,
 };
 
 typedef android::AidlMessageQueue<uint8_t, SynchronizedReadWrite> AidlMessageQueueSync;
@@ -381,6 +381,8 @@
 }
 
 TEST_F(AidlOnlyBadQueueConfig, LookForLeakedFds) {
+    // Write a log msg first to open the pmsg FD and socket to logd.
+    LOG(INFO) << "Nothin' to see here...";
     // create/destroy a large number of queues that if we were leaking FDs
     // we could detect it by looking at the number of FDs opened by the this
     // test process.

tests/msgq_test_client.cpp

diff --git a/tests/msgq_test_client.cpp b/tests/msgq_test_client.cpp
index 53a971e..70de9dd 100644
--- a/tests/msgq_test_client.cpp
+++ b/tests/msgq_test_client.cpp
@@ -42,6 +42,12 @@
 using ::aidl::android::fmq::test::FixedUnion;
 using ::aidl::android::fmq::test::ITestAidlMsgQ;
 using android::hardware::tests::msgq::V1_0::ITestMsgQ;
+static_assert(static_cast<uint32_t>(ITestMsgQ::EventFlagBits::FMQ_NOT_FULL) ==
+                      static_cast<uint32_t>(EventFlagBits::FMQ_NOT_FULL),
+              "The AIDL and HIDL test interfaces must use the same values!");
+static_assert(static_cast<uint32_t>(ITestMsgQ::EventFlagBits::FMQ_NOT_EMPTY) ==
+                      static_cast<uint32_t>(EventFlagBits::FMQ_NOT_EMPTY),
+              "The AIDL and HIDL test interfaces must use the same values!");
 
 // libhidl
 using android::hardware::isHidlSupported;