tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Use sysinfo(2) to implement more of <sys/sysinfo.h>."

Browse source
This commit is contained in:
Treehugger Robot 2016-08-12 17:07:41 +00:00 committed by Gerrit Code Review
commit b17d845d9b
2 changed files with 21 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
libc/bionic/sysinfo.cpp
View file

@ -76,29 +76,14 @@ int get_nprocs() {
return cpu_count;
}
static int __get_meminfo_page_count(const char* pattern) {
FILE* fp = fopen("/proc/meminfo", "re");
if (fp == NULL) {
return -1;
}
int page_count = -1;
char buf[256];
while (fgets(buf, sizeof(buf), fp) != NULL) {
long total;
if (sscanf(buf, pattern, &total) == 1) {
page_count = static_cast<int>(total / (sysconf(_SC_PAGE_SIZE) / 1024));
break;
}
}
fclose(fp);
return page_count;
}
long get_phys_pages() {
return __get_meminfo_page_count("MemTotal: %ld kB");
struct sysinfo si;
sysinfo(&si);
return (si.totalram * si.mem_unit) / sysconf(_SC_PAGE_SIZE);
}
long get_avphys_pages() {
return __get_meminfo_page_count("MemFree: %ld kB");
struct sysinfo si;
sysinfo(&si);
return ((si.freeram + si.bufferram) * si.mem_unit) / sysconf(_SC_PAGE_SIZE);
}

19
tests/sys_sysinfo_test.cpp
View file

@ -17,17 +17,28 @@
#include <gtest/gtest.h>
#include <sys/sysinfo.h>
#include <unistd.h>
TEST(sys_sysinfo, smoke) {
int nprocessor = get_nprocs();
ASSERT_GT(nprocessor, 0);
int nprocs = get_nprocs();
ASSERT_GT(nprocs, 0);
ASSERT_EQ(sysconf(_SC_NPROCESSORS_ONLN), nprocs);
int nprocessor_conf = get_nprocs_conf();
ASSERT_GE(nprocessor_conf, nprocessor);
int nprocs_conf = get_nprocs_conf();
ASSERT_GE(nprocs_conf, nprocs);
ASSERT_EQ(sysconf(_SC_NPROCESSORS_CONF), nprocs_conf);
long avail_phys_pages = get_avphys_pages();
ASSERT_GT(avail_phys_pages, 0);
ASSERT_EQ(sysconf(_SC_AVPHYS_PAGES), avail_phys_pages);
long phys_pages = get_phys_pages();
ASSERT_GE(phys_pages, avail_phys_pages);
ASSERT_EQ(sysconf(_SC_PHYS_PAGES), phys_pages);
}
TEST(sys_sysinfo, sysinfo) {
struct sysinfo si;
memset(&si, 0, sizeof(si));
ASSERT_EQ(0, sysinfo(&si));
}