Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f296eb2 authored by Connor O'Brien's avatar Connor O'Brien
Browse files

libtimeinstate: add getCpuFreqs() function 



Currently the KernelCpuUidFreqTimeReader reads the first line of
/proc/uid_time_in_state to determine a device's available CPU
frequencies, but libtimeinstate already reads this information from
sysfs files that are supported upstream. Add a function to provide
this information to libtimeinstate's users & eliminate the need to
read the proc file for this data.
Add a sanity check in libtimeinstate_test to confirm that
getCpuFreqs() and getUidCpuFreqTimes() report the same number of
frequencies for each cluster.

Bug: 138317993
Test: libtimeinstate_test passes
Change-Id: I3e8c632d14bbeb552d7e52bd83a9b4a64dec408d
Signed-off-by: default avatarConnor O'Brien <connoro@google.com>
parent 3fc2cb71

libs/cputimeinstate/cputimeinstate.cpp

+5 −0
Original line number Diff line number Diff line
@@ -213,6 +213,11 @@ bool startTrackingUidTimes() { 
            attachTracepointProgram("power", "cpu_frequency");

}



std::optional<std::vector<std::vector<uint32_t>>> getCpuFreqs() {

    if (!gInitialized && !initGlobals()) return {};

    return gPolicyFreqs;

}



// Retrieve the times in ns that uid spent running at each CPU frequency.

// Return contains no value on error, otherwise it contains a vector of vectors using the format:

// [[t0_0, t0_1, ...],

libs/cputimeinstate/cputimeinstate.h

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ bool startTrackingUidTimes(); 
std::optional<std::vector<std::vector<uint64_t>>> getUidCpuFreqTimes(uint32_t uid);

std::optional<std::unordered_map<uint32_t, std::vector<std::vector<uint64_t>>>>

    getUidsCpuFreqTimes();

std::optional<std::vector<std::vector<uint32_t>>> getCpuFreqs();



struct concurrent_time_t {

    std::vector<uint64_t> active;

libs/cputimeinstate/testtimeinstate.cpp

+11 −0
Original line number Diff line number Diff line
@@ -351,5 +351,16 @@ TEST(TimeInStateTest, RemoveUid) { 
    ASSERT_EQ(allConcurrentTimes->find(uid), allConcurrentTimes->end());

}



TEST(TimeInStateTest, GetCpuFreqs) {

    auto freqs = getCpuFreqs();

    ASSERT_TRUE(freqs.has_value());



    auto times = getUidCpuFreqTimes(0);

    ASSERT_TRUE(times.has_value());



    ASSERT_EQ(freqs->size(), times->size());

    for (size_t i = 0; i < freqs->size(); ++i) EXPECT_EQ((*freqs)[i].size(), (*times)[i].size());

}



} // namespace bpf

} // namespace android