From eb257fb4e75df261ef05150d4cfb344cd8995361 Mon Sep 17 00:00:00 2001 From: wj32 Date: Thu, 17 Nov 2011 23:53:38 +0000 Subject: [PATCH] added I/O Totals group git-svn-id: svn://svn.code.sf.net/p/processhacker/code@4870 21ef857c-d57f-4fe0-8362-d861dc6d29cd --- 2.x/trunk/ProcessHacker/ProcessHacker.rc | 18 ++++++++++++++++-- 2.x/trunk/ProcessHacker/resource.h | 7 +++++++ 2.x/trunk/ProcessHacker/sysinfo.c | 11 +++++++++++ 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/2.x/trunk/ProcessHacker/ProcessHacker.rc b/2.x/trunk/ProcessHacker/ProcessHacker.rc index 100c1b51e..84d5da0bf 100644 --- a/2.x/trunk/ProcessHacker/ProcessHacker.rc +++ b/2.x/trunk/ProcessHacker/ProcessHacker.rc @@ -1648,11 +1648,11 @@ BEGIN LTEXT "Graph layout",IDC_GRAPH_LAYOUT,0,22,315,84,NOT WS_VISIBLE END -IDD_SYSINFO_IOPANEL DIALOGEX 0, 0, 237, 75 +IDD_SYSINFO_IOPANEL DIALOGEX 0, 0, 276, 75 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - GROUPBOX "I/O",IDC_STATIC,0,0,133,74 + GROUPBOX "I/O Deltas",IDC_STATIC,0,0,133,74 LTEXT "Reads Delta",IDC_STATIC,7,11,40,8 LTEXT "Read Bytes Delta",IDC_STATIC,7,21,56,8 LTEXT "Writes Delta",IDC_STATIC,7,31,40,8 @@ -1665,6 +1665,19 @@ BEGIN LTEXT "Other Bytes Delta",IDC_STATIC,7,61,58,8 RTEXT "Static",IDC_ZOTHERDELTA_V,67,51,59,8,SS_ENDELLIPSIS RTEXT "Static",IDC_ZOTHERBYTESDELTA_V,81,61,45,8,SS_ENDELLIPSIS + GROUPBOX "I/O Totals",IDC_STATIC,137,0,133,74 + LTEXT "Reads",IDC_STATIC,145,11,21,8 + LTEXT "Read Bytes",IDC_STATIC,145,21,38,8 + LTEXT "Writes",IDC_STATIC,145,31,22,8 + LTEXT "Write Bytes",IDC_STATIC,145,41,38,8 + RTEXT "Static",IDC_ZREADS_V,197,11,67,8,SS_ENDELLIPSIS + RTEXT "Static",IDC_ZREADBYTES_V,213,21,51,8,SS_ENDELLIPSIS + RTEXT "Static",IDC_ZWRITES_V,195,31,69,8,SS_ENDELLIPSIS + RTEXT "Static",IDC_ZWRITEBYTES_V,211,41,53,8,SS_ENDELLIPSIS + LTEXT "Other",IDC_STATIC,145,51,20,8 + LTEXT "Other Bytes",IDC_STATIC,145,61,40,8 + RTEXT "Static",IDC_ZOTHER_V,205,51,59,8,SS_ENDELLIPSIS + RTEXT "Static",IDC_ZOTHERBYTES_V,219,61,45,8,SS_ENDELLIPSIS END IDD_MEMLISTS DIALOGEX 0, 0, 228, 195 @@ -2280,6 +2293,7 @@ BEGIN IDD_SYSINFO_IOPANEL, DIALOG BEGIN + RIGHTMARGIN, 237 BOTTOMMARGIN, 74 END diff --git a/2.x/trunk/ProcessHacker/resource.h b/2.x/trunk/ProcessHacker/resource.h index 06c4f379d..6797d34f8 100644 --- a/2.x/trunk/ProcessHacker/resource.h +++ b/2.x/trunk/ProcessHacker/resource.h @@ -357,6 +357,7 @@ #define IDC_ZGDIHANDLES_V 1196 #define IDC_ZOTHERDELTA_V 1196 #define IDC_ZUSERHANDLES_V 1197 +#define IDC_ZOTHER_V 1197 #define IDC_GROUPCPU 1198 #define IDC_GROUPPRIVATEBYTES 1199 #define IDC_GROUPIO 1200 @@ -493,10 +494,16 @@ #define IDC_ZLISTSTANDBY0_V 1346 #define IDC_ZWRITEBYTESDELTA_V 1346 #define IDC_ZLISTSTANDBY1_V 1347 +#define IDC_ZREADS_V 1347 #define IDC_ZLISTSTANDBY2_V 1348 +#define IDC_ZREADBYTES_V 1348 #define IDC_ZLISTSTANDBY3_V 1349 +#define IDC_ZWRITES_V 1349 #define IDC_ZLISTBAD_V 1350 +#define IDC_ZWRITEBYTES_V 1350 #define IDC_ZLISTREPURPOSED_V 1351 +#define IDC_ZOTHERBYTESDELTA_V2 1351 +#define IDC_ZOTHERBYTES_V 1351 #define IDC_ZLISTREPURPOSED0_V 1352 #define IDC_ZLISTREPURPOSED1_V 1353 #define IDC_ZLISTREPURPOSED2_V 1354 diff --git a/2.x/trunk/ProcessHacker/sysinfo.c b/2.x/trunk/ProcessHacker/sysinfo.c index bb881e3fc..f10578f2e 100644 --- a/2.x/trunk/ProcessHacker/sysinfo.c +++ b/2.x/trunk/ProcessHacker/sysinfo.c @@ -3823,6 +3823,8 @@ VOID PhSipUpdateIoPanel( VOID ) { + // I/O Deltas + if (IoTicked > 1) { SetDlgItemText(IoPanel, IDC_ZREADSDELTA_V, PhaFormatUInt64(IoReadDelta.Delta, TRUE)->Buffer); @@ -3848,6 +3850,15 @@ VOID PhSipUpdateIoPanel( SetDlgItemText(IoPanel, IDC_ZWRITEBYTESDELTA_V, L"-"); SetDlgItemText(IoPanel, IDC_ZOTHERBYTESDELTA_V, L"-"); } + + // I/O Totals + + SetDlgItemText(IoPanel, IDC_ZREADS_V, PhaFormatUInt64(PhPerfInformation.IoReadOperationCount, TRUE)->Buffer); + SetDlgItemText(IoPanel, IDC_ZREADBYTES_V, PhaFormatSize(PhPerfInformation.IoReadTransferCount.QuadPart, -1)->Buffer); + SetDlgItemText(IoPanel, IDC_ZWRITES_V, PhaFormatUInt64(PhPerfInformation.IoWriteOperationCount, TRUE)->Buffer); + SetDlgItemText(IoPanel, IDC_ZWRITEBYTES_V, PhaFormatSize(PhPerfInformation.IoWriteTransferCount.QuadPart, -1)->Buffer); + SetDlgItemText(IoPanel, IDC_ZOTHER_V, PhaFormatUInt64(PhPerfInformation.IoOtherOperationCount, TRUE)->Buffer); + SetDlgItemText(IoPanel, IDC_ZOTHERBYTES_V, PhaFormatSize(PhPerfInformation.IoOtherTransferCount.QuadPart, -1)->Buffer); } PPH_PROCESS_RECORD PhSipReferenceMaxIoRecord(