[ros-diffs] [ion] 25630: - Implement the balance set manager. Doesn't do much for now except start up the thread queue scanner. - Implement the thread queue scanner, but disable most of it for now, since we're not using the new scheduler.
ion at svn.reactos.org
ion at svn.reactos.org
Thu Jan 25 19:48:57 CET 2007
Author: ion
Date: Thu Jan 25 21:48:56 2007
New Revision: 25630
URL: http://svn.reactos.org/svn/reactos?rev=25630&view=rev
Log:
- Implement the balance set manager. Doesn't do much for now except start up the thread queue scanner.
- Implement the thread queue scanner, but disable most of it for now, since we're not using the new scheduler.
Added:
trunk/reactos/ntoskrnl/ke/balmgr.c
Modified:
trunk/reactos/ntoskrnl/include/internal/ke.h
trunk/reactos/ntoskrnl/include/internal/mm.h
trunk/reactos/ntoskrnl/ke/apc.c
trunk/reactos/ntoskrnl/mm/mminit.c
trunk/reactos/ntoskrnl/mm/mpw.c
trunk/reactos/ntoskrnl/ntoskrnl.rbuild
Modified: trunk/reactos/ntoskrnl/include/internal/ke.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/ke.h?rev=25630&r1=25629&r2=25630&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/ke.h (original)
+++ trunk/reactos/ntoskrnl/include/internal/ke.h Thu Jan 25 21:48:56 2007
@@ -219,6 +219,10 @@
VOID
NTAPI
+KeBalanceSetManager(IN PVOID Context);
+
+VOID
+NTAPI
KiReadyThread(IN PKTHREAD Thread);
NTSTATUS
Modified: trunk/reactos/ntoskrnl/include/internal/mm.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/mm.h?rev=25630&r1=25629&r2=25630&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/mm.h (original)
+++ trunk/reactos/ntoskrnl/include/internal/mm.h Thu Jan 25 21:48:56 2007
@@ -1400,6 +1400,10 @@
NTAPI
MmInitMpwThread(VOID);
+NTSTATUS
+NTAPI
+MmInitBsmThread(VOID);
+
/* pager.c *******************************************************************/
BOOLEAN
Modified: trunk/reactos/ntoskrnl/ke/apc.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/apc.c?rev=25630&r1=25629&r2=25630&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/ke/apc.c (original)
+++ trunk/reactos/ntoskrnl/ke/apc.c Thu Jan 25 21:48:56 2007
@@ -212,7 +212,7 @@
{
/* We were in a gate wait. FIXME: Handle this */
DPRINT1("Not yet supported -- Report this to Alex\n");
- KEBUGCHECK(0);
+ while (TRUE);
}
}
else if ((Thread->State == Waiting) &&
Added: trunk/reactos/ntoskrnl/ke/balmgr.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/balmgr.c?rev=25630&view=auto
==============================================================================
--- trunk/reactos/ntoskrnl/ke/balmgr.c (added)
+++ trunk/reactos/ntoskrnl/ke/balmgr.c Thu Jan 25 21:48:56 2007
@@ -1,0 +1,207 @@
+/*
+* PROJECT: ReactOS Kernel
+* LICENSE: GPL - See COPYING in the top level directory
+* FILE: ntoskrnl/ke/balmgr.c
+* PURPOSE: Balance Set Manager
+* PROGRAMMERS: Alex Ionescu (alex.ionescu at reactos.org)
+*/
+
+/* INCLUDES ******************************************************************/
+
+#include <ntoskrnl.h>
+#define NDEBUG
+#include <debug.h>
+
+/* GLOBALS *******************************************************************/
+
+#define THREAD_BOOST_PRIORITY (LOW_REALTIME_PRIORITY - 1)
+ULONG KiReadyScanLast;
+
+/* PRIVATE FUNCTIONS *********************************************************/
+
+VOID
+NTAPI
+KiScanReadyQueues(IN PKDPC Dpc,
+ IN PVOID DeferredContext,
+ IN PVOID SystemArgument1,
+ IN PVOID SystemArgument2)
+{
+ PULONG ScanLast = DeferredContext;
+ ULONG ScanIndex = *ScanLast;
+ ULONG Count = 10, Number = 16;
+ PKPRCB Prcb = KiProcessorBlock[ScanIndex];
+ ULONG Index = Prcb->QueueIndex;
+ ULONG WaitLimit = KeTickCount.LowPart - 300;
+ ULONG Summary;
+ KIRQL OldIrql;
+ PLIST_ENTRY ListHead, NextEntry;
+ PKTHREAD Thread;
+
+ /* Lock the dispatcher and PRCB */
+ OldIrql = KiAcquireDispatcherLock();
+ KiAcquirePrcbLock(Prcb);
+#ifndef NEW_SCHEDULER
+ goto OldSched;
+#endif
+
+ /* Check if there's any thread that need help */
+ Summary = Prcb->ReadySummary & ((1 << THREAD_BOOST_PRIORITY) - 2);
+ if (Summary)
+ {
+ /* Start scan loop */
+ do
+ {
+ /* Normalize the index */
+ if (Index > (THREAD_BOOST_PRIORITY - 1)) Index = 1;
+
+ /* Loop for ready threads */
+ if (Summary & PRIORITY_MASK(Index))
+ {
+ /* Sanity check */
+ ASSERT(!IsListEmpty(&Prcb->DispatcherReadyListHead[Index]));
+
+ /* Update summary and select list */
+ Summary ^= PRIORITY_MASK(Index);
+ ListHead = &Prcb->DispatcherReadyListHead[Index];
+ NextEntry = ListHead->Flink;
+ do
+ {
+ /* Select a thread */
+ Thread = CONTAINING_RECORD(NextEntry,
+ KTHREAD,
+ WaitListEntry);
+ ASSERT(Thread->Priority == Index);
+
+ /* Check if the thread has been waiting too long */
+ if (WaitLimit >= Thread->WaitTime)
+ {
+ /* Remove the thread from the queue */
+ NextEntry = NextEntry->Blink;
+ ASSERT((Prcb->ReadySummary & PRIORITY_MASK(Index)));
+ if (RemoveEntryList(NextEntry->Flink))
+ {
+ /* The list is empty now */
+ Prcb->ReadySummary ^= PRIORITY_MASK(Index);
+ }
+
+ /* Verify priority decrement and set the new one */
+ ASSERT((Thread->PriorityDecrement >= 0) &&
+ (Thread->PriorityDecrement <=
+ Thread->Priority));
+ Thread->PriorityDecrement += (THREAD_BOOST_PRIORITY -
+ Thread->Priority);
+ ASSERT((Thread->PriorityDecrement >= 0) &&
+ (Thread->PriorityDecrement <=
+ THREAD_BOOST_PRIORITY));
+
+ /* Update priority and insert into ready list */
+ Thread->Priority = THREAD_BOOST_PRIORITY;
+ Thread->Quantum = WAIT_QUANTUM_DECREMENT * 4;
+ KiInsertDeferredReadyList(Thread);
+ Count --;
+ }
+
+ /* Go to the next entry */
+ NextEntry = NextEntry->Flink;
+ Number--;
+ } while((NextEntry != ListHead) && (Number) && (Count));
+ }
+
+ /* Increase index */
+ Index++;
+ } while ((Summary) && (Number) && (Count));
+ }
+
+ /* Release the locks and dispatcher */
+OldSched:
+ KiReleasePrcbLock(Prcb);
+ KiReleaseDispatcherLock(OldIrql);
+
+ /* Update the queue index for next time */
+ if ((Count) && (Number))
+ {
+ /* Reset the queue at index 1 */
+ Prcb->QueueIndex = 1;
+ }
+ else
+ {
+ /* Set the index we're in now */
+ Prcb->QueueIndex = 0;
+ }
+
+ /* Increment the CPU number for next time and normalize to CPU count */
+ ScanIndex++;
+ if (ScanIndex == KeNumberProcessors) ScanIndex = 0;
+
+ /* Return the index */
+ *ScanLast = ScanIndex;
+}
+
+VOID
+NTAPI
+KeBalanceSetManager(IN PVOID Context)
+{
+ KDPC ScanDpc;
+ KTIMER PeriodTimer;
+ LARGE_INTEGER DueTime;
+ KWAIT_BLOCK WaitBlockArray[1];
+ PVOID WaitObjects[1];
+ NTSTATUS Status;
+
+ /* Set us at a low real-time priority level */
+ KeSetPriorityThread(KeGetCurrentThread(), LOW_REALTIME_PRIORITY);
+
+ /* Setup the timer and scanner DPC */
+ KeInitializeTimerEx(&PeriodTimer, SynchronizationTimer);
+ KeInitializeDpc(&ScanDpc, KiScanReadyQueues, &KiReadyScanLast);
+
+ /* Setup the periodic timer */
+ DueTime.QuadPart = -1 * 10 * 1000 * 1000;
+ KeSetTimerEx(&PeriodTimer, DueTime, 1000, &ScanDpc);
+
+ /* Setup the wait objects */
+ WaitObjects[0] = &PeriodTimer;
+ //WaitObjects[1] = MmWorkingSetManagerEvent; // NO WS Management Yet!
+
+ /* Start wait loop */
+ do
+ {
+ /* Wait on our objects */
+ Status = KeWaitForMultipleObjects(1,
+ WaitObjects,
+ WaitAny,
+ Executive,
+ KernelMode,
+ FALSE,
+ NULL,
+ WaitBlockArray);
+ switch (Status)
+ {
+ /* Check if our timer expired */
+ case STATUS_WAIT_0:
+
+ /* Adjust lookaside lists */
+ //ExAdjustLookasideDepth();
+
+ /* Call the working set manager */
+ //MmWorkingSetManager();
+
+ /* FIXME: Outswap stacks */
+
+ /* Done */
+ break;
+
+ /* Check if the working set manager notified us */
+ case STATUS_WAIT_1:
+
+ /* Call the working set manager */
+ //MmWorkingSetManager();
+ break;
+
+ /* Anything else */
+ default:
+ DPRINT1("BALMGR: Illegal wait status, %lx =\n", Status);
+ break;
+ }
+ } while (TRUE);
+}
Modified: trunk/reactos/ntoskrnl/mm/mminit.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=25630&r1=25629&r2=25630&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/mm/mminit.c (original)
+++ trunk/reactos/ntoskrnl/mm/mminit.c Thu Jan 25 21:48:56 2007
@@ -482,6 +482,9 @@
*/
MmInitMpwThread();
+ /* Initialize the balance set manager */
+ MmInitBsmThread();
+
/* FIXME: Read parameters from memory */
}
Modified: trunk/reactos/ntoskrnl/mm/mpw.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mpw.c?rev=25630&r1=25629&r2=25630&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/mm/mpw.c (original)
+++ trunk/reactos/ntoskrnl/mm/mpw.c Thu Jan 25 21:48:56 2007
@@ -123,3 +123,26 @@
return(STATUS_SUCCESS);
}
+
+NTSTATUS
+NTAPI
+MmInitBsmThread(VOID)
+{
+ NTSTATUS Status;
+ OBJECT_ATTRIBUTES ObjectAttributes;
+ HANDLE ThreadHandle;
+
+ /* Create the thread */
+ InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL);
+ Status = PsCreateSystemThread(&ThreadHandle,
+ THREAD_ALL_ACCESS,
+ &ObjectAttributes,
+ NULL,
+ NULL,
+ KeBalanceSetManager,
+ NULL);
+
+ /* Close the handle and return status */
+ ZwClose(ThreadHandle);
+ return Status;
+}
Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?rev=25630&r1=25629&r2=25630&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original)
+++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Thu Jan 25 21:48:56 2007
@@ -47,6 +47,7 @@
</directory>
</if>
<file>apc.c</file>
+ <file>balmgr.c</file>
<file>bug.c</file>
<file>clock.c</file>
<file>config.c</file>
More information about the Ros-diffs
mailing list