commit 791e6f83cb13fd2bf1b049beed45833a25ddf4b4
author Connor O'Brien <connoro@google.com> Thu Jun 06 17:29:18 2019 -0700
committer Steven Moreland <smoreland@google.com> Mon Jan 13 15:58:04 2020 -0800
tree 1c69b2465c3e059a3c005104a5697e6709139f7f
parent 6f435621121289fc447fda024fc59c34c1e6448b

libtimeinstate: fix map names

The maps defined by the time_in_state.c BPF program now have names
ending with "_map", so update our calls to bpf_obj_get() to reflect
that.

Test: libtimeinstate_test passes
Bug: 78498733
Change-Id: If13df157c0245561eee3efa2a9c5a04f339ca194
Signed-off-by: Connor O'Brien <connoro@google.com>
(cherry picked from commit cf9bc5fd7558f3806b91b15db6a733f2785c7fa4)
Merged-In: If13df157c0245561eee3efa2a9c5a04f339ca194

libs/cputimeinstate/cputimeinstate.cpp

diff --git a/libs/cputimeinstate/cputimeinstate.cpp b/libs/cputimeinstate/cputimeinstate.cpp
index 5fd4a95..4ba66a5 100644
--- a/libs/cputimeinstate/cputimeinstate.cpp
+++ b/libs/cputimeinstate/cputimeinstate.cpp
@@ -124,7 +124,7 @@
         gPolicyCpus.emplace_back(cpus);
     }
 
-    gMapFd = unique_fd{bpf_obj_get(BPF_FS_PATH "map_time_in_state_uid_times")};
+    gMapFd = unique_fd{bpf_obj_get(BPF_FS_PATH "map_time_in_state_uid_times_map")};
     if (gMapFd < 0) return false;
 
     gInitialized = true;
@@ -196,7 +196,7 @@
         std::unordered_map<uint32_t, std::vector<std::vector<uint64_t>>> *freqTimeMap) {
     if (!gInitialized && !initGlobals()) return false;
 
-    int fd = bpf_obj_get(BPF_FS_PATH "map_time_in_state_uid_times");
+    int fd = bpf_obj_get(BPF_FS_PATH "map_time_in_state_uid_times_map");
     if (fd < 0) return false;
     BpfMap<time_key_t, val_t> m(fd);