Author: sginsberg
Date: Sun Aug 17 07:05:28 2008
New Revision: 35406
URL:
http://svn.reactos.org/svn/reactos?rev=35406&view=rev
Log:
- Remove dead pager.c
- Remove empty aspace.c
- Move MmKernelAddressSpace to a header
Removed:
trunk/reactos/ntoskrnl/mm/aspace.c
trunk/reactos/ntoskrnl/mm/pager.c
Modified:
trunk/reactos/ntoskrnl/include/internal/mm.h
trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild
Modified: trunk/reactos/ntoskrnl/include/internal/mm.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/…
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Sun Aug 17 07:05:28 2008
@@ -388,6 +388,8 @@
BOOLEAN Dirty
);
+PMM_AVL_TABLE MmKernelAddressSpace;
+
/* marea.c *******************************************************************/
NTSTATUS
Removed: trunk/reactos/ntoskrnl/mm/aspace.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/aspace.c?rev=3…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/aspace.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/aspace.c (removed)
@@ -1,27 +1,0 @@
-/*
- * COPYRIGHT: See COPYING in the top level directory
- * PROJECT: ReactOS kernel
- * FILE: ntoskrnl/mm/aspace.c
- * PURPOSE: Manages address spaces
- *
- * PROGRAMMERS: David Welch (welch(a)cwcom.net)
- */
-
-/* INCLUDES *****************************************************************/
-
-#include <ntoskrnl.h>
-#include <internal/debug.h>
-
-#if defined (ALLOC_PRAGMA)
-#pragma alloc_text(INIT, MmInitializeKernelAddressSpace)
-#endif
-
-
-/* GLOBALS ******************************************************************/
-
-PMM_AVL_TABLE MmKernelAddressSpace;
-
-/* FUNCTIONS *****************************************************************/
-
-
-/* EOF */
Removed: trunk/reactos/ntoskrnl/mm/pager.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pager.c?rev=35…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/pager.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/pager.c (removed)
@@ -1,109 +1,0 @@
-/*
- * COPYRIGHT: See COPYING in the top level directory
- * PROJECT: ReactOS kernel
- * FILE: ntoskrnl/mm/pager.c
- * PURPOSE: Moves infrequently used data out of memory
- *
- * PROGRAMMERS: David Welch (welch(a)cwcom.net)
- */
-
-/* INCLUDES ****************************************************************/
-
-#include <ntoskrnl.h>
-#define NDEBUG
-#include <internal/debug.h>
-
-/* GLOBALS *******************************************************************/
-
-#if 0
-static HANDLE PagerThreadHandle;
-static CLIENT_ID PagerThreadId;
-static KEVENT PagerThreadEvent;
-static BOOLEAN PagerThreadShouldTerminate;
-static ULONG PagerThreadWorkCount;
-#endif
-
-/* FUNCTIONS *****************************************************************/
-
-#if 0
-BOOLEAN
-MiIsPagerThread(VOID)
-{
- return(PsGetCurrentThreadId() == PagerThreadId.UniqueThread);
-}
-
-VOID
-MiStartPagerThread(VOID)
-{
- ULONG WasWorking;
-
- WasWorking = InterlockedIncrement(&PagerThreadWorkCount);
- if (WasWorking == 1)
- {
- KeSetEvent(&PagerThreadEvent, IO_NO_INCREMENT, FALSE);
- }
-}
-
-VOID
-MiStopPagerThread(VOID)
-{
- (VOID)InterlockedDecrement(&PagerThreadWorkCount);
-}
-
-static NTSTATUS STDCALL
-MmPagerThreadMain(PVOID Ignored)
-{
- NTSTATUS Status;
-
- for(;;)
- {
- /* Wake for a low memory situation or a terminate request. */
- Status = KeWaitForSingleObject(&PagerThreadEvent,
- 0,
- KernelMode,
- FALSE,
- NULL);
- if (!NT_SUCCESS(Status))
- {
- DbgPrint("PagerThread: Wait failed\n");
- KEBUGCHECK(0);
- }
- if (PagerThreadShouldTerminate)
- {
- DbgPrint("PagerThread: Terminating\n");
- return(STATUS_SUCCESS);
- }
- do
- {
- /* Try and make some memory available to the system. */
- MmRebalanceMemoryConsumers();
- }
- while(PagerThreadWorkCount > 0);
- }
-}
-
-NTSTATUS MmInitPagerThread(VOID)
-{
- NTSTATUS Status;
-
- PagerThreadShouldTerminate = FALSE;
- PagerThreadWorkCount = 0;
- KeInitializeEvent(&PagerThreadEvent,
- SynchronizationEvent,
- FALSE);
-
- Status = PsCreateSystemThread(&PagerThreadHandle,
- THREAD_ALL_ACCESS,
- NULL,
- NULL,
- &PagerThreadId,
- (PKSTART_ROUTINE) MmPagerThreadMain,
- NULL);
- if (!NT_SUCCESS(Status))
- {
- return(Status);
- }
-
- return(STATUS_SUCCESS);
-}
-#endif
Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.…
==============================================================================
--- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Sun Aug 17 07:05:28 2008
@@ -364,7 +364,6 @@
</directory>
</if>
<file>anonmem.c</file>
- <file>aspace.c</file>
<file>balance.c</file>
<file>cont.c</file>
<file>drvlck.c</file>
@@ -380,7 +379,6 @@
<file>npool.c</file>
<file>pagefile.c</file>
<file>pageop.c</file>
- <file>pager.c</file>
<file>pagfault.c</file>
<file>paging.c</file>
<file>pe.c</file>