0955c59918
Approved by: miwi (mentor), rene (mentor) MFH: 2016Q1 Security: 5c288f68-c7ca-4c0d-b7dc-1ec6295200b3 Security: f85fa236-e2a6-412e-b5c7-c42120892de5 Security: 8be8ca39-ae70-4422-bf1a-d8fae6911c5e
67 lines
2 KiB
C++
67 lines
2 KiB
C++
--- base/sys_info_freebsd.cc.orig_orig 2016-03-20 18:19:10.466074029 +0100
|
|
+++ base/sys_info_freebsd.cc 2016-03-20 18:22:51.449059006 +0100
|
|
@@ -12,12 +12,34 @@
|
|
|
|
namespace base {
|
|
|
|
+int64_t SysInfo::AmountOfAvailablePhysicalMemory() {
|
|
+ int page_size, r = 0;
|
|
+ unsigned pgfree, pginact, pgcache;
|
|
+ size_t size = sizeof(page_size);
|
|
+ size_t szpg = sizeof(pgfree);
|
|
+ if(r == 0)
|
|
+ r = sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0);
|
|
+ if(r == 0)
|
|
+ r = sysctlbyname("vm.stats.vm.v_free_count", &pgfree, &szpg, NULL, 0);
|
|
+ if(r == 0)
|
|
+ r = sysctlbyname("vm.stats.vm.v_inactive_count", &pginact, &szpg, NULL, 0);
|
|
+ if(r == 0)
|
|
+ r = sysctlbyname("vm.stats.vm.v_cache_count", &pgcache, &szpg, NULL, 0);
|
|
+ if (r == -1) {
|
|
+ NOTREACHED();
|
|
+ return 0;
|
|
+ }
|
|
+ return static_cast<int64_t>((pgfree + pginact + pgcache) * page_size);
|
|
+}
|
|
+
|
|
int64_t SysInfo::AmountOfPhysicalMemory() {
|
|
- int pages, page_size;
|
|
+ int pages, page_size, r = 0;
|
|
size_t size = sizeof(pages);
|
|
- sysctlbyname("vm.stats.vm.v_page_count", &pages, &size, NULL, 0);
|
|
- sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0);
|
|
- if (pages == -1 || page_size == -1) {
|
|
+ if(r == 0)
|
|
+ r = sysctlbyname("vm.stats.vm.v_page_count", &pages, &size, NULL, 0);
|
|
+ if(r == 0)
|
|
+ r = sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0);
|
|
+ if (r == -1) {
|
|
NOTREACHED();
|
|
return 0;
|
|
}
|
|
@@ -35,4 +57,25 @@
|
|
return static_cast<uint64_t>(limit);
|
|
}
|
|
|
|
+// static
|
|
+std::string SysInfo::CPUModelName() {
|
|
+ int mib[] = { CTL_HW, HW_MODEL };
|
|
+ char name[256];
|
|
+ size_t size = arraysize(name);
|
|
+ if (sysctl(mib, arraysize(mib), &name, &size, NULL, 0) == 0)
|
|
+ return name;
|
|
+ return std::string();
|
|
+}
|
|
+
|
|
+int SysInfo::NumberOfProcessors() {
|
|
+ int mib[] = { CTL_HW, HW_NCPU };
|
|
+ int ncpu;
|
|
+ size_t size = sizeof(ncpu);
|
|
+ if (sysctl(mib, arraysize(mib), &ncpu, &size, NULL, 0) == -1) {
|
|
+ NOTREACHED();
|
|
+ return 1;
|
|
+ }
|
|
+ return ncpu;
|
|
+}
|
|
+
|
|
} // namespace base
|