commit 99fdf80131213afa66e934ee676a027ae2b47428
author Kalesh Singh <kaleshsingh@google.com> Thu Jul 08 21:43:39 2021 +0000
committer Kalesh Singh <kaleshsingh@google.com> Wed Jul 14 21:14:15 2021 +0000
tree 465a7c2a0c43d077673c6b208d978a8780dc42ea
parent c38fff4473f10996b7b5d8af14bd6769d133e341

dmabufinfo_test: Remove attachment stats tests

Creating a separate sysfs directory for each dmabuf attachment
adds overhead that is quite significant in some fast paths.

Attachment stats are being removed from dmabuf sysfs stats

Remove the dmabuf attachment stats tests.

Bug: 193226716
Bug: 193465681
Bug: 192621117
Test: dmabufinfo_test#DmaBufSysfsStatsParser
Change-Id: I3b46705fc0627343d16bc2033204f33cc2291259

libdmabufinfo/dmabufinfo_test.cpp

diff --git a/libdmabufinfo/dmabufinfo_test.cpp b/libdmabufinfo/dmabufinfo_test.cpp
index f3f3c43..c7f6581 100644
--- a/libdmabufinfo/dmabufinfo_test.cpp
+++ b/libdmabufinfo/dmabufinfo_test.cpp
@@ -244,13 +244,10 @@
 
 TEST_F(DmaBufSysfsStatsParser, TestReadDmaBufSysfsStats) {
     using android::base::StringPrintf;
-    const std::string device_name = "my_device";
 
     for (unsigned int inode_number = 74831; inode_number < 74841; inode_number++) {
-        auto attach_dir_path = StringPrintf("buffers/%u/attachments/2", inode_number);
-        ASSERT_TRUE(fs::create_directories(attach_dir_path));
-
         auto buffer_path = buffer_stats_path / StringPrintf("%u", inode_number);
+        ASSERT_TRUE(fs::create_directories(buffer_path));
 
         auto buffer_size_path = buffer_path / "size";
         const std::string buffer_size = "4096";
@@ -259,15 +256,6 @@
         auto exp_name_path = buffer_path / "exporter_name";
         const std::string exp_name = "system";
         ASSERT_TRUE(android::base::WriteStringToFile(exp_name, exp_name_path));
-
-        auto attachment_dir = buffer_path / "attachments/2";
-
-        auto device_path = attachment_dir / "device";
-        fs::create_symlink(device_name, device_path);
-
-        auto map_count_path = attachment_dir / "map_counter";
-        const std::string map_count = "1";
-        ASSERT_TRUE(android::base::WriteStringToFile(map_count, map_count_path));
     }
 
     DmabufSysfsStats stats;
@@ -281,13 +269,6 @@
     EXPECT_EQ(buf_info.exp_name, "system");
     EXPECT_EQ(buf_info.size, 4096UL);
 
-    auto attach_stats = buf_info.attachments;
-    ASSERT_EQ(attach_stats.size(), 1UL);
-    auto attach_info = attach_stats[0];
-    EXPECT_EQ(attach_info.map_count, 1UL);
-
-    EXPECT_EQ(attach_info.device, device_name);
-
     auto exporter_stats = stats.exporter_info();
     ASSERT_EQ(exporter_stats.size(), 1UL);
     auto exp_info = exporter_stats.find("system");
@@ -295,14 +276,6 @@
     EXPECT_EQ(exp_info->second.size, 40960UL);
     EXPECT_EQ(exp_info->second.buffer_count, 10UL);
 
-    auto importer_stats = stats.importer_info();
-    ASSERT_EQ(importer_stats.size(), 1UL);
-    auto imp_info = importer_stats.find(device_name);
-    ASSERT_TRUE(imp_info != importer_stats.end());
-
-    EXPECT_EQ(imp_info->second.size, 40960UL);
-    EXPECT_EQ(imp_info->second.buffer_count, 10UL);
-
     auto total_size = stats.total_size();
     EXPECT_EQ(total_size, 40960UL);