Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Simplify and rename the functions that touch UserPageListHead.

Browse source 
They were confusingly coded to accept any flavor of PFN_TYPE, which resulted in at least one bug.
Constrained the calls to the MmRequest/ReleasePageMemoryConsumer and MmTrimUserMemory.

svn path=/trunk/; revision=32673
This commit is contained in:
Andrew Munger 2008-03-13 15:26:17 +00:00
parent b473957147
commit e2d5ba4e1f
4 changed files with 32 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/ntoskrnl/include/internal/mm.h
View file

@ -1025,7 +1025,11 @@ MmGetLRUFirstUserPage(VOID);
VOID
NTAPI
MmSetLRULastPage(PFN_TYPE Page);
MmInsertLRULastUserPage(PFN_TYPE Page);
VOID
NTAPI
MmRemoveLRUUserPage(PFN_TYPE Page);
VOID
NTAPI

7
reactos/ntoskrnl/mm/balance.c
View file

@ -114,6 +114,7 @@ MmReleasePageMemoryConsumer(ULONG Consumer, PFN_TYPE Page)
Entry = RemoveHeadList(&AllocationListHead);
Request = CONTAINING_RECORD(Entry, MM_ALLOCATION_REQUEST, ListEntry);
KeReleaseSpinLock(&AllocationListLock, oldIrql);
if(Consumer == MC_USER) MmRemoveLRUUserPage(Page);
Request->Page = Page;
KeSetEvent(&Request->Event, IO_NO_INCREMENT, FALSE);
}
@ -121,6 +122,7 @@ MmReleasePageMemoryConsumer(ULONG Consumer, PFN_TYPE Page)
else
{
KeReleaseSpinLock(&AllocationListLock, oldIrql);
if(Consumer == MC_USER) MmRemoveLRUUserPage(Page);
MmDereferencePage(Page);
}
@ -262,7 +264,9 @@ MmRequestPageMemoryConsumer(ULONG Consumer, BOOLEAN CanWait,
{
KEBUGCHECK(NO_PAGES_AVAILABLE);
}
MmSetLRULastPage(Page);
/* Update the Consumer */
MiGetPfnEntry(Page)->Flags.Consumer = Consumer;
if(Consumer == MC_USER) MmInsertLRULastUserPage(Page);
*AllocatedPage = Page;
(void)InterlockedDecrementUL(&MiPagesRequired);
return(STATUS_SUCCESS);
@ -276,6 +280,7 @@ MmRequestPageMemoryConsumer(ULONG Consumer, BOOLEAN CanWait,
{
KEBUGCHECK(NO_PAGES_AVAILABLE);
}
if(Consumer == MC_USER) MmInsertLRULastUserPage(Page);
*AllocatedPage = Page;
return(STATUS_SUCCESS);

38
reactos/ntoskrnl/mm/freelist.c
View file

@ -31,8 +31,12 @@ PPHYSICAL_PAGE MmPageArray;
ULONG MmPageArraySize;
static KSPIN_LOCK PageListLock;
/* List of pages allocated to the MC_USER Consumer */
static LIST_ENTRY UserPageListHead;
/* List of pages zeroed by the ZPW (MmZeroPageThreadMain) */
static LIST_ENTRY FreeZeroedPageListHead;
/* List of free pages, filled by MmGetReferenceCountPage and
* and MmInitializePageList */
static LIST_ENTRY FreeUnzeroedPageListHead;
static KEVENT ZeroPageThreadEvent;
@ -65,19 +69,16 @@ MmGetLRUFirstUserPage(VOID)
VOID
NTAPI
MmSetLRULastPage(PFN_TYPE Pfn)
MmInsertLRULastUserPage(PFN_TYPE Pfn)
{
KIRQL oldIrql;
PPHYSICAL_PAGE Page;
KeAcquireSpinLock(&PageListLock, &oldIrql);
Page = MiGetPfnEntry(Pfn);
if (Page->Flags.Type == MM_PHYSICAL_PAGE_USED &&
Page->Flags.Consumer == MC_USER)
{
RemoveEntryList(&Page->ListEntry);
InsertTailList(&UserPageListHead, &Page->ListEntry);
}
ASSERT(Page->Flags.Type == MM_PHYSICAL_PAGE_USED);
ASSERT(Page->Flags.Consumer == MC_USER);
InsertTailList(&UserPageListHead, &Page->ListEntry);
KeReleaseSpinLock(&PageListLock, oldIrql);
}
@ -92,15 +93,9 @@ MmGetLRUNextUserPage(PFN_TYPE PreviousPfn)
KeAcquireSpinLock(&PageListLock, &oldIrql);
Page = MiGetPfnEntry(PreviousPfn);
if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED ||
Page->Flags.Consumer != MC_USER)
{
NextListEntry = UserPageListHead.Flink;
}
else
{
NextListEntry = Page->ListEntry.Flink;
}
ASSERT(Page->Flags.Type == MM_PHYSICAL_PAGE_USED);
ASSERT(Page->Flags.Consumer == MC_USER);
NextListEntry = Page->ListEntry.Flink;
if (NextListEntry == &UserPageListHead)
{
KeReleaseSpinLock(&PageListLock, oldIrql);
@ -111,6 +106,13 @@ MmGetLRUNextUserPage(PFN_TYPE PreviousPfn)
return PageDescriptor - MmPageArray;
}
VOID
NTAPI
MmRemoveLRUUserPage(PFN_TYPE Page)
{
RemoveEntryList(&MiGetPfnEntry(Page)->ListEntry);
}
PFN_TYPE
NTAPI
MmGetContinuousPages(ULONG NumberOfBytes,
@ -782,7 +784,6 @@ MmAllocPage(ULONG Consumer, SWAPENTRY SavedSwapEntry)
KeReleaseSpinLock(&PageListLock, oldIrql);
PfnOffset = PageDescriptor - MmPageArray;
MmSetLRULastPage(PfnOffset);
if (NeedClear)
{
MiZeroPage(PfnOffset);
@ -882,7 +883,7 @@ MmAllocPagesSpecifyRange(ULONG Consumer,
/* Remember the page */
pfn = PageDescriptor - MmPageArray;
Pages[NumberOfPagesFound++] = pfn;
MmSetLRULastPage(pfn);
if(Consumer == MC_USER) MmInsertLRULastUserPage(pfn);
}
}
else
@ -917,7 +918,6 @@ MmAllocPagesSpecifyRange(ULONG Consumer,
/* Remember the page */
Pages[NumberOfPagesFound++] = pfn;
MmSetLRULastPage(pfn);
if (NumberOfPagesFound == NumberOfPages)
break;
}

3
reactos/ntoskrnl/mm/wset.c
View file

@ -38,7 +38,8 @@ MmTrimUserMemory(ULONG Target, ULONG Priority, PULONG NrFreedPages)
}
else if (Status == STATUS_PAGEFILE_QUOTA)
{
MmSetLRULastPage(CurrentPage);
MmRemoveLRUUserPage(CurrentPage);
MmInsertLRULastUserPage(CurrentPage);
}
CurrentPage = NextPage;