commit 6ba72a5ccb2d838a7db2f8b198d0531eda21915c
author Hridya Valsaraju <hridya@google.com> Fri Feb 24 10:59:55 2017 -0800
committer Hridya Valsaraju <hridya@google.com> Mon Feb 27 09:31:02 2017 -0800
tree 1dc452a8090c231b75d445ffe0bf127a85dba244
parent 46d8d6f3e8dea49245df862507a5f368fd6c8f4b

cleanup usage of getNativeHandle() and getGrantors()

Bug: 35645062 32841484
Test: fmq unit tests

Change-Id: I86b58d01ea08ae9d2e4e2722b6b6dbbef554df36

include/fmq/MessageQueue.h

diff --git a/include/fmq/MessageQueue.h b/include/fmq/MessageQueue.h
index e160d28..5045787 100644
--- a/include/fmq/MessageQueue.h
+++ b/include/fmq/MessageQueue.h
@@ -1170,41 +1170,41 @@
 
 template <typename T, MQFlavor flavor>
 void* MessageQueue<T, flavor>::mapGrantorDescr(uint32_t grantorIdx) {
-    const native_handle_t* handle = mDesc->getNativeHandle()->handle();
-    auto mGrantors = mDesc->getGrantors();
-    if ((handle == nullptr) || (grantorIdx >= mGrantors.size())) {
+    const native_handle_t* handle = mDesc->handle();
+    auto grantors = mDesc->grantors();
+    if ((handle == nullptr) || (grantorIdx >= grantors.size())) {
         return nullptr;
     }
 
-    int fdIndex = mGrantors[grantorIdx].fdIndex;
+    int fdIndex = grantors[grantorIdx].fdIndex;
     /*
      * Offset for mmap must be a multiple of PAGE_SIZE.
      */
-    int mapOffset = (mGrantors[grantorIdx].offset / PAGE_SIZE) * PAGE_SIZE;
+    int mapOffset = (grantors[grantorIdx].offset / PAGE_SIZE) * PAGE_SIZE;
     int mapLength =
-            mGrantors[grantorIdx].offset - mapOffset + mGrantors[grantorIdx].extent;
+            grantors[grantorIdx].offset - mapOffset + grantors[grantorIdx].extent;
 
     void* address = mmap(0, mapLength, PROT_READ | PROT_WRITE, MAP_SHARED,
                          handle->data[fdIndex], mapOffset);
     return (address == MAP_FAILED)
             ? nullptr
             : reinterpret_cast<uint8_t*>(address) +
-            (mGrantors[grantorIdx].offset - mapOffset);
+            (grantors[grantorIdx].offset - mapOffset);
 }
 
 template <typename T, MQFlavor flavor>
 void MessageQueue<T, flavor>::unmapGrantorDescr(void* address,
                                                 uint32_t grantorIdx) {
-    auto mGrantors = mDesc->getGrantors();
-    if ((address == nullptr) || (grantorIdx >= mGrantors.size())) {
+    auto grantors = mDesc->grantors();
+    if ((address == nullptr) || (grantorIdx >= grantors.size())) {
         return;
     }
 
-    int mapOffset = (mGrantors[grantorIdx].offset / PAGE_SIZE) * PAGE_SIZE;
+    int mapOffset = (grantors[grantorIdx].offset / PAGE_SIZE) * PAGE_SIZE;
     int mapLength =
-            mGrantors[grantorIdx].offset - mapOffset + mGrantors[grantorIdx].extent;
+            grantors[grantorIdx].offset - mapOffset + grantors[grantorIdx].extent;
     void* baseAddress = reinterpret_cast<uint8_t*>(address) -
-            (mGrantors[grantorIdx].offset - mapOffset);
+            (grantors[grantorIdx].offset - mapOffset);
     if (baseAddress) munmap(baseAddress, mapLength);
 }