taskmgr: Move out-of-domain checking into PerfDataGetProcessorUsage() and…

taskmgr: Move out-of-domain checking into PerfDataGetProcessorUsage() and PerfDataGetProcessorSystemUsage().

taskmgr: Move out-of-domain checking into PerfDataGetProcessorUsage() and…
a9742b32 · Gerald Pfeifer · Alexandre Julliard · 7a9210fa · a9742b32 · a9742b32
Commit a9742b32 authored Nov 15, 2007 by Gerald Pfeifer Committed by Alexandre Julliard Nov 16, 2007
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 4 deletions

perfdata.c programs/taskmgr/perfdata.c +8 -0

perfpage.c programs/taskmgr/perfpage.c +0 -4

No files found.
--- a/programs/taskmgr/perfdata.c
+++ b/programs/taskmgr/perfdata.c
@@ -332,11 +332,19 @@ ULONG PerfDataGetProcessCount(void)

 ULONG PerfDataGetProcessorUsage(void)
 {
+    if( dbIdleTime < 0.0 )
+        return 0;
+    if( dbIdleTime > 100.0 )
+        return 100;
    return (ULONG)dbIdleTime;
 }

 ULONG PerfDataGetProcessorSystemUsage(void)
 {
+    if( dbKernelTime < 0.0 )
+        return 0;
+    if( dbKernelTime > 100.0 )
+        return 100;
    return (ULONG)dbKernelTime;
 }


--- a/programs/taskmgr/perfpage.c
+++ b/programs/taskmgr/perfpage.c
@@ -234,10 +234,6 @@ static DWORD WINAPI PerformancePageRefreshThread(void *lpParameter)
                         */
                        CpuUsage = PerfDataGetProcessorUsage();
                        CpuKernelUsage = PerfDataGetProcessorSystemUsage();
-                        if (CpuUsage < 0 )        CpuUsage = 0;
-                        if (CpuUsage > 100)       CpuUsage = 100;
-                        if (CpuKernelUsage < 0)   CpuKernelUsage = 0;
-                        if (CpuKernelUsage > 100) CpuKernelUsage = 100;

                        /*
                         *  Get the memory usage