Implement missing SysInfo methods on OpenBSD

base/sys_info_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/sys_info.h"
 
 #include <windows.h>
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stringprintf.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/win/windows_version.h"
 
-namespace base {
+namespace {
 
-// static
-int SysInfo::NumberOfProcessors() {
-  return win::OSInfo::GetInstance()->processors();
-}
-
-// static
-int64 SysInfo::AmountOfPhysicalMemory() {
+int64 AmountOfMemory(DWORDLONG MEMORYSTATUSEX::* memory_field) {

[Mark Mentovai, 2013/04/09 22:14:21]

It’s unusual in Chrome code, but I can’t find a reason to outlaw it, and it’s
probably better code than any of the alternatives.

[mdempsky_google, 2013/04/09 23:06:32]

Exactly how I felt about it then. ;)

   MEMORYSTATUSEX memory_info;
   memory_info.dwLength = sizeof(memory_info);
   if (!GlobalMemoryStatusEx(&memory_info)) {
     NOTREACHED();
     return 0;
   }
 
-  int64 rv = static_cast<int64>(memory_info.ullTotalPhys);
+  int64 rv = static_cast<int64>(memory_info.*memory_field);
   if (rv < 0)
     rv = kint64max;
   return rv;
 }
 
+}  // namespace
+
+namespace base {
+
 // static
-int64 SysInfo::AmountOfAvailablePhysicalMemory() {
-  MEMORYSTATUSEX memory_info;
-  memory_info.dwLength = sizeof(memory_info);
-  if (!GlobalMemoryStatusEx(&memory_info)) {
-    NOTREACHED();
-    return 0;
-  }
-
-  int64 rv = static_cast<int64>(memory_info.ullAvailPhys);
-  if (rv < 0)
-    rv = kint64max;
-  return rv;
+int SysInfo::NumberOfProcessors() {
+  return win::OSInfo::GetInstance()->processors();
 }
 
 // static
+int64 SysInfo::AmountOfPhysicalMemory() {
+  return AmountOfMemory(&MEMORYSTATUSEX::ullTotalPhys);
+}
+
+// static
+int64 SysInfo::AmountOfAvailablePhysicalMemory() {
+  return AmountOfMemory(&MEMORYSTATUSEX::ullAvailPhys);
+}
+
+// static
 int64 SysInfo::AmountOfFreeDiskSpace(const FilePath& path) {
   base::ThreadRestrictions::AssertIOAllowed();
 
   ULARGE_INTEGER available, total, free;
   if (!GetDiskFreeSpaceExW(path.value().c_str(), &available, &total, &free)) {
     return -1;
   }
   int64 rv = static_cast<int64>(available.QuadPart);
   if (rv < 0)
     rv = kint64max;
@@ skipping 54 matching lines @@
 void SysInfo::OperatingSystemVersionNumbers(int32* major_version,
                                             int32* minor_version,
                                             int32* bugfix_version) {
   win::OSInfo* os_info = win::OSInfo::GetInstance();
   *major_version = os_info->version_number().major;
   *minor_version = os_info->version_number().minor;
   *bugfix_version = 0;
 }
 
 }  // namespace base