[ros-diffs] [reactos] 04/06: [NTOSKRNL] Now that the memory dumper handles paged pool, make use of it in any situation

[Pierre Schweitzer]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=879d8f2104d34522407852...

commit 879d8f2104d3452240785246ac5fd9c8cf7cab9e
Author: Pierre Schweitzer [e-mail]
AuthorDate: Fri Dec 29 16:45:50 2017 +0100

[NTOSKRNL] Now that the memory dumper handles paged pool, make use of it in any situation
---
 ntoskrnl/kdbg/kdb_cli.c   |  2 +-
 ntoskrnl/mm/ARM3/expool.c | 18 ++++++------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c
index ff87f56a4c..257058c34a 100644
--- a/ntoskrnl/kdbg/kdb_cli.c
+++ b/ntoskrnl/kdbg/kdb_cli.c
@@ -185,7 +185,7 @@ static const struct
     { "kmsg", "kmsg", "Kernel dmesg. Alias for dmesg.", KdbpCmdDmesg },
     { "help", "help", "Display help screen.", KdbpCmdHelp },
     { "!pool", "!pool [Address [Flags]]", "Display information about pool allocations.", ExpKdbgExtPool },
-    { "!poolused", "!poolused", "Display non-paged pool usage.", ExpKdbgExtPoolUsed },
+    { "!poolused", "!poolused", "Display pool usage.", ExpKdbgExtPoolUsed },
 };

/* FUNCTIONS *****************************************************************/
diff --git a/ntoskrnl/mm/ARM3/expool.c b/ntoskrnl/mm/ARM3/expool.c
index 528d534487..732ab2db43 100644
--- a/ntoskrnl/mm/ARM3/expool.c
+++ b/ntoskrnl/mm/ARM3/expool.c
@@ -480,7 +480,7 @@ ExpTagAllowPrint(CHAR Tag)
     else DPRINT1(fmt, ##__VA_ARGS__)

VOID
-MiDumpNonPagedPoolConsumers(BOOLEAN CalledFromDbg)
+MiDumpPoolConsumers(BOOLEAN CalledFromDbg)
 {
     SIZE_T i;

@@ -1747,12 +1747,9 @@ ExAllocatePoolWithTag(IN POOL_TYPE PoolType,
         {
 #if DBG
             //
-            // If non paged backed, display current consumption
+            // Out of memory, display current consumption
             //
-            if ((OriginalType & BASE_POOL_TYPE_MASK) == NonPagedPool)
-            {
-                MiDumpNonPagedPoolConsumers(FALSE);
-            }
+            MiDumpPoolConsumers(FALSE);
 #endif

//
@@ -2083,12 +2080,9 @@ ExAllocatePoolWithTag(IN POOL_TYPE PoolType,
     {
 #if DBG
         //
-        // If non paged backed, display current consumption
+        // Out of memory, display current consumption
         //
-        if ((OriginalType & BASE_POOL_TYPE_MASK) == NonPagedPool)
-        {
-            MiDumpNonPagedPoolConsumers(FALSE);
-        }
+        MiDumpPoolConsumers(FALSE);
 #endif

//
@@ -2948,7 +2942,7 @@ ExpKdbgExtPoolUsed(
     ULONG Argc,
     PCHAR Argv[])
 {
-    MiDumpNonPagedPoolConsumers(TRUE);
+    MiDumpPoolConsumers(TRUE);

return TRUE;
 }