Fix cpu/memory measurements on OS X.

base/process_util.h

 // Copyright (c) 2009 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.
 
 // This file/namespace contains utility functions for enumerating, ending and
 // computing statistics of processes.
 
 #ifndef BASE_PROCESS_UTIL_H_
 #define BASE_PROCESS_UTIL_H_
 
@@ skipping 299 matching lines @@
 // priv (private): These pages (kbytes) cannot be shared with any other process.
 // shareable:      These pages (kbytes) can be shared with other processes under
 //                 the right circumstances.
 // shared :        These pages (kbytes) are currently shared with at least one
 //                 other process.
 //
 // On Linux:
 // priv:           Pages mapped only by this process
 // shared:         PSS or 0 if the kernel doesn't support this
 // shareable:      0
+//
+// On OS X: TODO(thakis): Revise.
+// priv:           Memory.
+// shared:         0
+// shareable:      0
 struct WorkingSetKBytes {
   WorkingSetKBytes() : priv(0), shareable(0), shared(0) {}
   size_t priv;
   size_t shareable;
   size_t shared;
 };
 
 // Committed (resident + paged) memory usage broken down by
 // private: These pages cannot be shared with any other process.
 // mapped:  These pages are mapped into the view of a section (backed by
@@ skipping 22 matching lines @@
 int64 TimeValToMicroseconds(const struct timeval& tv);
 
 // Provides performance metrics for a specified process (CPU usage, memory and
 // IO counters). To use it, invoke CreateProcessMetrics() to get an instance
 // for a specific process, then access the information with the different get
 // methods.
 class ProcessMetrics {
  public:
   // Creates a ProcessMetrics for the specified process.
   // The caller owns the returned object.
+#if !defined(OS_MACOSX)
   static ProcessMetrics* CreateProcessMetrics(ProcessHandle process);
+#else
+  class PortProvider {
+   public:
+    // Should return the mach task for |process| if possible, or 0 else. Only

[Mark Mentovai, 2009/12/18 22:18:24]

move words around:
, or else 0.
, or otherwise 0.

[Nico, 2009/12/18 22:46:52]

Done.

+    // processes that this returns tasks for will have metrics on OS X (except
+    // for the current process, which always gets metrics).
+    virtual mach_port_t TaskForPid(ProcessHandle process) const = 0;
+  };
+
+  // The port provider needs to outlive the ProcessMetrics object returned by
+  // this. If NULL is passed as provider, only metrics for the current process

[Mark Mentovai, 2009/12/18 22:18:24]

returned by this?  That seems like English, but it's actually C++, right?

returned by |this|.
returned by this object.

[Nico, 2009/12/18 22:46:52]

Done.

+  // are 
+  static ProcessMetrics* CreateProcessMetrics(ProcessHandle process,
+                                              PortProvider* port_provider);
+#endif
 
   ~ProcessMetrics();
 
   // Returns the current space allocated for the pagefile, in bytes (these pages
   // may or may not be in memory).  On Linux, this returns the total virtual
   // memory size.
   size_t GetPagefileUsage() const;
   // Returns the peak space allocated for the pagefile, in bytes.
   size_t GetPeakPagefileUsage() const;
   // Returns the current working set size, in bytes.  On Linux, this returns
@@ skipping 27 matching lines @@
   int GetCPUUsage();
 
   // Retrieves accounting information for all I/O operations performed by the
   // process.
   // If IO information is retrieved successfully, the function returns true
   // and fills in the IO_COUNTERS passed in. The function returns false
   // otherwise.
   bool GetIOCounters(IoCounters* io_counters) const;
 
  private:
+#if !defined(OS_MACOSX)
   explicit ProcessMetrics(ProcessHandle process);
+#else
+  ProcessMetrics(ProcessHandle process, PortProvider* port_provider);
+#endif
 
   ProcessHandle process_;
 
   int processor_count_;
 
   // Used to store the previous times and CPU usage counts so we can
   // compute the CPU usage between calls.
   int64 last_time_;
   int64 last_system_time_;
 
 #if defined(OS_LINUX)
   // Jiffie count at the last_time_ we updated.
   int last_cpu_;
 #endif
 
+#if defined(OS_MACOSX)
+  PortProvider* port_provider_;
+
+  // Queries the port provider if it's set.
+  mach_port_t TaskForPid(ProcessHandle process) const;

[Mark Mentovai, 2009/12/18 22:18:24]

Put functions before data members.

I'd say it's OK to leave these two together inside the same #ifdef, but you
should still respect the ordering within the #ifdef.

[Nico, 2009/12/18 22:46:52]

Done.

+#endif
+
   DISALLOW_EVIL_CONSTRUCTORS(ProcessMetrics);
 };
 
 // Returns the memory commited by the system in KBytes.
 // Returns 0 if it can't compute the commit charge.
 size_t GetSystemCommitCharge();
 
 // Enables low fragmentation heap (LFH) for every heaps of this process. This
 // won't have any effect on heaps created after this function call. It will not
 // modify data allocated in the heaps before calling this function. So it is
@@ skipping 30 matching lines @@
 // instance running inside the parent.  The parent's Breakpad instance should
 // not handle the child's exceptions.  Calling RestoreDefaultExceptionHandler
 // in the child after forking will restore the standard exception handler.
 // See http://crbug.com/20371/ for more details.
 void RestoreDefaultExceptionHandler();
 #endif
 
 }  // namespace base
 
 #endif  // BASE_PROCESS_UTIL_H_