From 8e311d28b0927a3c02a1fa027945254e1a33712b Mon Sep 17 00:00:00 2001
From: Scott Blomquist <sblom@microsoft.com>
Date: Fri, 11 Jan 2013 22:24:15 +0100
Subject: [PATCH] windows: add support for '_Total' perf counters

---
 src/res/node_perfctr_provider.man           | 32 ++++++++++++++-------
 tools/msvs/genfiles/node_perfctr_provider.h |  2 +-
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/res/node_perfctr_provider.man b/src/res/node_perfctr_provider.man
index cd945ee5fba9..fb8e597781e9 100644
--- a/src/res/node_perfctr_provider.man
+++ b/src/res/node_perfctr_provider.man
@@ -14,42 +14,47 @@
                       uri="Microsoft.Windows.System.PerfCounters.NodeCounterSet"
                       name="Node.js"
                       description="Node.js performance counters"
-                      instances="multiple">
+                      instances="multipleAggregate">
 
             <counter id="1"
                      uri="Microsoft.Windows.System.PerfCounters.NodeCounterSet.httpsrvreq"
                      name="HTTP server requests"
                      description="Number of HTTP server requests"
                      type="perf_counter_counter"
-                     detailLevel="standard" />
+                     detailLevel="standard"
+                     aggregate="sum" />
 
             <counter id="2"
                      uri="Microsoft.Windows.System.PerfCounters.NodeCounterSet.httpsrvrsp"
                      name="HTTP server responses"
                      description="Number of HTTP server responses"
                      type="perf_counter_counter"
-                     detailLevel="standard" />
+                     detailLevel="standard"
+                     aggregate="sum" />
 
             <counter id="3"
                      uri="Microsoft.Windows.System.PerfCounters.NodeCounterSet.httpclireq"
                      name="HTTP client requests"
                      description="Number of HTTP client requests"
                      type="perf_counter_counter"
-                     detailLevel="standard" />
+                     detailLevel="standard"
+                     aggregate="sum" />
 
             <counter id="4"
                      uri="Microsoft.Windows.System.PerfCounters.NodeCounterSet.httpclirsp"
                      name="HTTP client responses"
                      description="Number of HTTP client responses"
                      type="perf_counter_counter"
-                     detailLevel="standard" />
+                     detailLevel="standard"
+                     aggregate="sum" />
 
             <counter id="5"
                      uri="Microsoft.Windows.System.PerfCounters.NodeCounterSet.netsrvconn"
                      name="Active server connections"
                      description="Number of server connections"
                      type="perf_counter_rawcount"
-                     detailLevel="standard" />
+                     detailLevel="standard"
+                     aggregate="sum" />
 
             <counter id="6"
                      uri="Microsoft.Windows.System.PerfCounters.NodeCounterSet.netbytesent"
@@ -57,7 +62,8 @@
                      description="Number of bytes sent using TCP"
                      type="perf_counter_bulk_count"
                      detailLevel="standard"
-                     defaultScale="-3" />
+                     defaultScale="-3"
+                     aggregate="sum" />
 
             <counter id="7"
                      uri="Microsoft.Windows.System.PerfCounters.NodeCounterSet.netbyterecv"
@@ -65,14 +71,16 @@
                      description="Number of bytes received using TCP"
                      type="perf_counter_bulk_count"
                      detailLevel="standard"
-                     defaultScale="-3" />
+                     defaultScale="-3"
+                     aggregate="sum" />
 
             <counter id="8"
                      uri="Microsoft.Windows.System.PerfCounters.NodeCounterSet.gctime"
                      name="%Time in GC"
                      description="Percent of time for last GC"
                      type="perf_counter_rawcount"
-                     detailLevel="standard" />
+                     detailLevel="standard"
+                     aggregate="avg" />
 
             <counter id="9"
                      uri="Microsoft.Windows.System.PerfCounters.NodeCounterSet.pipebytesent"
@@ -80,7 +88,8 @@
                      description="Number of bytes sent using pipe"
                      type="perf_counter_bulk_count"
                      detailLevel="standard"
-                     defaultScale="-3" />
+                     defaultScale="-3"
+                     aggregate="sum" />
 
             <counter id="10"
                      uri="Microsoft.Windows.System.PerfCounters.NodeCounterSet.pipebyterecv"
@@ -88,7 +97,8 @@
                      description="Number of bytes received using pipe"
                      type="perf_counter_bulk_count"
                      detailLevel="standard"
-                     defaultScale="-3" />
+                     defaultScale="-3"
+                     aggregate="sum" />
 
           </counterSet>
         </provider>
diff --git a/tools/msvs/genfiles/node_perfctr_provider.h b/tools/msvs/genfiles/node_perfctr_provider.h
index a54ce905146b..30f0b58621ad 100644
--- a/tools/msvs/genfiles/node_perfctr_provider.h
+++ b/tools/msvs/genfiles/node_perfctr_provider.h
@@ -23,7 +23,7 @@ EXTERN_C DECLSPEC_SELECTANY struct {
     PERF_COUNTER_INFO Counter8;
     PERF_COUNTER_INFO Counter9;
 } NodeCounterSetInfo = {
-    { { 0x3a22a8ec, 0x297c, 0x48ac, 0xab, 0x15, 0x33, 0xec, 0x93, 0x3, 0x3f, 0xd8 }, { 0x1e2e15d7, 0x3760, 0x470e, 0x86, 0x99, 0xb9, 0xdb, 0x52, 0x48, 0xed, 0xd5 }, 10, PERF_COUNTERSET_MULTI_INSTANCES },
+    { { 0x3a22a8ec, 0x297c, 0x48ac, 0xab, 0x15, 0x33, 0xec, 0x93, 0x3, 0x3f, 0xd8 }, { 0x1e2e15d7, 0x3760, 0x470e, 0x86, 0x99, 0xb9, 0xdb, 0x52, 0x48, 0xed, 0xd5 }, 10, PERF_COUNTERSET_MULTI_AGGREGATE },
     { 1, PERF_COUNTER_COUNTER, 0, sizeof(ULONG), PERF_DETAIL_NOVICE, 0, 0 },
     { 2, PERF_COUNTER_COUNTER, 0, sizeof(ULONG), PERF_DETAIL_NOVICE, 0, 0 },
     { 3, PERF_COUNTER_COUNTER, 0, sizeof(ULONG), PERF_DETAIL_NOVICE, 0, 0 },