diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-01-30 19:11:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-01-30 19:11:20 +0000 |
| commit | 627a37cad936387b323a48a3edde899ab0809961 (patch) | |
| tree | 0da070855586aa1ed4d40ddaac3ef0823cd73980 /libmeminfo/libdmabufinfo/dmabufinfo_test.cpp | |
| parent | 98910920ba5511a8185bc8c2776b4a191f0df87f (diff) | |
| parent | 302a259fa9755537f3bbcb2e848fade9e711ff5c (diff) | |
| download | system_core-627a37cad936387b323a48a3edde899ab0809961.tar.gz system_core-627a37cad936387b323a48a3edde899ab0809961.tar.bz2 system_core-627a37cad936387b323a48a3edde899ab0809961.zip | |
Merge "meminfo: handle multiple buffer references in dmabufinfo"
Diffstat (limited to 'libmeminfo/libdmabufinfo/dmabufinfo_test.cpp')
| -rw-r--r-- | libmeminfo/libdmabufinfo/dmabufinfo_test.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/libmeminfo/libdmabufinfo/dmabufinfo_test.cpp b/libmeminfo/libdmabufinfo/dmabufinfo_test.cpp index aa5f16c22..95aa2c799 100644 --- a/libmeminfo/libdmabufinfo/dmabufinfo_test.cpp +++ b/libmeminfo/libdmabufinfo/dmabufinfo_test.cpp @@ -21,6 +21,7 @@ #include <string> #include <vector> +#include <unordered_map> #include <android-base/file.h> #include <android-base/logging.h> @@ -61,18 +62,16 @@ struct ion_heap_data { #define EXPECT_PID_IN_FDREFS(_bufptr, _pid, _expect) \ do { \ - const std::vector<pid_t>& _fdrefs = _bufptr->fdrefs(); \ - auto _ref = std::find_if(_fdrefs.begin(), _fdrefs.end(), \ - [&](const pid_t& p) { return p == _pid; }); \ - EXPECT_EQ((_ref == _fdrefs.end()), _expect); \ + const std::unordered_map<pid_t, int>& _fdrefs = _bufptr->fdrefs(); \ + auto _ref = _fdrefs.find(_pid); \ + EXPECT_EQ((_ref != _fdrefs.end()), _expect); \ } while (0) #define EXPECT_PID_IN_MAPREFS(_bufptr, _pid, _expect) \ do { \ - const std::vector<pid_t>& _maprefs = _bufptr->maprefs(); \ - auto _ref = std::find_if(_maprefs.begin(), _maprefs.end(), \ - [&](const pid_t& p) { return p == _pid; }); \ - EXPECT_EQ((_ref == _maprefs.end()), _expect); \ + const std::unordered_map<pid_t, int>& _maprefs = _bufptr->maprefs(); \ + auto _ref = _maprefs.find(_pid); \ + EXPECT_EQ((_ref != _maprefs.end()), _expect); \ } while (0) TEST(DmaBufInfoParser, TestReadDmaBufInfo) { |