Changeset 9937 in vbox for trunk/src/VBox/Main/include

Timestamp:

Jun 25, 2008 6:18:13 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

32360

Message:

Main: Corrected getProcessorUsage() impl (docs, spacing etc).

Location:

trunk/src/VBox/Main/include

Files:

• HostImpl.h (modified) (3 diffs)
• MachineImpl.h (modified) (4 diffs)

trunk/src/VBox/Main/include/HostImpl.h

@@ -110 +110 @@
     STDMETHOD(RemoveUSBDeviceFilter) (ULONG aPosition, IHostUSBDeviceFilter **aFilter);
 
-    STDMETHOD(GetProcessorUsage) (ULONG *user, ULONG *system, ULONG *idle);
+    STDMETHOD(GetProcessorUsage) (ULONG *aUser, ULONG *aSystem, ULONG *aIdle);
 
     // public methods only for internal purposes
@@ -170 +170 @@
 #endif
 
+#ifdef VBOX_WITH_RESOURCE_USAGE_API
+    /** Static timer callback. */
+    static void UsageSamplerCallback (PRTTIMER pTimer, void *pvUser, uint64_t iTick);
+    /** Member timer callback. */
+    void usageSamplerCallback();
+#endif /* VBOX_WITH_RESOURCE_USAGE_API */
+
     ComObjPtr <VirtualBox, ComWeakRef> mParent;
 
@@ -180 +187 @@
 
 #ifdef VBOX_WITH_RESOURCE_USAGE_API
-    /** Static timer callback. */
-    static void staticSamplerCallback(PRTTIMER pTimer, void *pvUser, uint64_t iTick);
-    /** Member timer callback. */
-    void usageSamplerCallback();
-
     /** Pointer to the usage sampling timer. */
-    PRTTIMER m_pUsageSampler;
-    /** Time stamp of the last taken sample. */
-    //uint64_t m_tsLastSampleTaken;
+    PRTTIMER mUsageSampler;
     /** Structure to hold processor usage stats. */
-    RTCPUUSAGESTATS m_CpuStats;
+    RTCPUUSAGESTATS mCpuStats;
 #endif /* VBOX_WITH_RESOURCE_USAGE_API */
 };

trunk/src/VBox/Main/include/MachineImpl.h

@@ -168 +168 @@
         ComObjPtr <Snapshot> mFirstSnapshot;
         ComObjPtr <Snapshot> mCurrentSnapshot;
+
+#ifdef VBOX_WITH_RESOURCE_USAGE_API
+        /** Pointer to the usage sampling timer. */
+        PRTTIMER mUsageSampler;
+        /** Structure to hold processor usage stats. */
+        RTPROCCPUUSAGESTATS mCpuStats;
+#endif /* VBOX_WITH_RESOURCE_USAGE_API */
     };
 
@@ -713 +720 @@
     void copyFrom (Machine *aThat);
 
+#ifdef VBOX_WITH_RESOURCE_USAGE_API
+    /** Static timer callback. */
+    static void UsageSamplerCallback (PRTTIMER pTimer, void *pvUser, uint64_t iTick);
+    /** Member timer callback. */
+    void usageSamplerCallback();
+#endif /* VBOX_WITH_RESOURCE_USAGE_API */
+
     const InstanceType mType;
 
@@ -745 +759 @@
     friend class SessionMachine;
     friend class SnapshotMachine;
-
-#ifdef VBOX_WITH_RESOURCE_USAGE_API
-    /** Static timer callback. */
-    static void staticSamplerCallback(PRTTIMER pTimer, void *pvUser, uint64_t iTick);
-    /** Member timer callback. */
-    void usageSamplerCallback();
-    /** Pointer to the usage sampling timer. */
-    PRTTIMER m_pUsageSampler;
-    /** Structure to hold processor usage stats. */
-    RTPROCCPUUSAGESTATS m_CpuStats;
-#endif /* VBOX_WITH_RESOURCE_USAGE_API */
 };
 
@@ -826 +829 @@
         IConsole *aInitiator, MachineState_T *aMachineState, IProgress **aProgress);
 
-    /* We need to override and call real Machine's method. */
-    STDMETHOD(GetProcessorUsage) (ULONG *user, ULONG *system);
-
     // public methods only for internal purposes