From dae515cdc36a5bb7eafbb6c4645c829c61019ca3 Mon Sep 17 00:00:00 2001
From: wj32 <wj32@21ef857c-d57f-4fe0-8362-d861dc6d29cd>
Date: Fri, 25 Nov 2011 23:20:38 +0000
Subject: [PATCH] ExtendedTools: removed EtpUpdatePerNodeInformation

git-svn-id: svn://svn.code.sf.net/p/processhacker/code@4924 21ef857c-d57f-4fe0-8362-d861dc6d29cd
---
 2.x/trunk/plugins/ExtendedTools/gpumon.c | 51 ++++++------------------
 1 file changed, 12 insertions(+), 39 deletions(-)

diff --git a/2.x/trunk/plugins/ExtendedTools/gpumon.c b/2.x/trunk/plugins/ExtendedTools/gpumon.c
index e4c382126..2d849a2d9 100644
--- a/2.x/trunk/plugins/ExtendedTools/gpumon.c
+++ b/2.x/trunk/plugins/ExtendedTools/gpumon.c
@@ -447,7 +447,7 @@ static VOID EtpUpdateNodeInformation(
 
         for (j = 0; j < gpuAdapter->NodeCount; j++)
         {
-            if (!RtlCheckBit(&EtGpuNodeBitMap, gpuAdapter->FirstNodeIndex + j))
+            if (Block && !RtlCheckBit(&EtGpuNodeBitMap, gpuAdapter->FirstNodeIndex + j))
                 continue;
 
             memset(&queryStatistics, 0, sizeof(D3DKMT_QUERYSTATISTICS));
@@ -477,8 +477,17 @@ static VOID EtpUpdateNodeInformation(
                 }
                 else
                 {
-                    totalRunningTime += queryStatistics.QueryResult.NodeInformation.GlobalInformation.RunningTime.QuadPart;
-                    systemRunningTime += queryStatistics.QueryResult.NodeInformation.SystemInformation.RunningTime.QuadPart;
+                    ULONG nodeIndex;
+
+                    nodeIndex = gpuAdapter->FirstNodeIndex + j;
+
+                    PhUpdateDelta(&EtGpuNodesTotalRunningTimeDelta[nodeIndex], queryStatistics.QueryResult.NodeInformation.GlobalInformation.RunningTime.QuadPart);
+
+                    if (RtlCheckBit(&EtGpuNodeBitMap, gpuAdapter->FirstNodeIndex + j))
+                    {
+                        totalRunningTime += queryStatistics.QueryResult.NodeInformation.GlobalInformation.RunningTime.QuadPart;
+                        systemRunningTime += queryStatistics.QueryResult.NodeInformation.SystemInformation.RunningTime.QuadPart;
+                    }
                 }
             }
         }
@@ -499,41 +508,6 @@ static VOID EtpUpdateNodeInformation(
     }
 }
 
-static VOID EtpUpdatePerNodeInformation(
-    VOID
-    )
-{
-    ULONG i;
-    ULONG j;
-    PETP_GPU_ADAPTER gpuAdapter;
-    D3DKMT_QUERYSTATISTICS queryStatistics;
-
-    for (i = 0; i < EtpGpuAdapterList->Count; i++)
-    {
-        gpuAdapter = EtpGpuAdapterList->Items[i];
-
-        for (j = 0; j < gpuAdapter->NodeCount; j++)
-        {
-            if (!RtlCheckBit(&EtGpuNodeBitMap, gpuAdapter->FirstNodeIndex + j))
-                continue;
-
-            memset(&queryStatistics, 0, sizeof(D3DKMT_QUERYSTATISTICS));
-            queryStatistics.Type = D3DKMT_QUERYSTATISTICS_NODE;
-            queryStatistics.AdapterLuid = gpuAdapter->AdapterLuid;
-            queryStatistics.QueryNode.NodeId = j;
-
-            if (NT_SUCCESS(D3DKMTQueryStatistics_I(&queryStatistics)))
-            {
-                ULONG nodeIndex;
-
-                nodeIndex = gpuAdapter->FirstNodeIndex + j;
-
-                PhUpdateDelta(&EtGpuNodesTotalRunningTimeDelta[nodeIndex], queryStatistics.QueryResult.NodeInformation.GlobalInformation.RunningTime.QuadPart);
-            }
-        }
-    }
-}
-
 static VOID NTAPI ProcessesUpdatedCallback(
     __in_opt PVOID Parameter,
     __in_opt PVOID Context
@@ -551,7 +525,6 @@ static VOID NTAPI ProcessesUpdatedCallback(
 
     EtpUpdateSegmentInformation(NULL);
     EtpUpdateNodeInformation(NULL);
-    EtpUpdatePerNodeInformation();
 
     elapsedTime = (DOUBLE)EtClockTotalRunningTimeDelta.Delta * 10000000 / EtClockTotalRunningTimeFrequency.QuadPart;