Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-14 08:26:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Replaced MP with CONFIG_SMP.

Browse source 
- Implemented an idle processor map.
- Fixed the initialisation of the first kernel stack for the application processors.

svn path=/trunk/; revision=12833
This commit is contained in:
Hartmut Birr 2005-01-05 19:26:51 +00:00
parent f8d9c5d204
commit b0c84d931e
2 changed files with 56 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/ntoskrnl/ke/main.c
View file

@ -518,11 +518,7 @@ ExpInitializeExecutive(VOID)
PsPrepareForApplicationProcessorInit(KeNumberProcessors);
/* Allocate a stack for use when booting the processor */
/* FIXME: The nonpaged memory for the stack is not released after use */
ProcessorStack =
(char*)ExAllocatePool(NonPagedPool, MM_STACK_SIZE) + MM_STACK_SIZE;
Ki386InitialStackArray[((int)KeNumberProcessors)] =
(PVOID)((char*)ProcessorStack - MM_STACK_SIZE);
ProcessorStack = Ki386InitialStackArray[((int)KeNumberProcessors)] + MM_STACK_SIZE;
HalStartNextProcessor(0, (ULONG)ProcessorStack - 2*sizeof(FX_SAVE_AREA));
KeNumberProcessors++;

58
reactos/ntoskrnl/ps/thread.c
View file

@ -34,11 +34,14 @@ POBJECT_TYPE EXPORTED PsThreadType = NULL;
LONG PiNrThreadsAwaitingReaping = 0;
extern PVOID Ki386InitialStackArray[MAXIMUM_PROCESSORS];
/*
* PURPOSE: List of threads associated with each priority level
*/
static LIST_ENTRY PriorityListHead[MAXIMUM_PRIORITY];
static ULONG PriorityListMask = 0;
static ULONG IdleProcessorMask = 0;
static BOOLEAN DoneInitYet = FALSE;
static KEVENT PiReaperThreadEvent;
static BOOLEAN PiReaperThreadShouldTerminate = FALSE;
@ -56,7 +59,7 @@ static GENERIC_MAPPING PiThreadMapping = {STANDARD_RIGHTS_READ | THREAD_GET_CONT
*/
PKTHREAD STDCALL KeGetCurrentThread(VOID)
{
#ifdef MP
#ifdef CONFIG_SMP
ULONG Flags;
PKTHREAD Thread;
Ke386SaveFlags(Flags);
@ -299,8 +302,10 @@ VOID PsDumpThreads(BOOLEAN IncludeSystem)
Thread = CONTAINING_RECORD(AThread, ETHREAD, ThreadListEntry);
nThreads++;
DbgPrint("Thread->Tcb.State %d PID.TID %d.%d Name %.8s Stack: \n",
DbgPrint("Thread->Tcb.State %d Affinity %08x Priority %d PID.TID %d.%d Name %.8s Stack: \n",
Thread->Tcb.State,
Thread->Tcb.Affinity,
Thread->Tcb.Priority,
Thread->ThreadsProcess->UniqueProcessId,
Thread->Cid.UniqueThread,
Thread->ThreadsProcess->ImageFileName);
@ -425,6 +430,7 @@ VOID PsDispatchThreadNoLock (ULONG NewThreadStatus)
if (Candidate != NULL)
{
PETHREAD OldThread;
PKTHREAD IdleThread;
DPRINT("Scheduling %x(%d)\n",Candidate, CurrentPriority);
@ -432,6 +438,16 @@ VOID PsDispatchThreadNoLock (ULONG NewThreadStatus)
OldThread = CurrentThread;
CurrentThread = Candidate;
IdleThread = KeGetCurrentKPCR()->PrcbData.IdleThread;
if (&OldThread->Tcb == IdleThread)
{
IdleProcessorMask &= ~Affinity;
}
else if (&CurrentThread->Tcb == IdleThread)
{
IdleProcessorMask |= Affinity;
}
MmUpdatePageDir(PsGetCurrentProcess(),(PVOID)CurrentThread->ThreadsProcess, sizeof(EPROCESS));
@ -475,12 +491,41 @@ PsUnblockThread(PETHREAD Thread, PNTSTATUS WaitStatus)
}
else
{
ULONG Processor;
KAFFINITY Affinity;
if (WaitStatus != NULL)
{
Thread->Tcb.WaitStatus = *WaitStatus;
}
Thread->Tcb.State = THREAD_STATE_READY;
PsInsertIntoThreadList(Thread->Tcb.Priority, Thread);
Processor = KeGetCurrentProcessorNumber();
Affinity = Thread->Tcb.Affinity;
if (!(IdleProcessorMask & (1 << Processor) & Affinity) &&
(IdleProcessorMask & ~(1 << Processor) & Affinity))
{
ULONG i;
for (i = 0; i < KeNumberProcessors - 1; i++)
{
Processor++;
if (Processor >= KeNumberProcessors)
{
Processor = 0;
}
if (IdleProcessorMask & (1 << Processor) & Affinity)
{
#if 0
/* FIXME:
* Reschedule the threads on an other processor
*/
KeReleaseDispatcherDatabaseLockFromDpcLevel();
KiRequestReschedule(Processor);
KeAcquireDispatcherDatabaseLockAtDpcLevel();
#endif
break;
}
}
}
}
}
@ -634,6 +679,10 @@ PsSetThreadWin32Thread(
VOID
PsApplicationProcessorInit(VOID)
{
KIRQL oldIrql;
oldIrql = KeAcquireDispatcherDatabaseLock();
IdleProcessorMask |= (1 << KeGetCurrentProcessorNumber());
KeReleaseDispatcherDatabaseLock(oldIrql);
}
VOID INIT_FUNCTION
@ -648,7 +697,7 @@ PsPrepareForApplicationProcessorInit(ULONG Id)
&IdleThreadHandle,
THREAD_ALL_ACCESS,
NULL,
TRUE);
FALSE);
IdleThread->Tcb.State = THREAD_STATE_RUNNING;
IdleThread->Tcb.FreezeCount = 0;
IdleThread->Tcb.Affinity = 1 << Id;
@ -657,6 +706,9 @@ PsPrepareForApplicationProcessorInit(ULONG Id)
IdleThread->Tcb.BasePriority = LOW_PRIORITY;
Pcr->PrcbData.IdleThread = &IdleThread->Tcb;
Pcr->PrcbData.CurrentThread = &IdleThread->Tcb;
Ki386InitialStackArray[Id] = (PVOID)IdleThread->Tcb.StackLimit;
NtClose(IdleThreadHandle);
DPRINT("IdleThread for Processor %d has PID %d\n",
Id, IdleThread->Cid.UniqueThread);