2f0b6ebfbe
The new variant is primarily used in framework. See: go/ag/5780400 for usage. Also add tests, benchmarks and fix several issues found in SysMemInfo class. New benchmark results are: -------------------------------------------------------------- Benchmark Time CPU Iterations -------------------------------------------------------------- BM_ReadMemInfo_old 7726 ns 7696 ns 90201 BM_ReadMemInfo_new 7554 ns 7525 ns 90358 BM_ZramTotal_old 6446 ns 6406 ns 108361 BM_ZramTotal_new 6529 ns 6488 ns 106545 BM_MemInfoWithZram_old 14485 ns 14412 ns 48492 BM_MemInfoWithZram_new 20572 ns 20459 ns 33438 -------------------------------------------------------------- The reason for BM_MemInfoWithZram_new shows worse numbers is because the new API also tries to find more than 1 zram device (if it exists). The old implementation hard coded everything to "/sys/block/zram0/" Test: libmeminfo_test 1 Bug: 114325007 Bug: 111694435 Change-Id: I246d9e9a54986ee9b2542d1eaac79ecf7310b23a Signed-off-by: Sandeep Patil <sspatil@google.com>
400 lines
12 KiB
C++
400 lines
12 KiB
C++
/*
|
|
* Copyright (C) 2018 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include <meminfo/sysmeminfo.h>
|
|
|
|
#include <fcntl.h>
|
|
#include <inttypes.h>
|
|
#include <stdio.h>
|
|
#include <sys/stat.h>
|
|
#include <sys/types.h>
|
|
|
|
#include <string>
|
|
|
|
#include <android-base/file.h>
|
|
#include <android-base/logging.h>
|
|
|
|
#include <benchmark/benchmark.h>
|
|
|
|
using ::android::meminfo::SysMemInfo;
|
|
|
|
enum {
|
|
MEMINFO_TOTAL,
|
|
MEMINFO_FREE,
|
|
MEMINFO_BUFFERS,
|
|
MEMINFO_CACHED,
|
|
MEMINFO_SHMEM,
|
|
MEMINFO_SLAB,
|
|
MEMINFO_SLAB_RECLAIMABLE,
|
|
MEMINFO_SLAB_UNRECLAIMABLE,
|
|
MEMINFO_SWAP_TOTAL,
|
|
MEMINFO_SWAP_FREE,
|
|
MEMINFO_ZRAM_TOTAL,
|
|
MEMINFO_MAPPED,
|
|
MEMINFO_VMALLOC_USED,
|
|
MEMINFO_PAGE_TABLES,
|
|
MEMINFO_KERNEL_STACK,
|
|
MEMINFO_COUNT
|
|
};
|
|
|
|
static void get_mem_info(uint64_t mem[], const char* file) {
|
|
char buffer[4096];
|
|
unsigned int numFound = 0;
|
|
|
|
int fd = open(file, O_RDONLY);
|
|
|
|
if (fd < 0) {
|
|
printf("Unable to open %s: %s\n", file, strerror(errno));
|
|
return;
|
|
}
|
|
|
|
const int len = read(fd, buffer, sizeof(buffer) - 1);
|
|
close(fd);
|
|
|
|
if (len < 0) {
|
|
printf("Empty %s\n", file);
|
|
return;
|
|
}
|
|
buffer[len] = 0;
|
|
|
|
static const char* const tags[] = {
|
|
"MemTotal:", "MemFree:", "Buffers:", "Cached:", "Shmem:", "Slab:",
|
|
"SReclaimable:", "SUnreclaim:", "SwapTotal:", "SwapFree:", "ZRam:", "Mapped:",
|
|
"VmallocUsed:", "PageTables:", "KernelStack:", NULL};
|
|
|
|
static const int tagsLen[] = {9, 8, 8, 7, 6, 5, 13, 11, 10, 9, 5, 7, 12, 11, 12, 0};
|
|
|
|
memset(mem, 0, sizeof(uint64_t) * 15);
|
|
char* p = buffer;
|
|
while (*p && (numFound < (sizeof(tagsLen) / sizeof(tagsLen[0])))) {
|
|
int i = 0;
|
|
while (tags[i]) {
|
|
// std::cout << "tag =" << tags[i] << " p = " << std::string(p, tagsLen[i]) <<
|
|
// std::endl;
|
|
if (strncmp(p, tags[i], tagsLen[i]) == 0) {
|
|
p += tagsLen[i];
|
|
while (*p == ' ') p++;
|
|
char* num = p;
|
|
while (*p >= '0' && *p <= '9') p++;
|
|
if (*p != 0) {
|
|
*p = 0;
|
|
p++;
|
|
}
|
|
mem[i] = atoll(num);
|
|
numFound++;
|
|
break;
|
|
}
|
|
i++;
|
|
}
|
|
while (*p && *p != '\n') {
|
|
p++;
|
|
}
|
|
if (*p) p++;
|
|
}
|
|
}
|
|
|
|
static void BM_ReadMemInfo_old(benchmark::State& state) {
|
|
std::string meminfo = R"meminfo(MemTotal: 3019740 kB
|
|
MemFree: 1809728 kB
|
|
MemAvailable: 2546560 kB
|
|
Buffers: 54736 kB
|
|
Cached: 776052 kB
|
|
SwapCached: 0 kB
|
|
Active: 445856 kB
|
|
Inactive: 459092 kB
|
|
Active(anon): 78492 kB
|
|
Inactive(anon): 2240 kB
|
|
Active(file): 367364 kB
|
|
Inactive(file): 456852 kB
|
|
Unevictable: 3096 kB
|
|
Mlocked: 3096 kB
|
|
SwapTotal: 0 kB
|
|
SwapFree: 0 kB
|
|
Dirty: 32 kB
|
|
Writeback: 0 kB
|
|
AnonPages: 74988 kB
|
|
Mapped: 62624 kB
|
|
Shmem: 4020 kB
|
|
Slab: 86464 kB
|
|
SReclaimable: 44432 kB
|
|
SUnreclaim: 42032 kB
|
|
KernelStack: 4880 kB
|
|
PageTables: 2900 kB
|
|
NFS_Unstable: 0 kB
|
|
Bounce: 0 kB
|
|
WritebackTmp: 0 kB
|
|
CommitLimit: 1509868 kB
|
|
Committed_AS: 80296 kB
|
|
VmallocTotal: 263061440 kB
|
|
VmallocUsed: 0 kB
|
|
VmallocChunk: 0 kB
|
|
AnonHugePages: 6144 kB
|
|
ShmemHugePages: 0 kB
|
|
ShmemPmdMapped: 0 kB
|
|
CmaTotal: 131072 kB
|
|
CmaFree: 130380 kB
|
|
HugePages_Total: 0
|
|
HugePages_Free: 0
|
|
HugePages_Rsvd: 0
|
|
HugePages_Surp: 0
|
|
Hugepagesize: 2048 kB)meminfo";
|
|
|
|
TemporaryFile tf;
|
|
::android::base::WriteStringToFd(meminfo, tf.fd);
|
|
|
|
uint64_t mem[MEMINFO_COUNT];
|
|
for (auto _ : state) {
|
|
get_mem_info(mem, tf.path);
|
|
}
|
|
}
|
|
BENCHMARK(BM_ReadMemInfo_old);
|
|
|
|
static void BM_ReadMemInfo_new(benchmark::State& state) {
|
|
std::string meminfo = R"meminfo(MemTotal: 3019740 kB
|
|
MemFree: 1809728 kB
|
|
MemAvailable: 2546560 kB
|
|
Buffers: 54736 kB
|
|
Cached: 776052 kB
|
|
SwapCached: 0 kB
|
|
Active: 445856 kB
|
|
Inactive: 459092 kB
|
|
Active(anon): 78492 kB
|
|
Inactive(anon): 2240 kB
|
|
Active(file): 367364 kB
|
|
Inactive(file): 456852 kB
|
|
Unevictable: 3096 kB
|
|
Mlocked: 3096 kB
|
|
SwapTotal: 0 kB
|
|
SwapFree: 0 kB
|
|
Dirty: 32 kB
|
|
Writeback: 0 kB
|
|
AnonPages: 74988 kB
|
|
Mapped: 62624 kB
|
|
Shmem: 4020 kB
|
|
Slab: 86464 kB
|
|
SReclaimable: 44432 kB
|
|
SUnreclaim: 42032 kB
|
|
KernelStack: 4880 kB
|
|
PageTables: 2900 kB
|
|
NFS_Unstable: 0 kB
|
|
Bounce: 0 kB
|
|
WritebackTmp: 0 kB
|
|
CommitLimit: 1509868 kB
|
|
Committed_AS: 80296 kB
|
|
VmallocTotal: 263061440 kB
|
|
VmallocUsed: 0 kB
|
|
VmallocChunk: 0 kB
|
|
AnonHugePages: 6144 kB
|
|
ShmemHugePages: 0 kB
|
|
ShmemPmdMapped: 0 kB
|
|
CmaTotal: 131072 kB
|
|
CmaFree: 130380 kB
|
|
HugePages_Total: 0
|
|
HugePages_Free: 0
|
|
HugePages_Rsvd: 0
|
|
HugePages_Surp: 0
|
|
Hugepagesize: 2048 kB)meminfo";
|
|
|
|
TemporaryFile tf;
|
|
android::base::WriteStringToFd(meminfo, tf.fd);
|
|
|
|
std::string file = std::string(tf.path);
|
|
std::vector<uint64_t> mem(MEMINFO_COUNT);
|
|
const std::vector<std::string> tags = {
|
|
SysMemInfo::kMemTotal, SysMemInfo::kMemFree, SysMemInfo::kMemBuffers,
|
|
SysMemInfo::kMemCached, SysMemInfo::kMemShmem, SysMemInfo::kMemSlab,
|
|
SysMemInfo::kMemSReclaim, SysMemInfo::kMemSUnreclaim, SysMemInfo::kMemSwapTotal,
|
|
SysMemInfo::kMemSwapFree, SysMemInfo::kMemMapped, SysMemInfo::kMemVmallocUsed,
|
|
SysMemInfo::kMemPageTables, SysMemInfo::kMemKernelStack,
|
|
};
|
|
|
|
SysMemInfo smi;
|
|
for (auto _ : state) {
|
|
smi.ReadMemInfo(tags, &mem, file);
|
|
}
|
|
}
|
|
BENCHMARK(BM_ReadMemInfo_new);
|
|
|
|
static uint64_t get_zram_mem_used(const std::string& zram_dir) {
|
|
FILE* f = fopen((zram_dir + "mm_stat").c_str(), "r");
|
|
if (f) {
|
|
uint64_t mem_used_total = 0;
|
|
|
|
int matched = fscanf(f, "%*d %*d %" SCNu64 " %*d %*d %*d %*d", &mem_used_total);
|
|
if (matched != 1)
|
|
fprintf(stderr, "warning: failed to parse %s\n", (zram_dir + "mm_stat").c_str());
|
|
|
|
fclose(f);
|
|
return mem_used_total;
|
|
}
|
|
|
|
f = fopen((zram_dir + "mem_used_total").c_str(), "r");
|
|
if (f) {
|
|
uint64_t mem_used_total = 0;
|
|
|
|
int matched = fscanf(f, "%" SCNu64, &mem_used_total);
|
|
if (matched != 1)
|
|
fprintf(stderr, "warning: failed to parse %s\n", (zram_dir + "mem_used_total").c_str());
|
|
|
|
fclose(f);
|
|
return mem_used_total;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void BM_ZramTotal_old(benchmark::State& state) {
|
|
std::string exec_dir = ::android::base::GetExecutableDirectory();
|
|
std::string zram_mmstat_dir = exec_dir + "/testdata1/";
|
|
for (auto _ : state) {
|
|
uint64_t zram_total __attribute__((unused)) = get_zram_mem_used(zram_mmstat_dir) / 1024;
|
|
}
|
|
}
|
|
BENCHMARK(BM_ZramTotal_old);
|
|
|
|
static void BM_ZramTotal_new(benchmark::State& state) {
|
|
std::string exec_dir = ::android::base::GetExecutableDirectory();
|
|
std::string zram_mmstat_dir = exec_dir + "/testdata1/";
|
|
SysMemInfo smi;
|
|
for (auto _ : state) {
|
|
uint64_t zram_total __attribute__((unused)) = smi.mem_zram_kb(zram_mmstat_dir);
|
|
}
|
|
}
|
|
BENCHMARK(BM_ZramTotal_new);
|
|
|
|
static void BM_MemInfoWithZram_old(benchmark::State& state) {
|
|
std::string meminfo = R"meminfo(MemTotal: 3019740 kB
|
|
MemFree: 1809728 kB
|
|
MemAvailable: 2546560 kB
|
|
Buffers: 54736 kB
|
|
Cached: 776052 kB
|
|
SwapCached: 0 kB
|
|
Active: 445856 kB
|
|
Inactive: 459092 kB
|
|
Active(anon): 78492 kB
|
|
Inactive(anon): 2240 kB
|
|
Active(file): 367364 kB
|
|
Inactive(file): 456852 kB
|
|
Unevictable: 3096 kB
|
|
Mlocked: 3096 kB
|
|
SwapTotal: 0 kB
|
|
SwapFree: 0 kB
|
|
Dirty: 32 kB
|
|
Writeback: 0 kB
|
|
AnonPages: 74988 kB
|
|
Mapped: 62624 kB
|
|
Shmem: 4020 kB
|
|
Slab: 86464 kB
|
|
SReclaimable: 44432 kB
|
|
SUnreclaim: 42032 kB
|
|
KernelStack: 4880 kB
|
|
PageTables: 2900 kB
|
|
NFS_Unstable: 0 kB
|
|
Bounce: 0 kB
|
|
WritebackTmp: 0 kB
|
|
CommitLimit: 1509868 kB
|
|
Committed_AS: 80296 kB
|
|
VmallocTotal: 263061440 kB
|
|
VmallocUsed: 0 kB
|
|
VmallocChunk: 0 kB
|
|
AnonHugePages: 6144 kB
|
|
ShmemHugePages: 0 kB
|
|
ShmemPmdMapped: 0 kB
|
|
CmaTotal: 131072 kB
|
|
CmaFree: 130380 kB
|
|
HugePages_Total: 0
|
|
HugePages_Free: 0
|
|
HugePages_Rsvd: 0
|
|
HugePages_Surp: 0
|
|
Hugepagesize: 2048 kB)meminfo";
|
|
|
|
TemporaryFile tf;
|
|
::android::base::WriteStringToFd(meminfo, tf.fd);
|
|
std::string exec_dir = ::android::base::GetExecutableDirectory();
|
|
std::string zram_mmstat_dir = exec_dir + "/testdata1/";
|
|
uint64_t mem[MEMINFO_COUNT];
|
|
for (auto _ : state) {
|
|
get_mem_info(mem, tf.path);
|
|
mem[MEMINFO_ZRAM_TOTAL] = get_zram_mem_used("/sys/block/zram0/") / 1024;
|
|
CHECK_EQ(mem[MEMINFO_KERNEL_STACK], 4880u);
|
|
}
|
|
}
|
|
BENCHMARK(BM_MemInfoWithZram_old);
|
|
|
|
static void BM_MemInfoWithZram_new(benchmark::State& state) {
|
|
std::string meminfo = R"meminfo(MemTotal: 3019740 kB
|
|
MemFree: 1809728 kB
|
|
MemAvailable: 2546560 kB
|
|
Buffers: 54736 kB
|
|
Cached: 776052 kB
|
|
SwapCached: 0 kB
|
|
Active: 445856 kB
|
|
Inactive: 459092 kB
|
|
Active(anon): 78492 kB
|
|
Inactive(anon): 2240 kB
|
|
Active(file): 367364 kB
|
|
Inactive(file): 456852 kB
|
|
Unevictable: 3096 kB
|
|
Mlocked: 3096 kB
|
|
SwapTotal: 0 kB
|
|
SwapFree: 0 kB
|
|
Dirty: 32 kB
|
|
Writeback: 0 kB
|
|
AnonPages: 74988 kB
|
|
Mapped: 62624 kB
|
|
Shmem: 4020 kB
|
|
Slab: 86464 kB
|
|
SReclaimable: 44432 kB
|
|
SUnreclaim: 42032 kB
|
|
KernelStack: 4880 kB
|
|
PageTables: 2900 kB
|
|
NFS_Unstable: 0 kB
|
|
Bounce: 0 kB
|
|
WritebackTmp: 0 kB
|
|
CommitLimit: 1509868 kB
|
|
Committed_AS: 80296 kB
|
|
VmallocTotal: 263061440 kB
|
|
VmallocUsed: 0 kB
|
|
VmallocChunk: 0 kB
|
|
AnonHugePages: 6144 kB
|
|
ShmemHugePages: 0 kB
|
|
ShmemPmdMapped: 0 kB
|
|
CmaTotal: 131072 kB
|
|
CmaFree: 130380 kB
|
|
HugePages_Total: 0
|
|
HugePages_Free: 0
|
|
HugePages_Rsvd: 0
|
|
HugePages_Surp: 0
|
|
Hugepagesize: 2048 kB)meminfo";
|
|
|
|
TemporaryFile tf;
|
|
android::base::WriteStringToFd(meminfo, tf.fd);
|
|
|
|
std::string file = std::string(tf.path);
|
|
std::vector<uint64_t> mem(MEMINFO_COUNT);
|
|
std::vector<std::string> tags(SysMemInfo::kDefaultSysMemInfoTags);
|
|
auto it = tags.begin();
|
|
tags.insert(it + MEMINFO_ZRAM_TOTAL, "Zram:");
|
|
SysMemInfo smi;
|
|
|
|
for (auto _ : state) {
|
|
smi.ReadMemInfo(tags, &mem, file);
|
|
CHECK_EQ(mem[MEMINFO_KERNEL_STACK], 4880u);
|
|
}
|
|
}
|
|
BENCHMARK(BM_MemInfoWithZram_new);
|
|
|
|
BENCHMARK_MAIN();
|