commit ef287dc13d22f1d27606a68e6d283a944d5fbd53
author Naseer Ahmed <naseer@codeaurora.org> Sat Mar 11 23:48:43 2017 -0500
committer Naseer Ahmed <naseer@codeaurora.org> Mon Mar 13 17:50:57 2017 -0400
tree adfa5d83d77c65aa6fd23be7b9e75b47c1fdece9
parent dc918136aec3eb2326420cd90d2d22dd9deb5801

gralloc1: Use handle as map key

The handle map is process local and the id may not be unique for
a given process

Bug: 36135145
CRs-Fixed: 2018333
Change-Id: Ic2bba13107787fd54121c978bff7e507eeb7dd64

libgralloc1/gr_buf_mgr.cpp

diff --git a/libgralloc1/gr_buf_mgr.cpp b/libgralloc1/gr_buf_mgr.cpp
index eefb17a..3431c42 100644
--- a/libgralloc1/gr_buf_mgr.cpp
+++ b/libgralloc1/gr_buf_mgr.cpp
@@ -182,7 +182,7 @@
   out_hnd->id = ++next_id_;
   // TODO(user): Base address of shared handle and ion handles
   auto buffer = std::make_shared<Buffer>(out_hnd);
-  handles_map_.emplace(std::make_pair(out_hnd->id, buffer));
+  handles_map_.emplace(std::make_pair(out_hnd, buffer));
   *outbuffer = out_hnd;
 }
 
@@ -227,7 +227,7 @@
   std::lock_guard<std::mutex> lock(locker_);
 
   // find if this handle is already in map
-  auto it = handles_map_.find(hnd->id);
+  auto it = handles_map_.find(hnd);
   if (it != handles_map_.end()) {
     // It's already in map, Just increment refcnt
     // No need to mmap the memory.
@@ -237,7 +237,7 @@
     // not present in the map. mmap and then add entry to map
     if (MapBuffer(hnd) == GRALLOC1_ERROR_NONE) {
       auto buffer = std::make_shared<Buffer>(hnd);
-      handles_map_.emplace(std::make_pair(hnd->id, buffer));
+      handles_map_.emplace(std::make_pair(hnd, buffer));
     }
   }
 
@@ -247,7 +247,7 @@
 gralloc1_error_t BufferManager::ReleaseBuffer(private_handle_t const *hnd) {
   std::lock_guard<std::mutex> lock(locker_);
   // find if this handle is already in map
-  auto it = handles_map_.find(hnd->id);
+  auto it = handles_map_.find(hnd);
   if (it == handles_map_.end()) {
     // Corrupt handle or map.
     ALOGE("Could not find handle");
@@ -457,7 +457,7 @@
   setMetaData(hnd, UPDATE_COLOR_SPACE, reinterpret_cast<void *>(&colorSpace));
   *handle = hnd;
   auto buffer = std::make_shared<Buffer>(hnd, data.ion_handle, e_data.ion_handle);
-  handles_map_.emplace(std::make_pair(hnd->id, buffer));
+  handles_map_.emplace(std::make_pair(hnd, buffer));
   return err;
 }