Imported Upstream version 3.1.51-dfsgupstream/3.1.51-dfsg

1 files changed, 5 insertions, 9 deletions

diff --git a/src/VBox/Main/linux/PerformanceLinux.cpp b/src/VBox/Main/linux/PerformanceLinux.cpp
index 0741179e9..1f763e5ba 100644
--- a/src/VBox/Main/linux/PerformanceLinux.cpp
+++ b/src/VBox/Main/linux/PerformanceLinux.cpp
@@ -1,4 +1,4 @@
-/* $Id: PerformanceLinux.cpp $ */
+/* $Id: PerformanceLinux.cpp 28800 2010-04-27 08:22:32Z vboxsync $ */
 
 /** @file
  *
@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright (C) 2008 Sun Microsystems, Inc.
+ * Copyright (C) 2008 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -15,10 +15,6 @@
  * Foundation, in version 2 as it comes in the "COPYING" file of the
  * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa
- * Clara, CA 95054 USA or visit http://www.sun.com if you need
- * additional information or have any questions.
  */
 
 #include <stdio.h>
@@ -38,7 +34,7 @@ namespace pm {
 class CollectorLinux : public CollectorHAL
 {
 public:
-    virtual int preCollect(const CollectorHints& hints);
+    virtual int preCollect(const CollectorHints& hints, uint64_t /* iTick */);
     virtual int getHostMemoryUsage(ULONG *total, ULONG *used, ULONG *available);
     virtual int getProcessMemoryUsage(RTPROCESS process, ULONG *used);
 
@@ -68,13 +64,13 @@ CollectorHAL *createHAL()
 
 // Collector HAL for Linux
 
-int CollectorLinux::preCollect(const CollectorHints& hints)
+int CollectorLinux::preCollect(const CollectorHints& hints, uint64_t /* iTick */)
 {
     std::vector<RTPROCESS> processes;
     hints.getProcesses(processes);
 
     std::vector<RTPROCESS>::iterator it;
-    for(it = processes.begin(); it != processes.end(); it++)
+    for (it = processes.begin(); it != processes.end(); it++)
     {
         VMProcessStats vmStats;
         int rc = getRawProcessStats(*it, &vmStats.cpuUser, &vmStats.cpuKernel, &vmStats.pagesUsed);