Implement missing SysInfo methods on OpenBSD

base/sys_info_openbsd.cc

 // Copyright (c) 2011 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 <sys/param.h>
 #include <sys/shm.h>
 #include <sys/sysctl.h>
 
@@ skipping 16 matching lines @@
   long pages = sysconf(_SC_PHYS_PAGES);
   long page_size = sysconf(_SC_PAGESIZE);
   if (pages == -1 || page_size == -1) {
     NOTREACHED();
     return 0;
   }
 
   return static_cast<int64>(pages) * page_size;
 }
 
+// static
+int64 SysInfo::AmountOfAvailablePhysicalMemory() {
+  long available_pages = sysconf(_SC_AVPHYS_PAGES);

[Mark Mentovai, 2013/04/09 20:37:08]

Other than the constant used on this line, this is the same as
AmountOfPhysicalMemory. Perhaps you should have a helper function, in an
anonymous namespace, that implements this entire function body with the constant
parameterized.

I would make the same change to the _linux.cc, and perhaps a similar change to
the _win.cc.

[Paweł Hajdan Jr., 2013/04/09 20:42:53]

+1

[mdempsky_google, 2013/04/09 21:21:54]

Done for sys_info_openbsd.cc.  Let me know if you like that, and I'll make the
same changes to the other sys_info_*.cc implementations.

+  long page_size = sysconf(_SC_PAGESIZE);
+  if (available_pages == -1 || page_size == -1) {
+    NOTREACHED();
+    return 0;
+  }
+  return static_cast<int64>(available_pages) * page_size;
+}
+
 size_t SysInfo::MaxSharedMemorySize() {
   int mib[] = { CTL_KERN, KERN_SHMINFO, KERN_SHMINFO_SHMMAX };
   size_t limit;
   size_t size = sizeof(limit);
   if (sysctl(mib, arraysize(mib), &limit, &size, NULL, 0) < 0) {
     NOTREACHED();
     return 0;
   }
   return limit;
 }
 
+// static
+std::string SysInfo::CPUModelName() {
+  int mib[] = { CTL_HW, HW_MODEL };

[Mark Mentovai, 2013/04/09 20:37:08]

Can this be const? Same on line 49.

[mdempsky_google, 2013/04/09 21:21:54]

Sort of.  The sysctl() interface on OpenBSD (currently) requires an "int *", but
I just checked with other OpenBSD developers and they agree we can change it to
"const int *" because it's a read-only value.

I changed the mib arrays to "static const" and added an appropriate
const_cast<int*>.  By time OpenBSD 5.4 releases (Nov 2013), we should be able to
remove the const_casts though.

+  char name[256];
+  size_t len = arraysize(name);
+  if (sysctl(mib, arraysize(mib), name, &len, NULL, 0) == 0)
+    return name;

[Mark Mentovai, 2013/04/09 20:37:08]

Matching the function above, test for the failure case and handle it inside the
conditional, and put the success case outside and after.

[mdempsky_google, 2013/04/09 21:21:54]

Done.

+  return std::string();
+}
+
 }  // namespace base