Ros-diffs January 2005

ros-diffs@reactos.org

28 participants
703 discussions

[hbirr] 12694: - Simplified KeSetSystemAffinityThread and KeRevertToUserAffinityThread for non smp machines.

by hbirr＠svn.reactos.com

- Simplified KeSetSystemAffinityThread and KeRevertToUserAffinityThread for non smp machines. - Set the number of processors before calling PiInitProcessManager. - Lock the dispatcher database while accessing some values in the thread structure in KeWaitForMultipleObjects. - Used Ke-functions to initialize the idle thread. - Fixed the offset to the stack frame in PsDumpThreads. - Implemented KeSetAffinityThread. - Fixed KeSetPriorityThread for threads on the ready queue. Modified: trunk/reactos/ntoskrnl/ke/event.c Modified: trunk/reactos/ntoskrnl/ke/kthread.c Modified: trunk/reactos/ntoskrnl/ke/main.c Modified: trunk/reactos/ntoskrnl/ke/mutex.c Modified: trunk/reactos/ntoskrnl/ke/sem.c Modified: trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/ntoskrnl/ps/idle.c Modified: trunk/reactos/ntoskrnl/ps/thread.c _____ Modified: trunk/reactos/ntoskrnl/ke/event.c --- trunk/reactos/ntoskrnl/ke/event.c 2005-01-01 11:42:12 UTC (rev 12693) +++ trunk/reactos/ntoskrnl/ke/event.c 2005-01-01 11:47:33 UTC (rev 12694) @@ -98,7 +98,7 @@ else { KTHREAD *Thread = KeGetCurrentThread(); - Thread->WaitNext = Wait; + Thread->WaitNext = TRUE; Thread->WaitIrql = OldIrql; } @@ -128,7 +128,7 @@ else { KTHREAD *Thread = KeGetCurrentThread(); - Thread->WaitNext = Wait; + Thread->WaitNext = TRUE; Thread->WaitIrql = OldIrql; } _____ Modified: trunk/reactos/ntoskrnl/ke/kthread.c --- trunk/reactos/ntoskrnl/ke/kthread.c 2005-01-01 11:42:12 UTC (rev 12693) +++ trunk/reactos/ntoskrnl/ke/kthread.c 2005-01-01 11:47:33 UTC (rev 12694) @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: kthread.c,v 1.61 2004/12/12 23:18:55 navaraf Exp $ +/* $Id$ * * FILE: ntoskrnl/ke/kthread.c * PURPOSE: Microkernel thread support @@ -237,9 +237,9 @@ Thread->ApcState.UserApcPending = 0; Thread->ContextSwitches = 0; Thread->WaitStatus = STATUS_SUCCESS; - Thread->WaitIrql = 0; + Thread->WaitIrql = PASSIVE_LEVEL; Thread->WaitMode = 0; - Thread->WaitNext = 0; + Thread->WaitNext = FALSE; Thread->WaitBlockList = NULL; Thread->WaitListEntry.Flink = NULL; Thread->WaitListEntry.Blink = NULL; @@ -310,6 +310,7 @@ STDCALL KeRevertToUserAffinityThread(VOID) { +#ifdef MP PKTHREAD CurrentThread; KIRQL oldIrql; @@ -335,6 +336,7 @@ PsDispatchThreadNoLock(THREAD_STATE_READY); KeLowerIrql(oldIrql); } +#endif } /* @@ -365,6 +367,7 @@ STDCALL KeSetSystemAffinityThread(IN KAFFINITY Affinity) { +#ifdef MP PKTHREAD CurrentThread; KIRQL oldIrql; @@ -372,7 +375,6 @@ CurrentThread = KeGetCurrentThread(); - ASSERT(CurrentThread->SystemAffinityActive == FALSE); ASSERT(Affinity & ((1 << KeNumberProcessors) - 1)); /* Set the System Affinity Specified */ @@ -391,6 +393,7 @@ PsDispatchThreadNoLock(THREAD_STATE_READY); KeLowerIrql(oldIrql); } +#endif } /* _____ Modified: trunk/reactos/ntoskrnl/ke/main.c --- trunk/reactos/ntoskrnl/ke/main.c 2005-01-01 11:42:12 UTC (rev 12693) +++ trunk/reactos/ntoskrnl/ke/main.c 2005-01-01 11:47:33 UTC (rev 12694) @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: main.c,v 1.212 2004/12/24 17:06:58 navaraf Exp $ +/* $Id$ * * PROJECT: ReactOS kernel * FILE: ntoskrnl/ke/main.c @@ -461,10 +461,10 @@ KeInit2(); -#if 1 +#if 0 if (KeMemoryMapRangeCount > 0) { - DPRINT("MemoryMap:\n"); + DPRINT1("MemoryMap:\n"); for (i = 0; i < KeMemoryMapRangeCount; i++) { switch(KeMemoryMap[i].Type) @@ -484,7 +484,7 @@ default: sprintf(str, "type %lu", KeMemoryMap[i].Type); } - DPRINT("%08x - %08x %s\n", KeMemoryMap[i].BaseAddrLow, KeMemoryMap[i].BaseAddrLow + KeMemoryMap[i].LengthLow, str); + DPRINT1("%08x - %08x %s\n", KeMemoryMap[i].BaseAddrLow, KeMemoryMap[i].BaseAddrLow + KeMemoryMap[i].LengthLow, str); } } #endif @@ -501,6 +501,8 @@ if (!SeInit2()) KEBUGCHECK(SECURITY1_INITIALIZATION_FAILED); + KeNumberProcessors = 1; + PiInitProcessManager(); if (KdPollBreakIn ()) @@ -509,8 +511,6 @@ } /* Initialize all processors */ - KeNumberProcessors = 1; - while (!HalAllProcessorsStarted()) { PVOID ProcessorStack; _____ Modified: trunk/reactos/ntoskrnl/ke/mutex.c --- trunk/reactos/ntoskrnl/ke/mutex.c 2005-01-01 11:42:12 UTC (rev 12693) +++ trunk/reactos/ntoskrnl/ke/mutex.c 2005-01-01 11:47:33 UTC (rev 12694) @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: mutex.c,v 1.19 2004/11/21 18:33:54 gdalsnes Exp $ +/* $Id$ * * PROJECT: ReactOS kernel * FILE: ntoskrnl/ke/mutex.c @@ -92,7 +92,7 @@ else { KTHREAD *Thread = KeGetCurrentThread(); - Thread->WaitNext = Wait; + Thread->WaitNext = TRUE; Thread->WaitIrql = OldIrql; } @@ -201,7 +201,7 @@ else { KTHREAD *Thread = KeGetCurrentThread(); - Thread->WaitNext = Wait; + Thread->WaitNext = TRUE; Thread->WaitIrql = OldIrql; } _____ Modified: trunk/reactos/ntoskrnl/ke/sem.c --- trunk/reactos/ntoskrnl/ke/sem.c 2005-01-01 11:42:12 UTC (rev 12693) +++ trunk/reactos/ntoskrnl/ke/sem.c 2005-01-01 11:47:33 UTC (rev 12694) @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: sem.c,v 1.16 2004/11/21 18:33:54 gdalsnes Exp $ +/* $Id$ * * PROJECT: ReactOS kernel * FILE: ntoskrnl/ke/sem.c @@ -115,7 +115,7 @@ else { KTHREAD *Thread = KeGetCurrentThread(); - Thread->WaitNext = Wait; + Thread->WaitNext = TRUE; Thread->WaitIrql = OldIrql; } _____ Modified: trunk/reactos/ntoskrnl/ke/wait.c --- trunk/reactos/ntoskrnl/ke/wait.c 2005-01-01 11:42:12 UTC (rev 12693) +++ trunk/reactos/ntoskrnl/ke/wait.c 2005-01-01 11:47:33 UTC (rev 12694) @@ -730,14 +730,22 @@ PsBlockThread(&Status, Alertable, WaitMode, TRUE, OldIrql, (UCHAR)WaitReason); //kernel queues - //FIXME: dispatcher lock not held here! + OldIrql = KeAcquireDispatcherDatabaseLock (); if (CurrentThread->Queue && WaitReason != WrQueue) { DPRINT("queue: wake from something else\n"); CurrentThread->Queue->CurrentCount++; } + if (Status == STATUS_KERNEL_APC) + { + CurrentThread->WaitNext = TRUE; + CurrentThread->WaitIrql = OldIrql; + } + else + { + KeReleaseDispatcherDatabaseLock(OldIrql); + } - } while (Status == STATUS_KERNEL_APC); _____ Modified: trunk/reactos/ntoskrnl/ps/idle.c --- trunk/reactos/ntoskrnl/ps/idle.c 2005-01-01 11:42:12 UTC (rev 12693) +++ trunk/reactos/ntoskrnl/ps/idle.c 2005-01-01 11:47:33 UTC (rev 12694) @@ -50,8 +50,6 @@ VOID INIT_FUNCTION PsInitIdleThread(VOID) { - KPRIORITY Priority; - ULONG Affinity; NTSTATUS Status; PETHREAD IdleThread; HANDLE IdleThreadHandle; @@ -63,39 +61,27 @@ NULL, PsIdleThreadMain, NULL); - if(!NT_SUCCESS(Status)) { + if(!NT_SUCCESS(Status)) + { DPRINT("Couldn't create Idle System Thread!"); KEBUGCHECK(0); return; } - - Priority = LOW_PRIORITY; - Status = NtSetInformationThread(IdleThreadHandle, - ThreadPriority, - &Priority, - sizeof(Priority)); - if(!NT_SUCCESS(Status)) { - DPRINT("Couldn't set Priority to Idle System Thread!"); - return; - } - - Affinity = 1 << 0; - Status = NtSetInformationThread(IdleThreadHandle, - ThreadAffinityMask, - &Affinity, - sizeof(Affinity)); - if(!NT_SUCCESS(Status)) { - DPRINT("Couldn't set Affinity Mask to Idle System Thread!"); - } Status = ObReferenceObjectByHandle(IdleThreadHandle, THREAD_ALL_ACCESS, PsThreadType, KernelMode, (PVOID*)&IdleThread, NULL); - if(!NT_SUCCESS(Status)) { + if(!NT_SUCCESS(Status)) + { DPRINT("Couldn't get pointer to Idle System Thread!"); + KEBUGCHECK(0); + return; } - KeGetCurrentKPCR()->PrcbData.IdleThread = &IdleThread->Tcb; NtClose(IdleThreadHandle); + KeGetCurrentKPCR()->PrcbData.IdleThread = &IdleThread->Tcb; + KeSetPriorityThread(&IdleThread->Tcb, LOW_PRIORITY); + KeSetAffinityThread(&IdleThread->Tcb, 1 << 0); + } _____ Modified: trunk/reactos/ntoskrnl/ps/thread.c --- trunk/reactos/ntoskrnl/ps/thread.c 2005-01-01 11:42:12 UTC (rev 12693) +++ trunk/reactos/ntoskrnl/ps/thread.c 2005-01-01 11:47:33 UTC (rev 12694) @@ -1,4 +1,4 @@ -/* $Id: thread.c,v 1.141 2004/12/12 17:25:53 hbirr Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -243,9 +243,20 @@ } static VOID +KiRequestReschedule(CCHAR Processor) +{ + PKPCR Pcr; + + Pcr = (PKPCR)(KPCR_BASE + Processor * PAGE_SIZE); + Pcr->PrcbData.QuantumEnd = TRUE; + KiIpiSendRequest(1 << Processor, IPI_REQUEST_DPC); +} + +static VOID PsInsertIntoThreadList(KPRIORITY Priority, PETHREAD Thread) { ASSERT(THREAD_STATE_READY == Thread->Tcb.State); + ASSERT(Thread->Tcb.Priority == Priority); if (Priority >= MAXIMUM_PRIORITY || Priority < LOW_PRIORITY) { DPRINT1("Invalid thread priority (%d)\n", Priority); @@ -298,7 +309,7 @@ { ULONG i = 0; PULONG Esp = (PULONG)Thread->Tcb.KernelStack; - PULONG Ebp = (PULONG)Esp[3]; + PULONG Ebp = (PULONG)Esp[4]; DbgPrint("Ebp 0x%.8X\n", Ebp); while(Ebp != 0 && Ebp >= (PULONG)Thread->Tcb.StackLimit) { @@ -306,7 +317,7 @@ Ebp = (PULONG)Ebp[0]; i++; } - if((i % 8) != 7) + if((i % 8) != 0) { DbgPrint("\n"); } @@ -427,7 +438,8 @@ return; } } - CPRINT("CRITICAL: No threads are ready\n"); + CPRINT("CRITICAL: No threads are ready (CPU%d)\n", KeGetCurrentProcessorNumber()); + PsDumpThreads(TRUE); KEBUGCHECK(0); } @@ -441,10 +453,6 @@ return; } oldIrql = KeAcquireDispatcherDatabaseLock(); - /* - * Save wait IRQL - */ - KeGetCurrentThread()->WaitIrql = oldIrql; PsDispatchThreadNoLock(NewThreadStatus); KeLowerIrql(oldIrql); } @@ -510,7 +518,6 @@ { Thread->Tcb.Alertable = Alertable; Thread->Tcb.WaitMode = (UCHAR)WaitMode; - Thread->Tcb.WaitIrql = WaitIrql; Thread->Tcb.WaitReason = WaitReason; PsDispatchThreadNoLock(THREAD_STATE_BLOCKED); @@ -646,6 +653,7 @@ IdleThread->Tcb.Affinity = 1 << Id; IdleThread->Tcb.UserAffinity = 1 << Id; IdleThread->Tcb.Priority = LOW_PRIORITY; + IdleThread->Tcb.BasePriority = LOW_PRIORITY; Pcr->PrcbData.IdleThread = &IdleThread->Tcb; Pcr->PrcbData.CurrentThread = &IdleThread->Tcb; NtClose(IdleThreadHandle); @@ -773,6 +781,8 @@ KIRQL oldIrql; PKTHREAD CurrentThread; ULONG Mask; + int i; + PKPCR Pcr; if (Priority < LOW_PRIORITY || Priority >= MAXIMUM_PRIORITY) { @@ -782,15 +792,15 @@ oldIrql = KeAcquireDispatcherDatabaseLock(); OldPriority = Thread->Priority; - Thread->BasePriority = Thread->Priority = (CHAR)Priority; if (OldPriority != Priority) { + CurrentThread = KeGetCurrentThread(); if (Thread->State == THREAD_STATE_READY) { PsRemoveFromThreadList((PETHREAD)Thread); + Thread->BasePriority = Thread->Priority = (CHAR)Priority; PsInsertIntoThreadList(Priority, (PETHREAD)Thread); - CurrentThread = KeGetCurrentThread(); if (CurrentThread->Priority < Priority) { PsDispatchThreadNoLock(THREAD_STATE_READY); @@ -800,18 +810,40 @@ } else if (Thread->State == THREAD_STATE_RUNNING) { + Thread->BasePriority = Thread->Priority = (CHAR)Priority; if (Priority < OldPriority) { /* Check for threads with a higher priority */ Mask = ~((1 << (Priority + 1)) - 1); if (PriorityListMask & Mask) { - PsDispatchThreadNoLock(THREAD_STATE_READY); - KeLowerIrql(oldIrql); - return (OldPriority); + if (Thread == CurrentThread) + { + PsDispatchThreadNoLock(THREAD_STATE_READY); + KeLowerIrql(oldIrql); + return (OldPriority); + } + else + { + for (i = 0; i < KeNumberProcessors; i++) + { + Pcr = (PKPCR)(KPCR_BASE + i * PAGE_SIZE); + if (Pcr->PrcbData.CurrentThread == Thread) + { + KeReleaseDispatcherDatabaseLockFromDpcLevel(); + KiRequestReschedule(i); + KeLowerIrql(oldIrql); + return (OldPriority); + } + } + } } } } + else + { + Thread->BasePriority = Thread->Priority = (CHAR)Priority; + } } KeReleaseDispatcherDatabaseLock(oldIrql); return(OldPriority); @@ -822,14 +854,61 @@ */ NTSTATUS STDCALL KeSetAffinityThread(PKTHREAD Thread, - PVOID AfMask) + KAFFINITY Affinity) /* * Sets thread's affinity */ { - DPRINT1("KeSetAffinityThread() is a stub returning STATUS_SUCCESS"); - return STATUS_SUCCESS; // FIXME: Use function below - //return ZwSetInformationThread(handle, ThreadAffinityMask,<pointer to affinity mask>,sizeof(KAFFINITY)); + KIRQL oldIrql; + ULONG i; + PKPCR Pcr; + KAFFINITY ProcessorMask; + + DPRINT("KeSetAffinityThread(Thread %x, Affinity %x)\n", Thread, Affinity); + + ASSERT(Affinity & ((1 << KeNumberProcessors) - 1)); + + oldIrql = KeAcquireDispatcherDatabaseLock(); + + Thread->UserAffinity = Affinity; + if (Thread->SystemAffinityActive == FALSE) + { + Thread->Affinity = Affinity; + if (Thread->State == THREAD_STATE_RUNNING) + { + ProcessorMask = 1 << KeGetCurrentKPCR()->ProcessorNumber; + if (Thread == KeGetCurrentThread()) + { + if (!(Affinity & ProcessorMask)) + { + PsDispatchThreadNoLock(THREAD_STATE_READY); + KeLowerIrql(oldIrql); + return STATUS_SUCCESS; + } + } + else + { + for (i = 0; i < KeNumberProcessors; i++) + { + Pcr = (PKPCR)(KPCR_BASE + i * PAGE_SIZE); + if (Pcr->PrcbData.CurrentThread == Thread) + { + if (!(Affinity & ProcessorMask)) + { + KeReleaseDispatcherDatabaseLockFromDpcLevel(); + KiRequestReschedule(i); + KeLowerIrql(oldIrql); + return STATUS_SUCCESS; + } + break; + } + } + ASSERT (i < KeNumberProcessors); + } + } + } + KeReleaseDispatcherDatabaseLock(oldIrql); + return STATUS_SUCCESS; }

19 years, 11 months

[mf] 12693: eliminate 'using uninitialized variable' warning

by mf＠svn.reactos.com

eliminate 'using uninitialized variable' warning Modified: trunk/reactos/ntoskrnl/mm/elf.c _____ Modified: trunk/reactos/ntoskrnl/mm/elf.c --- trunk/reactos/ntoskrnl/mm/elf.c 2005-01-01 11:33:31 UTC (rev 12692) +++ trunk/reactos/ntoskrnl/mm/elf.c 2005-01-01 11:42:12 UTC (rev 12693) @@ -1,4 +1,4 @@ -/* $Id: elf.c,v 1.3 2004/12/30 08:13:00 hyperion Exp $ +/* $Id$ */ #include <ntoskrnl.h> @@ -365,7 +365,7 @@ Elf_Off cbPHdrOffset; PVOID pBuffer; PMM_SECTION_SEGMENT pssSegments; - Elf_Addr nImageBase; + Elf_Addr nImageBase = 0; Elf_Addr nEntryPoint; ULONG nPrevVirtualEndOfSegment; ULONG i;

19 years, 11 months

[hbirr] 12692: - Fixed the access to the KPCR in KiQuantumEnd.

by hbirr＠svn.reactos.com

- Fixed the access to the KPCR in KiQuantumEnd. Modified: trunk/reactos/ntoskrnl/ke/dpc.c _____ Modified: trunk/reactos/ntoskrnl/ke/dpc.c --- trunk/reactos/ntoskrnl/ke/dpc.c 2005-01-01 11:31:43 UTC (rev 12691) +++ trunk/reactos/ntoskrnl/ke/dpc.c 2005-01-01 11:33:31 UTC (rev 12692) @@ -19,7 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: dpc.c,v 1.50 2004/12/24 17:06:58 navaraf Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -411,7 +411,7 @@ * Called when deleting a Driver. */ { - KPRCB Prcb; + PKPRCB Prcb; PKTHREAD CurrentThread; KIRQL OldIrql; PKPROCESS Process; @@ -419,7 +419,7 @@ KPRIORITY NewPriority; /* Lock dispatcher, get current thread */ - Prcb = KeGetCurrentKPCR()->PrcbData; + Prcb = &KeGetCurrentKPCR()->PrcbData; CurrentThread = KeGetCurrentThread(); OldIrql = KeRaiseIrqlToSynchLevel(); @@ -427,8 +427,8 @@ Process = CurrentThread->ApcState.Process; /* Set DPC Event if requested */ - if (Prcb.DpcSetEventRequest) { - KeSetEvent(Prcb.DpcEvent, 0, 0); + if (Prcb->DpcSetEventRequest) { + KeSetEvent(Prcb->DpcEvent, 0, 0); } /* Check if Quantum expired */ @@ -449,7 +449,7 @@ CurrentThread->Priority = NewPriority; } else { /* Queue new thread if none is already */ - if (Prcb.NextThread == NULL) { + if (Prcb->NextThread == NULL) { /* FIXME: Schedule a New Thread, when ROS will have NT Scheduler */ } else { /* Make the current thread non-premeptive if a new thread is queued */

19 years, 11 months

[hbirr] 12691: - Implemented the interrupt handling for smp machines.

by hbirr＠svn.reactos.com

- Implemented the interrupt handling for smp machines. - Enabled interrupts (irqs) on all processors. Modified: trunk/reactos/hal/halx86/mp/mpsirql.c Modified: trunk/reactos/hal/halx86/mp/processor_mp.c _____ Modified: trunk/reactos/hal/halx86/mp/mpsirql.c --- trunk/reactos/hal/halx86/mp/mpsirql.c 2005-01-01 11:28:46 UTC (rev 12690) +++ trunk/reactos/hal/halx86/mp/mpsirql.c 2005-01-01 11:31:43 UTC (rev 12691) @@ -375,6 +375,8 @@ return FALSE; } + /* FIXME: We must check if the requested and the assigned interrupt mode is the same */ + irq = VECTOR2IRQ (Vector); IOAPICUnmaskIrq (irq); _____ Modified: trunk/reactos/hal/halx86/mp/processor_mp.c --- trunk/reactos/hal/halx86/mp/processor_mp.c 2005-01-01 11:28:46 UTC (rev 12690) +++ trunk/reactos/hal/halx86/mp/processor_mp.c 2005-01-01 11:31:43 UTC (rev 12691) @@ -1,4 +1,4 @@ -/* $Id: processor_mp.c,v 1.2 2004/12/25 11:21:48 navaraf Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -186,10 +186,15 @@ IOAPIC_ROUTE_ENTRY Entry; ULONG Apic = IrqApicMap[Irq]; - - *((PULONG)&Entry) = IOAPICRead(Apic, IOAPIC_REDTBL+2*Irq); - Entry.mask = 1; - IOAPICWrite(Apic, IOAPIC_REDTBL+2*Irq, *((PULONG)&Entry)); + *(((PULONG)&Entry)+0) = IOAPICRead(Apic, IOAPIC_REDTBL+2*Irq); + *(((PULONG)&Entry)+1) = IOAPICRead(Apic, IOAPIC_REDTBL+2*Irq+1); + Entry.dest.logical.logical_dest &= ~(1 << KeGetCurrentProcessorNumber()); + if (Entry.dest.logical.logical_dest == 0) + { + Entry.mask = 1; + } + IOAPICWrite(Apic, IOAPIC_REDTBL+2*Irq+1, *(((PULONG)&Entry)+1)); + IOAPICWrite(Apic, IOAPIC_REDTBL+2*Irq, *(((PULONG)&Entry)+0)); } @@ -199,9 +204,12 @@ IOAPIC_ROUTE_ENTRY Entry; ULONG Apic = IrqApicMap[Irq]; - *((PULONG)&Entry) = IOAPICRead(Apic, IOAPIC_REDTBL+2*IrqPinMap[Irq]); + *(((PULONG)&Entry)+0) = IOAPICRead(Apic, IOAPIC_REDTBL+2*Irq); + *(((PULONG)&Entry)+1) = IOAPICRead(Apic, IOAPIC_REDTBL+2*Irq+1); + Entry.dest.logical.logical_dest |= 1 << KeGetCurrentProcessorNumber(); Entry.mask = 0; - IOAPICWrite(Apic, IOAPIC_REDTBL+2*IrqPinMap[Irq], *((PULONG)&Entry)); + IOAPICWrite(Apic, IOAPIC_REDTBL+2*Irq+1, *(((PULONG)&Entry)+1)); + IOAPICWrite(Apic, IOAPIC_REDTBL+2*Irq, *(((PULONG)&Entry)+0)); } static VOID @@ -619,15 +627,8 @@ entry.delivery_mode = (APIC_DM_LOWEST >> 8); entry.dest_mode = 1; /* logical delivery */ entry.mask = 1; /* disable IRQ */ -#if 0 - /* - * FIXME: - * Some drivers are not able to deal with more than one cpu. - */ - entry.dest.logical.logical_dest = OnlineCPUs; -#else - entry.dest.logical.logical_dest = 1 << 0; -#endif + entry.dest.logical.logical_dest = 0; + idx = IOAPICGetIrqEntry(apic,pin,INT_VECTORED); if (idx == -1) { @@ -650,11 +651,7 @@ { entry.trigger = 1; entry.mask = 1; // disable -#if 0 - entry.dest.logical.logical_dest = OnlineCPUs; -#else - entry.dest.logical.logical_dest = 1 << 0; -#endif + entry.dest.logical.logical_dest = 0; } irq = Pin2Irq(idx, apic, pin);

19 years, 11 months

[hbirr] 12690: - Implemented KeAcquireInterruptSpinLock and KeReleaseInterruptSpinLock.

by hbirr＠svn.reactos.com

- Implemented KeAcquireInterruptSpinLock and KeReleaseInterruptSpinLock. - Implemented the interrupt handling for smp machines. Modified: trunk/reactos/include/ddk/kefuncs.h Modified: trunk/reactos/include/ntos/zwtypes.h Modified: trunk/reactos/ntoskrnl/io/irq.c Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c Modified: trunk/reactos/ntoskrnl/ke/spinlock.c _____ Modified: trunk/reactos/include/ddk/kefuncs.h --- trunk/reactos/include/ddk/kefuncs.h 2005-01-01 11:22:12 UTC (rev 12689) +++ trunk/reactos/include/ddk/kefuncs.h 2005-01-01 11:28:46 UTC (rev 12690) @@ -149,17 +149,17 @@ EVENT_TYPE Type, BOOLEAN State); -NTSTATUS STDCALL KeInitializeInterrupt(PKINTERRUPT InterruptObject, - PKSERVICE_ROUTINE ServiceRoutine, - PVOID ServiceContext, - PKSPIN_LOCK SpinLock, - ULONG Vector, - KIRQL Irql, - KIRQL SynchronizeIrql, - KINTERRUPT_MODE InterruptMode, - BOOLEAN ShareVector, - KAFFINITY ProcessorEnableMask, - BOOLEAN FloatingSave); +VOID STDCALL KeInitializeInterrupt(PKINTERRUPT InterruptObject, + PKSERVICE_ROUTINE ServiceRoutine, + PVOID ServiceContext, + PKSPIN_LOCK SpinLock, + ULONG Vector, + KIRQL Irql, + KIRQL SynchronizeIrql, + KINTERRUPT_MODE InterruptMode, + BOOLEAN ShareVector, + CHAR ProcessorNumber, + BOOLEAN FloatingSave); VOID STDCALL KeInitializeMutant(IN PKMUTANT Mutant, IN BOOLEAN InitialOwner); @@ -367,6 +367,10 @@ BOOLEAN STDCALL KeRosPrintAddress(PVOID address); +NTSTATUS STDCALL +KeSetAffinityThread(PKTHREAD Thread, + KAFFINITY Affinity); + LONG STDCALL KeSetBasePriorityThread(struct _KTHREAD* Thread, LONG Increment); _____ Modified: trunk/reactos/include/ntos/zwtypes.h --- trunk/reactos/include/ntos/zwtypes.h 2005-01-01 11:22:12 UTC (rev 12689) +++ trunk/reactos/include/ntos/zwtypes.h 2005-01-01 11:28:46 UTC (rev 12690) @@ -1818,13 +1818,17 @@ { ULONG Vector; KAFFINITY ProcessorEnableMask; - PKSPIN_LOCK IrqLock; + KSPIN_LOCK SpinLock; + PKSPIN_LOCK ActualLock; BOOLEAN Shareable; BOOLEAN FloatingSave; + CHAR ProcessorNumber; PKSERVICE_ROUTINE ServiceRoutine; PVOID ServiceContext; LIST_ENTRY Entry; + KIRQL Irql; KIRQL SynchLevel; + KINTERRUPT_MODE InterruptMode; } KINTERRUPT; #ifndef __USE_W32API _____ Modified: trunk/reactos/ntoskrnl/io/irq.c --- trunk/reactos/ntoskrnl/io/irq.c 2005-01-01 11:22:12 UTC (rev 12689) +++ trunk/reactos/ntoskrnl/io/irq.c 2005-01-01 11:28:46 UTC (rev 12690) @@ -62,43 +62,70 @@ */ { PKINTERRUPT Interrupt; - NTSTATUS Status = STATUS_SUCCESS; + ULONG i, count; ASSERT_IRQL(PASSIVE_LEVEL); DPRINT("IoConnectInterrupt(Vector %x)\n",Vector); + ProcessorEnableMask &= ((1 << KeNumberProcessors) - 1); + + if (ProcessorEnableMask == 0) + { + return STATUS_INVALID_PARAMETER; + } + + for (i = 0, count = 0; i < KeNumberProcessors; i++) + { + if (ProcessorEnableMask & (1 << i)) + { + count++; + } + } /* * Initialize interrupt object */ - Interrupt=ExAllocatePoolWithTag(NonPagedPool,sizeof(KINTERRUPT), + Interrupt=ExAllocatePoolWithTag(NonPagedPool,count*sizeof(KINTERRUPT), TAG_KINTERRUPT); if (Interrupt==NULL) { return(STATUS_INSUFFICIENT_RESOURCES); } - Status = KeInitializeInterrupt(Interrupt, - ServiceRoutine, - ServiceContext, - SpinLock, - Vector, - Irql, - SynchronizeIrql, - InterruptMode, - ShareVector, - ProcessorEnableMask, - FloatingSave); - if (!NT_SUCCESS(Status)) + if (SpinLock == NULL) { - ExFreePool(Interrupt); - return Status; + SpinLock = &Interrupt[0].SpinLock; + KeInitializeSpinLock(SpinLock); } - if (!KeConnectInterrupt(Interrupt)) + Interrupt[0].ProcessorEnableMask = ProcessorEnableMask; + + for (i = 0, count = 0; i < KeNumberProcessors; i++) { - ExFreePool(Interrupt); - return STATUS_INVALID_PARAMETER; + if (ProcessorEnableMask & (1 << i)) + { + KeInitializeInterrupt(&Interrupt[count], + ServiceRoutine, + ServiceContext, + SpinLock, + Vector, + Irql, + SynchronizeIrql, + InterruptMode, + ShareVector, + i, + FloatingSave); + if (!KeConnectInterrupt(&Interrupt[count])) + { + for (i = 0; i < count; i++) + { + KeDisconnectInterrupt(&Interrupt[i]); + } + ExFreePool(Interrupt); + return STATUS_INVALID_PARAMETER; + } + count++; + } } *InterruptObject = Interrupt; @@ -118,7 +145,16 @@ * InterruptObject = isr to release */ { - KeDisconnectInterrupt(InterruptObject); + ULONG i, count; + + for (i = 0, count = 0; i < KeNumberProcessors; i++) + { + if (InterruptObject[0].ProcessorEnableMask & (1 << i)) + { + KeDisconnectInterrupt(&InterruptObject[count]); + count++; + } + } ExFreePool(InterruptObject); } _____ Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c --- trunk/reactos/ntoskrnl/ke/i386/irq.c 2005-01-01 11:22:12 UTC (rev 12689) +++ trunk/reactos/ntoskrnl/ke/i386/irq.c 2005-01-01 11:28:46 UTC (rev 12690) @@ -1,6 +1,6 @@ /* * ReactOS kernel - * Copyright (C) 1998, 1999, 2000, 2001, 2002 ReactOS Team + * Copyright (C) 1998 - 2005 ReactOS Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,12 +16,13 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: irq.c,v 1.56 2004/11/27 19:24:15 hbirr Exp $ +/* $Id$ * * PROJECT: ReactOS kernel * FILE: ntoskrnl/ke/i386/irq.c * PURPOSE: IRQ handling * PROGRAMMER: David Welch (welch(a)mcmail.com) + * Hartmut Birr * UPDATE HISTORY: * 29/05/98: Created */ @@ -182,10 +183,20 @@ * be accessed at any irq level. */ -static LIST_ENTRY isr_table[NR_IRQS]; -static KSPIN_LOCK isr_lock[NR_IRQS]; -static KSPIN_LOCK isr_table_lock; +typedef struct +{ + LIST_ENTRY ListHead; + KSPIN_LOCK Lock; + ULONG Count; +} +ISR_TABLE, *PISR_TABLE; +#ifdef MP +static ISR_TABLE IsrTable[NR_IRQS][MAXIMUM_PROCESSORS]; +#else +static ISR_TABLE IsrTable[NR_IRQS][1]; +#endif + #define TAG_ISR_LOCK TAG('I', 'S', 'R', 'L') /* FUNCTIONS ****************************************************************/ @@ -196,8 +207,9 @@ VOID INIT_FUNCTION KeInitInterrupts (VOID) { - int i; + int i, j; + /* * Setup the IDT entries to point to the interrupt handlers */ @@ -206,10 +218,17 @@ KiIdt[IRQ_BASE+i].a=(irq_handler[i]&0xffff)+(KERNEL_CS<<16); KiIdt[IRQ_BASE+i].b=(irq_handler[i]&0xffff0000)+PRESENT+ I486_INTERRUPT_GATE; - InitializeListHead(&isr_table[i]); - KeInitializeSpinLock(&isr_lock[i]); +#ifdef MP + for (j = 0; j < MAXIMUM_PROCESSORS; j++) +#else + j = 0; +#endif + { + InitializeListHead(&IsrTable[i][j].ListHead); + KeInitializeSpinLock(&IsrTable[i][j].Lock); + IsrTable[i][j].Count = 0; + } } - KeInitializeSpinLock(&isr_table_lock); } STATIC VOID @@ -266,21 +285,34 @@ { PKINTERRUPT isr; PLIST_ENTRY current; + KIRQL oldlvl; + PISR_TABLE CurrentIsr; DPRINT("I(0x%.08x, 0x%.08x)\n", vector, old_level); /* * Iterate the list until one of the isr tells us its device interrupted */ - current = isr_table[vector - IRQ_BASE].Flink; - isr = CONTAINING_RECORD(current,KINTERRUPT,Entry); + CurrentIsr = &IsrTable[vector - IRQ_BASE][(ULONG)KeGetCurrentProcessorNumber()]; - while (current != &isr_table[vector - IRQ_BASE] && - !isr->ServiceRoutine(isr, isr->ServiceContext)) + KiAcquireSpinLock(&CurrentIsr->Lock); + + CurrentIsr->Count++; + current = CurrentIsr->ListHead.Flink; + + while (current != &CurrentIsr->ListHead) { + isr = CONTAINING_RECORD(current,KINTERRUPT,Entry); + oldlvl = KeAcquireInterruptSpinLock(isr); + if (isr->ServiceRoutine(isr, isr->ServiceContext)) + { + KeReleaseInterruptSpinLock(isr, oldlvl); + break; + } + KeReleaseInterruptSpinLock(isr, oldlvl); current = current->Flink; - isr = CONTAINING_RECORD(current,KINTERRUPT,Entry); } + KiReleaseSpinLock(&CurrentIsr->Lock); } VOID @@ -382,19 +414,35 @@ { PKINTERRUPT current; PLIST_ENTRY current_entry; - unsigned int i; + ULONG i, j; + KIRQL oldlvl; + BOOLEAN printed; for (i=0;i<NR_IRQS;i++) { - DPRINT("For irq %x:\n",i); - current_entry = isr_table[i].Flink; - current = CONTAINING_RECORD(current_entry,KINTERRUPT,Entry); - while (current_entry!=(&isr_table[i])) + printed = FALSE; + KeRaiseIrql(VECTOR2IRQL(i + IRQ_BASE),&oldlvl); + + for (j=0; j < KeNumberProcessors; j++) { - DPRINT(" Isr %x\n",current); - current_entry = current_entry->Flink; - current = CONTAINING_RECORD(current_entry,KINTERRUPT,Entry); + KiAcquireSpinLock(&IsrTable[i][j].Lock); + + current_entry = IsrTable[i][j].ListHead.Flink; + current = CONTAINING_RECORD(current_entry,KINTERRUPT,Entry); + while (current_entry!=&(IsrTable[i][j].ListHead)) + { + if (printed == FALSE) + { + printed = TRUE; + DPRINT("For irq %x:\n",i); + } + DPRINT(" Isr %x\n",current); + current_entry = current_entry->Flink; + current = CONTAINING_RECORD(current_entry,KINTERRUPT,Entry); + } + KiReleaseSpinLock(&IsrTable[i][j].Lock); } + KeLowerIrql(oldlvl); } } @@ -404,10 +452,11 @@ BOOLEAN STDCALL KeConnectInterrupt(PKINTERRUPT InterruptObject) { - KIRQL oldlvl; - KIRQL synch_oldlvl; + KIRQL oldlvl,synch_oldlvl; PKINTERRUPT ListHead; ULONG Vector; + PISR_TABLE CurrentIsr; + BOOLEAN Result; DPRINT("KeConnectInterrupt()\n"); @@ -418,45 +467,54 @@ Vector -= IRQ_BASE; + ASSERT (InterruptObject->ProcessorNumber < KeNumberProcessors); + + KeSetSystemAffinityThread(1 << InterruptObject->ProcessorNumber); + + CurrentIsr = &IsrTable[Vector][(ULONG)InterruptObject->ProcessorNumber]; + + KeRaiseIrql(VECTOR2IRQL(Vector + IRQ_BASE),&oldlvl); + KiAcquireSpinLock(&CurrentIsr->Lock); + /* - * Acquire the table spinlock - */ - KeAcquireSpinLock(&isr_table_lock,&oldlvl); - - /* * Check if the vector is already in use that we can share it */ - ListHead = CONTAINING_RECORD(isr_table[Vector].Flink,KINTERRUPT,Entry); - if (!IsListEmpty(&isr_table[Vector]) && - (InterruptObject->Shareable == FALSE || ListHead->Shareable==FALSE)) + if (!IsListEmpty(&CurrentIsr->ListHead)) { - KeReleaseSpinLock(&isr_table_lock,oldlvl); - return FALSE; + ListHead = CONTAINING_RECORD(CurrentIsr->ListHead.Flink,KINTERRUPT,Entry); + if (InterruptObject->Shareable == FALSE || ListHead->Shareable==FALSE) + { + KiReleaseSpinLock(&CurrentIsr->Lock); + KeLowerIrql(oldlvl); + KeRevertToUserAffinityThread(); + return FALSE; + } } - InterruptObject->IrqLock = &isr_lock[Vector]; + synch_oldlvl = KeAcquireInterruptSpinLock(InterruptObject); - KeRaiseIrql(InterruptObject->SynchLevel,&synch_oldlvl); - KiAcquireSpinLock(InterruptObject->IrqLock); - DPRINT("%x %x\n",isr_table[Vector].Flink,isr_table[Vector].Blink); - if (IsListEmpty(&isr_table[Vector])) + DPRINT("%x %x\n",CurrentIsr->ListHead.Flink, CurrentIsr->ListHeads.Blink); + + Result = HalEnableSystemInterrupt(Vector + IRQ_BASE, InterruptObject->Irql, InterruptObject->InterruptMode); + if (Result) { - HalEnableSystemInterrupt(Vector + IRQ_BASE, 0, 0); + InsertTailList(&CurrentIsr->ListHead,&InterruptObject->Entry); + DPRINT("%x %x\n",InterruptObject->Entry.Flink, InterruptObject->Entry.Blink); } - InsertTailList(&isr_table[Vector],&InterruptObject->Entry); - DPRINT("%x %x\n",InterruptObject->Entry.Flink, - InterruptObject->Entry.Blink); - KiReleaseSpinLock(InterruptObject->IrqLock); - KeLowerIrql(synch_oldlvl); - + + KeReleaseInterruptSpinLock(InterruptObject, synch_oldlvl); + /* * Release the table spinlock */ - KeReleaseSpinLock(&isr_table_lock,oldlvl); + KiReleaseSpinLock(&CurrentIsr->Lock); + KeLowerIrql(oldlvl); KeDumpIrqList(); - return TRUE; + KeRevertToUserAffinityThread(); + + return Result; } @@ -471,24 +529,43 @@ * InterruptObject = isr to release */ { - KIRQL oldlvl; + KIRQL oldlvl,synch_oldlvl; + PISR_TABLE CurrentIsr; + + DPRINT("KeDisconnectInterrupt\n"); - KeRaiseIrql(InterruptObject->SynchLevel,&oldlvl); - KiAcquireSpinLock(InterruptObject->IrqLock); + ASSERT (InterruptObject->ProcessorNumber < KeNumberProcessors); + + KeSetSystemAffinityThread(1 << InterruptObject->ProcessorNumber); + + CurrentIsr = &IsrTable[InterruptObject->Vector - IRQ_BASE][(ULONG)InterruptObject->ProcessorNumber]; + + KeRaiseIrql(VECTOR2IRQL(InterruptObject->Vector),&oldlvl); + KiAcquireSpinLock(&CurrentIsr->Lock); + + synch_oldlvl = KeAcquireInterruptSpinLock(InterruptObject); + RemoveEntryList(&InterruptObject->Entry); - if (IsListEmpty(&isr_table[InterruptObject->Vector - IRQ_BASE])) + if (IsListEmpty(&CurrentIsr->ListHead)) { HalDisableSystemInterrupt(InterruptObject->Vector, 0); } - KiReleaseSpinLock(InterruptObject->IrqLock); + KeReleaseInterruptSpinLock(InterruptObject, synch_oldlvl); + + /* + * Release the table spinlock + */ + KiReleaseSpinLock(&CurrentIsr->Lock); KeLowerIrql(oldlvl); + + KeRevertToUserAffinityThread(); } /* * @implemented */ -NTSTATUS +VOID STDCALL KeInitializeInterrupt(PKINTERRUPT InterruptObject, PKSERVICE_ROUTINE ServiceRoutine, @@ -499,18 +576,37 @@ KIRQL SynchronizeIrql, KINTERRUPT_MODE InterruptMode, BOOLEAN ShareVector, - KAFFINITY ProcessorEnableMask, + CHAR ProcessorNumber, BOOLEAN FloatingSave) { + InterruptObject->ServiceRoutine = ServiceRoutine; InterruptObject->ServiceContext = ServiceContext; - InterruptObject->ServiceRoutine = ServiceRoutine; + InterruptObject->ActualLock = SpinLock; InterruptObject->Vector = Vector; - InterruptObject->ProcessorEnableMask = ProcessorEnableMask; + InterruptObject->Irql = Irql; InterruptObject->SynchLevel = SynchronizeIrql; + InterruptObject->InterruptMode = InterruptMode; InterruptObject->Shareable = ShareVector; + InterruptObject->ProcessorNumber = ProcessorNumber; InterruptObject->FloatingSave = FloatingSave; +} - return STATUS_SUCCESS; +VOID KePrintInterruptStatistic(VOID) +{ + ULONG i, j; + + for (j = 0; j < KeNumberProcessors; j++) + { + DPRINT1("CPU%d:\n", j); + for (i = 0; i < NR_IRQS; i++) + { + if (IsrTable[i][j].Count) + { + DPRINT1(" Irq %x(%d): %d\n", i, VECTOR2IRQ(i + IRQ_BASE), IsrTable[i][j].Count); + } + } + } } + /* EOF */ _____ Modified: trunk/reactos/ntoskrnl/ke/spinlock.c --- trunk/reactos/ntoskrnl/ke/spinlock.c 2005-01-01 11:22:12 UTC (rev 12689) +++ trunk/reactos/ntoskrnl/ke/spinlock.c 2005-01-01 11:28:46 UTC (rev 12690) @@ -1,4 +1,4 @@ -/* $Id: spinlock.c,v 1.25 2004/12/24 17:06:58 navaraf Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -17,6 +17,7 @@ /* INCLUDES ****************************************************************/ #include <ntoskrnl.h> +#define NDEBUG #include <internal/debug.h> /* FUNCTIONS ***************************************************************/ @@ -42,19 +43,17 @@ KIRQL oldlvl; BOOLEAN ret; - KeRaiseIrql(Interrupt->SynchLevel, &oldlvl); - KiAcquireSpinLock(Interrupt->IrqLock); + oldlvl = KeAcquireInterruptSpinLock(Interrupt); ret = SynchronizeRoutine(SynchronizeContext); - KiReleaseSpinLock(Interrupt->IrqLock); - KeLowerIrql(oldlvl); + KeReleaseInterruptSpinLock(Interrupt, oldlvl); return(ret); } /* - * @unimplemented + * @implemented */ KIRQL STDCALL @@ -62,8 +61,11 @@ IN PKINTERRUPT Interrupt ) { - UNIMPLEMENTED; - return 0; + KIRQL oldIrql; + + KeRaiseIrql(Interrupt->SynchLevel, &oldIrql); + KiAcquireSpinLock(Interrupt->ActualLock); + return oldIrql; } /* @@ -195,7 +197,7 @@ } /* - * @unimplemented + * @implemented */ VOID STDCALL @@ -204,7 +206,8 @@ IN KIRQL OldIrql ) { - UNIMPLEMENTED; + KiReleaseSpinLock(Interrupt->ActualLock); + KeLowerIrql(OldIrql); } /*

19 years, 11 months

[hbirr] 12689: - Used interlocked functions to modify the values for the ipi functions on smp machines.

by hbirr＠svn.reactos.com

- Used interlocked functions to modify the values for the ipi functions on smp machines. Modified: trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/ntoskrnl/ke/ipi.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/ke.h --- trunk/reactos/ntoskrnl/include/internal/ke.h 2005-01-01 11:18:54 UTC (rev 12688) +++ trunk/reactos/ntoskrnl/include/internal/ke.h 2005-01-01 11:22:12 UTC (rev 12689) @@ -43,9 +43,9 @@ struct _KPCR; struct _KEXCEPTION_FRAME; -#define IPI_REQUEST_FUNCTIONCALL 1 -#define IPI_REQUEST_APC 2 -#define IPI_REQUEST_DPC 4 +#define IPI_REQUEST_FUNCTIONCALL 0 +#define IPI_REQUEST_APC 1 +#define IPI_REQUEST_DPC 2 /* ipi.c ********************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/ke/ipi.c --- trunk/reactos/ntoskrnl/ke/ipi.c 2005-01-01 11:18:54 UTC (rev 12688) +++ trunk/reactos/ntoskrnl/ke/ipi.c 2005-01-01 11:22:12 UTC (rev 12689) @@ -1,4 +1,4 @@ -/* $Id: ipi.c,v 1.5 2004/12/24 17:06:58 navaraf Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -33,7 +33,7 @@ if (TargetSet & (1 << i)) { Pcr = (PKPCR)(KPCR_BASE + i * PAGE_SIZE); - Pcr->PrcbData.IpiFrozen |= IpiRequest; + Ke386TestAndSetBit(IpiRequest, &Pcr->PrcbData.IpiFrozen); HalRequestIpi(i); } } @@ -51,8 +51,6 @@ LARGE_INTEGER StartTime, CurrentTime, Frequency; ULONG Count = 5; #endif - ULONG TargetSet, Processor; - PKPCR Pcr; ASSERT(KeGetCurrentIrql() == IPI_LEVEL); @@ -61,23 +59,21 @@ Pcr = KeGetCurrentKPCR(); - if (Pcr->PrcbData.IpiFrozen & IPI_REQUEST_APC) + if (Ke386TestAndClearBit(IPI_REQUEST_APC, &Pcr->PrcbData.IpiFrozen)) { - Pcr->PrcbData.IpiFrozen &= ~IPI_REQUEST_APC; HalRequestSoftwareInterrupt(APC_LEVEL); } - if (Pcr->PrcbData.IpiFrozen & IPI_REQUEST_DPC) + if (Ke386TestAndClearBit(IPI_REQUEST_DPC, &Pcr->PrcbData.IpiFrozen)) { - Pcr->PrcbData.IpiFrozen &= ~IPI_REQUEST_DPC; Pcr->PrcbData.DpcInterruptRequested = TRUE; HalRequestSoftwareInterrupt(DISPATCH_LEVEL); } - if (Pcr->PrcbData.IpiFrozen & IPI_REQUEST_FUNCTIONCALL) + if (Ke386TestAndClearBit(IPI_REQUEST_FUNCTIONCALL, &Pcr->PrcbData.IpiFrozen)) { InterlockedDecrementUL(&Pcr->PrcbData.SignalDone->CurrentPacket[1]); - if (Pcr->PrcbData.SignalDone->CurrentPacket[2]) + if (InterlockedCompareExchangeUL(&Pcr->PrcbData.SignalDone->CurrentPacket[2 ], 0, 0)) { #ifdef DBG StartTime = KeQueryPerformanceCounter(&Frequency); @@ -88,20 +84,16 @@ CurrentTime = KeQueryPerformanceCounter(NULL); if (CurrentTime.QuadPart > StartTime.QuadPart + Count * Frequency.QuadPart) { - DPRINT1("Waiting longer than %d seconds to start the ipi routine\n", Count); + DbgPrint("(%s:%d) CPU%d, waiting longer than %d seconds to start the ipi routine\n", __FILE__,__LINE__, KeGetCurrentProcessorNumber(), Count); KEBUGCHECK(0); } #endif } } ((VOID STDCALL(*)(PVOID))(Pcr->PrcbData.SignalDone->WorkerRoutine))(Pcr->PrcbDa ta.SignalDone->CurrentPacket[0]); - do + Ke386TestAndClearBit(KeGetCurrentProcessorNumber(), &Pcr->PrcbData.SignalDone->TargetSet); + if (InterlockedCompareExchangeUL(&Pcr->PrcbData.SignalDone->CurrentPacket[2 ], 0, 0)) { - Processor = 1 << KeGetCurrentProcessorNumber(); - TargetSet = Pcr->PrcbData.SignalDone->TargetSet; - } while (Processor & InterlockedCompareExchangeUL(&Pcr->PrcbData.SignalDone->TargetSet, TargetSet & ~Processor, TargetSet)); - if (Pcr->PrcbData.SignalDone->CurrentPacket[2]) - { #ifdef DBG StartTime = KeQueryPerformanceCounter(&Frequency); #endif @@ -111,14 +103,13 @@ CurrentTime = KeQueryPerformanceCounter(NULL); if (CurrentTime.QuadPart > StartTime.QuadPart + Count * Frequency.QuadPart) { - DPRINT1("Waiting longer than %d seconds after executing the ipi routine\n", Count); + DbgPrint("(%s:%d) CPU%d, waiting longer than %d seconds after executing the ipi routine\n", __FILE__,__LINE__, KeGetCurrentProcessorNumber(), Count); KEBUGCHECK(0); } #endif } } InterlockedExchangePointer(&Pcr->PrcbData.SignalDone, NULL); - Pcr->PrcbData.IpiFrozen &= ~IPI_REQUEST_FUNCTIONCALL; } DPRINT("KiIpiServiceRoutine done\n"); return TRUE; @@ -136,11 +127,11 @@ ASSERT(KeGetCurrentIrql() == SYNCH_LEVEL); CurrentPcr = KeGetCurrentKPCR(); - CurrentPcr->PrcbData.TargetSet = TargetSet; - CurrentPcr->PrcbData.WorkerRoutine = (ULONG_PTR)WorkerRoutine; - CurrentPcr->PrcbData.CurrentPacket[0] = Argument; - CurrentPcr->PrcbData.CurrentPacket[1] = (PVOID)Count; - CurrentPcr->PrcbData.CurrentPacket[2] = (PVOID)(ULONG)Synchronize; + InterlockedExchangeUL(&CurrentPcr->PrcbData.TargetSet, TargetSet); + InterlockedExchangeUL(&CurrentPcr->PrcbData.WorkerRoutine, (ULONG_PTR)WorkerRoutine); + InterlockedExchangePointer(&CurrentPcr->PrcbData.CurrentPacket[0], Argument); + InterlockedExchangeUL(&CurrentPcr->PrcbData.CurrentPacket[1], Count); + InterlockedExchangeUL(&CurrentPcr->PrcbData.CurrentPacket[2], Synchronize ? 1 : 0); CurrentProcessor = 1 << KeGetCurrentProcessorNumber(); @@ -150,7 +141,7 @@ { Pcr = (PKPCR)(KPCR_BASE + i * PAGE_SIZE); while(0 != InterlockedCompareExchangeUL(&Pcr->PrcbData.SignalDone, (LONG)&CurrentPcr->PrcbData, 0)); - Pcr->PrcbData.IpiFrozen |= IPI_REQUEST_FUNCTIONCALL; + Ke386TestAndSetBit(IPI_REQUEST_FUNCTIONCALL, &Pcr->PrcbData.IpiFrozen); if (Processor != CurrentProcessor) { HalRequestIpi(i);

19 years, 11 months

[hbirr] 12688: - Implemented Ke386TestAndClearBit and Ke386TestAndSetBit.

by hbirr＠svn.reactos.com

- Implemented Ke386TestAndClearBit and Ke386TestAndSetBit. - Fixed some interlocked functions. Modified: trunk/reactos/ntoskrnl/ex/i386/interlck.c Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h _____ Modified: trunk/reactos/ntoskrnl/ex/i386/interlck.c --- trunk/reactos/ntoskrnl/ex/i386/interlck.c 2005-01-01 11:11:52 UTC (rev 12687) +++ trunk/reactos/ntoskrnl/ex/i386/interlck.c 2005-01-01 11:18:54 UTC (rev 12688) @@ -1,16 +1,32 @@ -/* $Id: interlck.c,v 1.10 2004/12/12 17:48:20 hbirr Exp $ +/* $Id$ * * reactos/ntoskrnl/ex/i386/interlck.c * */ #include <ntoskrnl.h> +#ifdef LOCK +#undef LOCK +#endif + +#if defined(__GNUC__) + #ifdef MP -#define LOCK "lock " +#define LOCK "lock ; " #else -#define LOCK " " +#define LOCK "" #endif +#elif defined(_MSC_VER) + +#ifdef MP +#define LOCK lock +#else +#define LOCK +#endif + +#endif + #if defined(__GNUC__) /* @@ -21,6 +37,7 @@ __asm__("\n\t.global @Exfi386InterlockedIncrementLong@4\n\t" "@Exfi386InterlockedIncrementLong@4:\n\t" + LOCK "addl $1,(%ecx)\n\t" "lahf\n\t" "andl $0xC000, %eax\n\t" @@ -35,7 +52,7 @@ INTERLOCKED_RESULT FASTCALL Exfi386InterlockedIncrementLong(IN PLONG Addend) { - __asm add ecx, 1 + __asm LOCK add dword ptr [ecx], 1 __asm lahf __asm and eax, 0xC000 __asm ret @@ -56,6 +73,7 @@ __asm__("\n\t.global @Exfi386InterlockedDecrementLong@4\n\t" "@Exfi386InterlockedDecrementLong@4:\n\t" + LOCK "subl $1,(%ecx)\n\t" "lahf\n\t" "andl $0xC000, %eax\n\t" @@ -70,7 +88,7 @@ INTERLOCKED_RESULT FASTCALL Exfi386InterlockedDecrementLong(IN PLONG Addend) { - __asm sub ecx, 1 + __asm LOCK sub dword ptr [ecx], 1 __asm lahf __asm and eax, 0xC000 __asm ret @@ -92,7 +110,8 @@ __asm__("\n\t.global @Exfi386InterlockedExchangeUlong@8\n\t" "@Exfi386InterlockedExchangeUlong@8:\n\t" - LOCK"xchgl %edx,(%ecx)\n\t" + LOCK + "xchgl %edx,(%ecx)\n\t" "movl %edx,%eax\n\t" "ret\n\t"); @@ -106,7 +125,7 @@ Exfi386InterlockedExchangeUlong(IN PULONG Target, IN ULONG Value) { - __asm xchg [ecx], edx + __asm LOCK xchg [ecx], edx __asm mov eax, edx __asm ret } @@ -124,6 +143,7 @@ __asm__("\n\t.global _Exi386InterlockedIncrementLong@4\n\t" "_Exi386InterlockedIncrementLong@4:\n\t" "movl 4(%esp),%eax\n\t" + LOCK "addl $1,(%eax)\n\t" "lahf\n\t" "andl $0xC000, %eax\n\t" @@ -136,7 +156,7 @@ Exi386InterlockedIncrementLong(IN PLONG Addend) { __asm mov eax, Addend - __asm add [eax], 1 + __asm LOCK add dword ptr [eax], 1 __asm lahf __asm and eax, 0xC000 __asm ret 4 @@ -155,6 +175,7 @@ __asm__("\n\t.global _Exi386InterlockedDecrementLong@4\n\t" "_Exi386InterlockedDecrementLong@4:\n\t" "movl 4(%esp),%eax\n\t" + LOCK "subl $1,(%eax)\n\t" "lahf\n\t" "andl $0xC000, %eax\n\t" @@ -167,7 +188,7 @@ Exi386InterlockedDecrementLong(IN PLONG Addend) { __asm mov eax, Addend - __asm sub [eax], 1 + __asm LOCK sub dword ptr [eax], 1 __asm lahf __asm and eax, 0xC000 __asm ret 4 @@ -188,7 +209,8 @@ "_Exi386InterlockedExchangeUlong@8:\n\t" "movl 4(%esp),%edx\n\t" "movl 8(%esp),%eax\n\t" - LOCK"xchgl %eax,(%edx)\n\t" + LOCK + "xchgl %eax,(%edx)\n\t" "ret $8\n\t"); #elif defined(_MSC_VER) @@ -200,7 +222,7 @@ { __asm mov edx, Value __asm mov eax, Target - __asm xchg [edx], eax + __asm LOCK xchg [edx], eax __asm ret 8 } @@ -231,7 +253,8 @@ __asm__("\n\t.global @InterlockedIncrement@4\n\t" "@InterlockedIncrement@4:\n\t" "movl $1,%eax\n\t" - LOCK"xaddl %eax,(%ecx)\n\t" + LOCK + "xaddl %eax,(%ecx)\n\t" "incl %eax\n\t" "ret\n\t"); @@ -244,7 +267,7 @@ InterlockedIncrement(PLONG Addend) { __asm mov eax, 1 - __asm xadd [ecx], eax + __asm LOCK xadd [ecx], eax __asm inc eax __asm ret } @@ -268,7 +291,8 @@ __asm__("\n\t.global @InterlockedDecrement@4\n\t" "@InterlockedDecrement@4:\n\t" "movl $-1,%eax\n\t" - LOCK"xaddl %eax,(%ecx)\n\t" + LOCK + "xaddl %eax,(%ecx)\n\t" "decl %eax\n\t" "ret\n\t"); @@ -282,7 +306,7 @@ InterlockedDecrement(PLONG Addend) { __asm mov eax, -1 - __asm xadd [ecx], eax + __asm LOCK xadd [ecx], eax __asm dec eax __asm ret } @@ -307,7 +331,8 @@ __asm__("\n\t.global @InterlockedExchange@8\n\t" "@InterlockedExchange@8:\n\t" - LOCK"xchgl %edx,(%ecx)\n\t" + LOCK + "xchgl %edx,(%ecx)\n\t" "movl %edx,%eax\n\t" "ret\n\t"); @@ -320,7 +345,7 @@ InterlockedExchange(PLONG Target, LONG Value) { - __asm xchg [ecx], edx + __asm LOCK xchg [ecx], edx __asm mov eax, edx __asm ret } @@ -343,7 +368,8 @@ __asm__("\n\t.global @InterlockedExchangeAdd@8\n\t" "@InterlockedExchangeAdd@8:\n\t" - LOCK"xaddl %edx,(%ecx)\n\t" + LOCK + "xaddl %edx,(%ecx)\n\t" "movl %edx,%eax\n\t" "ret\n\t"); @@ -356,7 +382,7 @@ InterlockedExchangeAdd(PLONG Addend, LONG Value) { - __asm xadd [ecx], edx + __asm LOCK xadd [ecx], edx __asm mov eax, edx __asm ret } @@ -380,7 +406,8 @@ __asm__("\n\t.global @InterlockedCompareExchange@12\n\t" "@InterlockedCompareExchange@12:\n\t" "movl 4(%esp),%eax\n\t" - LOCK"cmpxchg %edx,(%ecx)\n\t" + LOCK + "cmpxchg %edx,(%ecx)\n\t" "ret $4\n\t"); #elif defined(_MSC_VER) @@ -392,7 +419,7 @@ LONG Comperand) { __asm mov eax, Comperand - __asm cmpxchg [ecx], edx + __asm LOCK cmpxchg [ecx], edx __asm ret 4 } @@ -418,7 +445,8 @@ "\n1:\t" "movl (%esi),%eax\n\t" "movl 4(%esi),%edx\n\t" - LOCK"cmpxchg8b (%esi)\n\t" + LOCK + "cmpxchg8b (%esi)\n\t" "jnz 1b\n\t" "popl %esi\n\t" "popl %ebx\n\t" @@ -447,7 +475,8 @@ "movl 12(%esp),%edx\n\t" "movl (%edx),%eax\n\t" "movl 4(%edx),%edx\n\t" - LOCK"cmpxchg8b (%esi)\n\t" + LOCK + "cmpxchg8b (%esi)\n\t" "popl %esi\n\t" "popl %ebx\n\t" "ret $4\n\t"); _____ Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h 2005-01-01 11:11:52 UTC (rev 12687) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h 2005-01-01 11:18:54 UTC (rev 12688) @@ -192,6 +192,13 @@ VOID NtEarlyInitVdm(VOID); +#ifdef MP +#define LOCK "lock ; " +#else +#define LOCK "" +#endif + + #if defined(__GNUC__) #define Ke386DisableInterrupts() __asm__("cli\n\t"); #define Ke386EnableInterrupts() __asm__("sti\n\t"); @@ -219,6 +226,33 @@ #define Ke386GetCr4() _Ke386GetCr(4) #define Ke386SetCr4(X) _Ke386SetCr(4,X) +static inline LONG Ke386TestAndClearBit(ULONG BitPos, volatile PULONG Addr) +{ + LONG OldBit; + + __asm__ __volatile__(LOCK + "btrl %2,%1\n\t" + "sbbl %0,%0\n\t" + :"=r" (OldBit),"=m" (*Addr) + :"Ir" (BitPos) + : "memory"); + return OldBit; +} + +static inline LONG Ke386TestAndSetBit(ULONG BitPos, volatile PULONG Addr) +{ + LONG OldBit; + + __asm__ __volatile__(LOCK + "btsl %2,%1\n\t" + "sbbl %0,%0\n\t" + :"=r" (OldBit),"=m" (*Addr) + :"Ir" (BitPos) + : "memory"); + return OldBit; +} + + static inline void Ki386Cpuid(ULONG Op, PULONG Eax, PULONG Ebx, PULONG Ecx, PULONG Edx) { __asm__("cpuid"

19 years, 11 months

[hbirr] 12687: - Used the parent fcb instead to determine it from parent fileobject.

by hbirr＠svn.reactos.com

- Used the parent fcb instead to determine it from parent fileobject. Modified: trunk/reactos/drivers/fs/vfat/create.c Modified: trunk/reactos/drivers/fs/vfat/dirwr.c Modified: trunk/reactos/drivers/fs/vfat/fcb.c Modified: trunk/reactos/drivers/fs/vfat/rw.c Modified: trunk/reactos/drivers/fs/vfat/vfat.h _____ Modified: trunk/reactos/drivers/fs/vfat/create.c --- trunk/reactos/drivers/fs/vfat/create.c 2005-01-01 11:02:35 UTC (rev 12686) +++ trunk/reactos/drivers/fs/vfat/create.c 2005-01-01 11:11:52 UTC (rev 12687) @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: create.c,v 1.78 2004/12/25 11:18:38 navaraf Exp $ +/* $Id$ * * PROJECT: ReactOS kernel * FILE: drivers/fs/vfat/create.c @@ -314,46 +314,30 @@ } NTSTATUS -VfatOpenFile (PDEVICE_EXTENSION DeviceExt, PFILE_OBJECT FileObject, - PUNICODE_STRING FileNameU) +VfatOpenFile (PDEVICE_EXTENSION DeviceExt, PFILE_OBJECT FileObject, PVFATFCB* ParentFcb) /* * FUNCTION: Opens a file */ { - PVFATFCB ParentFcb; PVFATFCB Fcb; NTSTATUS Status; + UNICODE_STRING PathNameU; + WCHAR Buffer[260]; - -// PDEVICE_OBJECT DeviceObject = DeviceExt->StorageDevice->Vpb->DeviceObject; - DPRINT ("VfatOpenFile(%08lx, %08lx, '%wZ')\n", DeviceExt, FileObject, &FileObject->FileName); if (FileObject->RelatedFileObject) { - DPRINT ("Converting relative filename to absolute filename\n"); + DPRINT ("'%wZ'\n", &FileObject->RelatedFileObject->FileName); - Fcb = FileObject->RelatedFileObject->FsContext; - RtlCopyUnicodeString(FileNameU, &Fcb->PathNameU); - if (!vfatFCBIsRoot(Fcb)) - { - RtlAppendUnicodeToString(FileNameU, L"\\"); - } - RtlAppendUnicodeStringToString(FileNameU, &FileObject->FileName); + *ParentFcb = FileObject->RelatedFileObject->FsContext; + (*ParentFcb)->RefCount++; } else { - RtlCopyUnicodeString(FileNameU, &FileObject->FileName); + *ParentFcb = NULL; } - if (FileNameU->Length > sizeof(WCHAR) && - FileNameU->Buffer[FileNameU->Length / sizeof(WCHAR) - 1] == L'\\') - { - FileNameU->Length -= sizeof(WCHAR); - } - FileNameU->Buffer[FileNameU->Length / sizeof(WCHAR)] = 0; - DPRINT ("PathName to open: '%wZ'\n", FileNameU); - if (!DeviceExt->FatInfo.FixedMedia) { Status = VfatBlockDeviceIoControl (DeviceExt->StorageDevice, @@ -382,40 +366,47 @@ if (!NT_SUCCESS(Status)) { DPRINT ("Status %lx\n", Status); + *ParentFcb = NULL; return Status; } } + if (*ParentFcb) + { + (*ParentFcb)->RefCount++; + } - /* try first to find an existing FCB in memory */ - DPRINT ("Checking for existing FCB in memory\n"); - Fcb = vfatGrabFCBFromTable (DeviceExt, FileNameU); - if (Fcb == NULL) + PathNameU.Buffer = Buffer; + PathNameU.Length = 0; + PathNameU.MaximumLength = sizeof(Buffer); + RtlCopyUnicodeString(&PathNameU, &FileObject->FileName); + if (PathNameU.Length > sizeof(WCHAR) && + PathNameU.Buffer[PathNameU.Length / sizeof(WCHAR) - 1] == L'\\') { - DPRINT ("No existing FCB found, making a new one if file exists.\n"); - Status = vfatGetFCBForFile (DeviceExt, &ParentFcb, &Fcb, FileNameU); - if (ParentFcb != NULL) - { - vfatReleaseFCB (DeviceExt, ParentFcb); - } - if (!NT_SUCCESS (Status)) - { - DPRINT ("Could not make a new FCB, status: %x\n", Status); - return Status; - } + PathNameU.Length -= sizeof(WCHAR); } - else - { - RtlCopyUnicodeString(FileNameU, &Fcb->PathNameU); - } + PathNameU.Buffer[PathNameU.Length / sizeof(WCHAR)] = 0; + + /* try first to find an existing FCB in memory */ + DPRINT ("Checking for existing FCB in memory\n"); + + Status = vfatGetFCBForFile (DeviceExt, ParentFcb, &Fcb, &PathNameU); + if (!NT_SUCCESS (Status)) + { + DPRINT ("Could not make a new FCB, status: %x\n", Status); + return Status; + } if (Fcb->Flags & FCB_DELETE_PENDING) - { - vfatReleaseFCB (DeviceExt, Fcb); - return STATUS_DELETE_PENDING; - } + { + vfatReleaseFCB (DeviceExt, Fcb); + return STATUS_DELETE_PENDING; + } DPRINT ("Attaching FCB to fileObject\n"); Status = vfatAttachFCBToFileObject (DeviceExt, Fcb, FileObject); - + if (!NT_SUCCESS(Status)) + { + vfatReleaseFCB (DeviceExt, Fcb); + } return Status; } @@ -481,12 +472,12 @@ ULONG RequestedDisposition, RequestedOptions; PVFATCCB pCcb; PVFATFCB pFcb; + PVFATFCB ParentFcb; PWCHAR c, last; BOOLEAN PagingFileCreate = FALSE; LARGE_INTEGER AllocationSize; BOOLEAN Dots; - UNICODE_STRING NameU; - WCHAR NameW[MAX_PATH]; + UNICODE_STRING FileNameU; /* Unpack the various parameters. */ Stack = IoGetCurrentIrpStackLocation (Irp); @@ -563,12 +554,8 @@ } } - NameU.Buffer = NameW; - NameU.Length = 0; - NameU.MaximumLength = sizeof(NameW); - /* Try opening the file. */ - Status = VfatOpenFile (DeviceExt, FileObject, &NameU); + Status = VfatOpenFile (DeviceExt, FileObject, &ParentFcb); /* * If the directory containing the file to open doesn't exist then @@ -578,6 +565,10 @@ Status == STATUS_INVALID_PARAMETER || Status == STATUS_DELETE_PENDING) { + if (ParentFcb) + { + vfatReleaseFCB (DeviceExt, ParentFcb); + } return(Status); } @@ -593,12 +584,15 @@ { ULONG Attributes; Attributes = Stack->Parameters.Create.FileAttributes; - Status = VfatAddEntry (DeviceExt, &NameU, FileObject, RequestedOptions, + + vfatSplitPathName(&FileObject->FileName, NULL, &FileNameU); + Status = VfatAddEntry (DeviceExt, &FileNameU, &pFcb, ParentFcb, RequestedOptions, (UCHAR)(Attributes & FILE_ATTRIBUTE_VALID_FLAGS)); + vfatReleaseFCB (DeviceExt, ParentFcb); if (NT_SUCCESS (Status)) { - pFcb = FileObject->FsContext; - + vfatAttachFCBToFileObject (DeviceExt, pFcb, FileObject); + Irp->IoStatus.Information = FILE_CREATED; VfatSetAllocationSizeInformation(FileObject, @@ -621,11 +615,16 @@ } else { + vfatReleaseFCB (DeviceExt, ParentFcb); return(Status); } } else { + if (ParentFcb) + { + vfatReleaseFCB (DeviceExt, ParentFcb); + } /* Otherwise fail if the caller wanted to create a new file */ if (RequestedDisposition == FILE_CREATE) { _____ Modified: trunk/reactos/drivers/fs/vfat/dirwr.c --- trunk/reactos/drivers/fs/vfat/dirwr.c 2005-01-01 11:02:35 UTC (rev 12686) +++ trunk/reactos/drivers/fs/vfat/dirwr.c 2005-01-01 11:11:52 UTC (rev 12687) @@ -1,4 +1,4 @@ -/* $Id: dirwr.c,v 1.44 2004/12/25 11:18:38 navaraf Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -183,10 +183,11 @@ NTSTATUS FATAddEntry (PDEVICE_EXTENSION DeviceExt, - PUNICODE_STRING PathNameU, - PFILE_OBJECT pFileObject, - ULONG RequestedOptions, - UCHAR ReqAttr) + PUNICODE_STRING NameU, + PVFATFCB* Fcb, + PVFATFCB ParentFcb, + ULONG RequestedOptions, + UCHAR ReqAttr) /* create a new FAT entry */ @@ -198,11 +199,9 @@ PUCHAR Buffer; BOOLEAN needTilde = FALSE, needLong = FALSE; BOOLEAN lCaseBase = FALSE, uCaseBase, lCaseExt = FALSE, uCaseExt; - PVFATFCB newFCB; ULONG CurrentCluster; LARGE_INTEGER SystemTime, FileOffset; NTSTATUS Status = STATUS_SUCCESS; - PVFATFCB pDirFcb; ULONG size; long i; @@ -212,33 +211,20 @@ BOOLEAN SpacesFound; VFAT_DIRENTRY_CONTEXT DirContext; - UNICODE_STRING DirNameU; WCHAR LongNameBuffer[MAX_PATH]; WCHAR ShortNameBuffer[13]; - DPRINT ("addEntry: Pathname='%wZ'\n", PathNameU); + DPRINT ("addEntry: Name='%wZ', Dir='%wZ'\n", NameU, &ParentFcb->PathNameU); - vfatSplitPathName(PathNameU, &DirNameU, &DirContext.LongNameU); - if (DirNameU.Length > sizeof(WCHAR)) - { - DirNameU.Length -= sizeof(WCHAR); - } - - pDirFcb = vfatGrabFCBFromTable(DeviceExt, &DirNameU); - if (pDirFcb == NULL) - { - return STATUS_UNSUCCESSFUL; - } - - if (!ExAcquireResourceExclusiveLite(&pDirFcb->MainResource, TRUE)) - { - DPRINT("Failed acquiring lock\n"); - return STATUS_UNSUCCESSFUL; - } + DirContext.LongNameU = *NameU; nbSlots = (DirContext.LongNameU.Length / sizeof(WCHAR) + 12) / 13 + 1; //nb of entry needed for long name+normal entry DPRINT ("NameLen= %d, nbSlots =%d\n", DirContext.LongNameU.Length / sizeof(WCHAR), nbSlots); Buffer = ExAllocatePool (NonPagedPool, (nbSlots - 1) * sizeof (FAT_DIR_ENTRY)); + if (Buffer == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } RtlZeroMemory (Buffer, (nbSlots - 1) * sizeof (FAT_DIR_ENTRY)); pSlots = (slot *) Buffer; @@ -254,7 +240,7 @@ IsNameLegal = RtlIsNameLegalDOS8Dot3(&DirContext.LongNameU, &NameA, &SpacesFound); - if (IsNameLegal == FALSE || SpacesFound != FALSE) + if (!IsNameLegal || SpacesFound) { GENERATE_NAME_CONTEXT NameContext; VFAT_DIRENTRY_CONTEXT SearchContext; @@ -272,7 +258,7 @@ RtlGenerate8dot3Name(&DirContext.LongNameU, FALSE, &NameContext, &DirContext.ShortNameU); DirContext.ShortNameU.Buffer[DirContext.ShortNameU.Length / sizeof(WCHAR)] = 0; SearchContext.DirIndex = 0; - Status = FindFile (DeviceExt, pDirFcb, &DirContext.ShortNameU, &SearchContext, TRUE); + Status = FindFile (DeviceExt, ParentFcb, &DirContext.ShortNameU, &SearchContext, TRUE); if (!NT_SUCCESS(Status)) { break; @@ -280,8 +266,6 @@ } if (i == 100) /* FIXME : what to do after this ? */ { - ExReleaseResourceLite(&pDirFcb->MainResource); - vfatReleaseFCB(DeviceExt, pDirFcb); ExFreePool (Buffer); CHECKPOINT; return STATUS_UNSUCCESSFUL; @@ -386,6 +370,16 @@ } /* set dates and times */ KeQuerySystemTime (&SystemTime); +#if 0 + { + TIME_FIELDS tf; + RtlTimeToTimeFields (&SystemTime, &tf); + DPRINT1("%d.%d.%d %02d:%02d:%02d.%03d '%wZ'\n", + tf.Day, tf.Month, tf.Year, tf.Hour, + tf.Minute, tf.Second, tf.Milliseconds, + NameU); + } +#endif FsdSystemTimeToDosDateTime (DeviceExt, &SystemTime, &DirContext.DirEntry.Fat.CreationDate, &DirContext.DirEntry.Fat.CreationTime); DirContext.DirEntry.Fat.UpdateDate = DirContext.DirEntry.Fat.CreationDate; @@ -421,10 +415,8 @@ } } /* try to find nbSlots contiguous entries frees in directory */ - if (!vfatFindDirSpace(DeviceExt, pDirFcb, nbSlots, &DirContext.StartIndex)) + if (!vfatFindDirSpace(DeviceExt, ParentFcb, nbSlots, &DirContext.StartIndex)) { - ExReleaseResourceLite(&pDirFcb->MainResource); - vfatReleaseFCB(DeviceExt, pDirFcb); ExFreePool (Buffer); return STATUS_DISK_FULL; } @@ -435,8 +427,6 @@ Status = NextCluster (DeviceExt, 0, &CurrentCluster, TRUE); if (CurrentCluster == 0xffffffff || !NT_SUCCESS(Status)) { - ExReleaseResourceLite(&pDirFcb->MainResource); - vfatReleaseFCB(DeviceExt, pDirFcb); ExFreePool (Buffer); if (!NT_SUCCESS(Status)) { @@ -458,7 +448,7 @@ { /* one cluster */ CHECKPOINT; - CcMapData (pDirFcb->FileObject, &FileOffset, nbSlots * sizeof(FAT_DIR_ENTRY), + CcMapData (ParentFcb->FileObject, &FileOffset, nbSlots * sizeof(FAT_DIR_ENTRY), TRUE, &Context, (PVOID*)&pFatEntry); if (nbSlots > 1) { @@ -473,13 +463,13 @@ size = DeviceExt->FatInfo.BytesPerCluster - (DirContext.StartIndex * sizeof(FAT_DIR_ENTRY)) % DeviceExt->FatInfo.BytesPerCluster; i = size / sizeof(FAT_DIR_ENTRY); - CcMapData (pDirFcb->FileObject, &FileOffset, size, TRUE, + CcMapData (ParentFcb->FileObject, &FileOffset, size, TRUE, &Context, (PVOID*)&pFatEntry); RtlCopyMemory(pFatEntry, Buffer, size); CcSetDirtyPinnedData(Context, NULL); CcUnpinData(Context); FileOffset.u.LowPart += size; - CcMapData (pDirFcb->FileObject, &FileOffset, + CcMapData (ParentFcb->FileObject, &FileOffset, nbSlots * sizeof(FAT_DIR_ENTRY) - size, TRUE, &Context, (PVOID*)&pFatEntry); if (nbSlots - 1 > i) @@ -492,16 +482,15 @@ CcUnpinData(Context); /* FIXME: check status */ - vfatMakeFCBFromDirEntry (DeviceExt, pDirFcb, &DirContext, &newFCB); - vfatAttachFCBToFileObject (DeviceExt, newFCB, pFileObject); + vfatMakeFCBFromDirEntry (DeviceExt, ParentFcb, &DirContext, Fcb); - DPRINT ("new : entry=%11.11s\n", newFCB->entry.Fat.Filename); + DPRINT ("new : entry=%11.11s\n", (*Fcb)->entry.Fat.Filename); DPRINT ("new : entry=%11.11s\n", DirContext.DirEntry.Fat.Filename); if (RequestedOptions & FILE_DIRECTORY_FILE) { FileOffset.QuadPart = 0; - CcMapData (pFileObject, &FileOffset, DeviceExt->FatInfo.BytesPerCluster, TRUE, + CcMapData ((*Fcb)->FileObject, &FileOffset, DeviceExt->FatInfo.BytesPerCluster, TRUE, &Context, (PVOID*)&pFatEntry); /* clear the new directory cluster */ RtlZeroMemory (pFatEntry, DeviceExt->FatInfo.BytesPerCluster); @@ -510,9 +499,9 @@ RtlCopyMemory (pFatEntry[0].Filename, ". ", 11); RtlCopyMemory (&pFatEntry[1].Attrib, &DirContext.DirEntry.Fat.Attrib, sizeof(FAT_DIR_ENTRY) - 11); RtlCopyMemory (pFatEntry[1].Filename, ".. ", 11); - pFatEntry[1].FirstCluster = pDirFcb->entry.Fat.FirstCluster; - pFatEntry[1].FirstClusterHigh = pDirFcb->entry.Fat.FirstClusterHigh; - if (vfatFCBIsRoot(pDirFcb)) + pFatEntry[1].FirstCluster = ParentFcb->entry.Fat.FirstCluster; + pFatEntry[1].FirstClusterHigh = ParentFcb->entry.Fat.FirstClusterHigh; + if (vfatFCBIsRoot(ParentFcb)) { pFatEntry[1].FirstCluster = 0; pFatEntry[1].FirstClusterHigh = 0; @@ -520,8 +509,6 @@ CcSetDirtyPinnedData(Context, NULL); CcUnpinData(Context); } - ExReleaseResourceLite(&pDirFcb->MainResource); - vfatReleaseFCB (DeviceExt, pDirFcb); ExFreePool (Buffer); DPRINT ("addentry ok\n"); return STATUS_SUCCESS; @@ -529,8 +516,9 @@ NTSTATUS FATXAddEntry (PDEVICE_EXTENSION DeviceExt, - PUNICODE_STRING PathNameU, - PFILE_OBJECT pFileObject, + PUNICODE_STRING NameU, + PVFATFCB* Fcb, + PVFATFCB ParentFcb, ULONG RequestedOptions, UCHAR ReqAttr) /* @@ -538,21 +526,14 @@ */ { PVOID Context = NULL; - PVFATFCB newFCB; LARGE_INTEGER SystemTime, FileOffset; - PVFATFCB pDirFcb; OEM_STRING NameA; VFAT_DIRENTRY_CONTEXT DirContext; PFATX_DIR_ENTRY pFatXDirEntry; - UNICODE_STRING DirNameU; - DPRINT ("addEntry: Pathname='%wZ'\n", PathNameU); + DPRINT ("addEntry: Name='%wZ', Dir='%wZ'\n", NameU, &ParentFcb->PathNameU); - vfatSplitPathName(PathNameU, &DirNameU, &DirContext.LongNameU); - if (DirNameU.Length > sizeof(WCHAR)) - { - DirNameU.Length -= sizeof(WCHAR); - } + DirContext.LongNameU = *NameU; if (DirContext.LongNameU.Length / sizeof(WCHAR) > 42) { @@ -561,27 +542,13 @@ return STATUS_NAME_TOO_LONG; } - pDirFcb = vfatGrabFCBFromTable(DeviceExt, &DirNameU); - if (pDirFcb == NULL) - { - return STATUS_UNSUCCESSFUL; - } - - if (!ExAcquireResourceExclusiveLite(&pDirFcb->MainResource, TRUE)) - { - DPRINT("Failed acquiring lock\n"); - return STATUS_UNSUCCESSFUL; - } - /* try to find 1 entry free in directory */ - if (!vfatFindDirSpace(DeviceExt, pDirFcb, 1, &DirContext.StartIndex)) + if (!vfatFindDirSpace(DeviceExt, ParentFcb, 1, &DirContext.StartIndex)) { - ExReleaseResourceLite(&pDirFcb->MainResource); - vfatReleaseFCB(DeviceExt, pDirFcb); return STATUS_DISK_FULL; } DirContext.DirIndex = DirContext.StartIndex; - if (!vfatFCBIsRoot(pDirFcb)) + if (!vfatFCBIsRoot(ParentFcb)) { DirContext.DirIndex += 2; } @@ -620,33 +587,31 @@ /* add entry into parent directory */ FileOffset.u.HighPart = 0; FileOffset.u.LowPart = DirContext.StartIndex * sizeof(FATX_DIR_ENTRY); - CcMapData(pDirFcb->FileObject, &FileOffset, sizeof(FATX_DIR_ENTRY), - TRUE, &Context, (PVOID*)&pFatXDirEntry); + CcMapData(ParentFcb->FileObject, &FileOffset, sizeof(FATX_DIR_ENTRY), + TRUE, &Context, (PVOID*)&pFatXDirEntry); RtlCopyMemory(pFatXDirEntry, &DirContext.DirEntry.FatX, sizeof(FATX_DIR_ENTRY)); CcSetDirtyPinnedData(Context, NULL); CcUnpinData(Context); /* FIXME: check status */ - vfatMakeFCBFromDirEntry(DeviceExt, pDirFcb, &DirContext, &newFCB); - vfatAttachFCBToFileObject(DeviceExt, newFCB, pFileObject); + vfatMakeFCBFromDirEntry(DeviceExt, ParentFcb, &DirContext, Fcb); - ExReleaseResourceLite(&pDirFcb->MainResource); - vfatReleaseFCB(DeviceExt, pDirFcb); DPRINT("addentry ok\n"); return STATUS_SUCCESS; } NTSTATUS VfatAddEntry (PDEVICE_EXTENSION DeviceExt, - PUNICODE_STRING PathNameU, - PFILE_OBJECT pFileObject, + PUNICODE_STRING NameU, + PVFATFCB *Fcb, + PVFATFCB ParentFcb, ULONG RequestedOptions, UCHAR ReqAttr) { if (DeviceExt->Flags & VCB_IS_FATX) - return FATXAddEntry(DeviceExt, PathNameU, pFileObject, RequestedOptions, ReqAttr); + return FATXAddEntry(DeviceExt, NameU, Fcb, ParentFcb, RequestedOptions, ReqAttr); else - return FATAddEntry(DeviceExt, PathNameU, pFileObject, RequestedOptions, ReqAttr); + return FATAddEntry(DeviceExt, NameU, Fcb, ParentFcb, RequestedOptions, ReqAttr); } NTSTATUS _____ Modified: trunk/reactos/drivers/fs/vfat/fcb.c --- trunk/reactos/drivers/fs/vfat/fcb.c 2005-01-01 11:02:35 UTC (rev 12686) +++ trunk/reactos/drivers/fs/vfat/fcb.c 2005-01-01 11:11:52 UTC (rev 12687) @@ -1,4 +1,4 @@ -/* $Id: fcb.c,v 1.43 2004/12/05 16:31:51 gvg Exp $ +/* $Id$ * * * FILE: drivers/fs/vfat/fcb.c @@ -55,18 +55,25 @@ vfatSplitPathName(PUNICODE_STRING PathNameU, PUNICODE_STRING DirNameU, PUNICODE_STRING FileNameU) { PWCHAR pName; - DirNameU->Buffer = PathNameU->Buffer; + ULONG Length = 0; pName = PathNameU->Buffer + PathNameU->Length / sizeof(WCHAR) - 1; - while (*pName != L'\\' && pName > PathNameU->Buffer) + while (*pName != L'\\' && pName >= PathNameU->Buffer) { pName--; + Length++; } - ASSERT(*pName == L'\\'); - FileNameU->Buffer = pName + 1; - DirNameU->Length = (FileNameU->Buffer - PathNameU->Buffer) * sizeof(WCHAR); - DirNameU->MaximumLength = DirNameU->Length; - FileNameU->Length = PathNameU->Length - DirNameU->Length; - FileNameU->MaximumLength = FileNameU->Length; + ASSERT(*pName == L'\\' || pName < PathNameU->Buffer); + if (FileNameU) + { + FileNameU->Buffer = pName + 1; + FileNameU->Length = FileNameU->MaximumLength = Length * sizeof(WCHAR); + } + if (DirNameU) + { + DirNameU->Buffer = PathNameU->Buffer; + DirNameU->Length = (pName + 1 - PathNameU->Buffer) * sizeof(WCHAR); + DirNameU->MaximumLength = DirNameU->Length; + } } VOID @@ -637,63 +644,85 @@ pFCB, pFileNameU); - RtlRosInitUnicodeStringFromLiteral(&RootNameU, L"\\"); + parentFCB = *pParentFCB; - // Trivial case, open of the root directory on volume - if (RtlEqualUnicodeString(pFileNameU, &RootNameU, FALSE)) - { - DPRINT ("returning root FCB\n"); + if (parentFCB == NULL) + { + RtlRosInitUnicodeStringFromLiteral(&RootNameU, L"\\"); - FCB = vfatOpenRootFCB (pVCB); - *pFCB = FCB; - *pParentFCB = NULL; + // Trivial case, open of the root directory on volume + if (RtlEqualUnicodeString(pFileNameU, &RootNameU, FALSE)) + { + DPRINT ("returning root FCB\n"); - return (FCB != NULL) ? STATUS_SUCCESS : STATUS_OBJECT_PATH_NOT_FOUND; - } + FCB = vfatOpenRootFCB (pVCB); + *pFCB = FCB; + *pParentFCB = NULL; - last = curr = pFileNameU->Buffer + pFileNameU->Length / sizeof(WCHAR) - 1; - while (*curr != L'\\' && curr > pFileNameU->Buffer) - { - curr--; - } + return (FCB != NULL) ? STATUS_SUCCESS : STATUS_OBJECT_PATH_NOT_FOUND; + } + + /* Check for an existing FCB */ + FCB = vfatGrabFCBFromTable (pVCB, pFileNameU); + if (FCB) + { + *pFCB = FCB; + *pParentFCB = FCB->parentFcb; + (*pParentFCB)->RefCount++; + return STATUS_SUCCESS; + } + + last = curr = pFileNameU->Buffer + pFileNameU->Length / sizeof(WCHAR) - 1; + while (*curr != L'\\' && curr > pFileNameU->Buffer) + { + curr--; + } - if (curr > pFileNameU->Buffer) - { - NameU.Buffer = pFileNameU->Buffer; - NameU.MaximumLength = NameU.Length = (curr - pFileNameU->Buffer) * sizeof(WCHAR); - FCB = vfatGrabFCBFromTable(pVCB, &NameU); - if (FCB) + if (curr > pFileNameU->Buffer) + { + NameU.Buffer = pFileNameU->Buffer; + NameU.MaximumLength = NameU.Length = (curr - pFileNameU->Buffer) * sizeof(WCHAR); + FCB = vfatGrabFCBFromTable(pVCB, &NameU); + if (FCB) { - Length = (curr - pFileNameU->Buffer) * sizeof(WCHAR); - if (Length != FCB->PathNameU.Length) - { + Length = (curr - pFileNameU->Buffer) * sizeof(WCHAR); + if (Length != FCB->PathNameU.Length) + { if (pFileNameU->Length + FCB->PathNameU.Length - Length > pFileNameU->MaximumLength) - { - vfatReleaseFCB (pVCB, FCB); - return STATUS_OBJECT_NAME_INVALID; - } + { + vfatReleaseFCB (pVCB, FCB); + return STATUS_OBJECT_NAME_INVALID; + } memmove(pFileNameU->Buffer + FCB->PathNameU.Length / sizeof(WCHAR), curr, pFileNameU->Length - Length); pFileNameU->Length += FCB->PathNameU.Length - Length; curr = pFileNameU->Buffer + FCB->PathNameU.Length / sizeof(WCHAR); last = pFileNameU->Buffer + pFileNameU->Length / sizeof(WCHAR) - 1; - } + } RtlCopyMemory(pFileNameU->Buffer, FCB->PathNameU.Buffer, FCB->PathNameU.Length); - } - } - else - { - FCB = NULL; - } + } + } + else + { + FCB = NULL; + } - if (FCB == NULL) - { - FCB = vfatOpenRootFCB(pVCB); - curr = pFileNameU->Buffer; - } + if (FCB == NULL) + { + FCB = vfatOpenRootFCB(pVCB); + curr = pFileNameU->Buffer; + } - parentFCB = NULL; - prev = curr; + parentFCB = NULL; + prev = curr; + } + else + { + FCB = parentFCB; + parentFCB = NULL; + prev = curr = pFileNameU->Buffer - 1; + last = pFileNameU->Buffer + pFileNameU->Length / sizeof(WCHAR) - 1; + } while (curr <= last) { @@ -751,14 +780,16 @@ status = vfatDirFindFile(pVCB, parentFCB, &NameU, &FCB); if (status == STATUS_OBJECT_NAME_NOT_FOUND) { - *pParentFCB = parentFCB; *pFCB = NULL; if (curr > last) { + *pParentFCB = parentFCB; return STATUS_OBJECT_NAME_NOT_FOUND; } else { + vfatReleaseFCB (pVCB, parentFCB); + *pParentFCB = NULL; return STATUS_OBJECT_PATH_NOT_FOUND; } } @@ -778,3 +809,4 @@ return STATUS_SUCCESS; } + _____ Modified: trunk/reactos/drivers/fs/vfat/rw.c --- trunk/reactos/drivers/fs/vfat/rw.c 2005-01-01 11:02:35 UTC (rev 12686) +++ trunk/reactos/drivers/fs/vfat/rw.c 2005-01-01 11:11:52 UTC (rev 12687) @@ -1,5 +1,5 @@ -/* $Id: rw.c,v 1.72 2004/12/05 16:31:51 gvg Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -642,7 +642,7 @@ Resource = &Fcb->MainResource; } if (!ExAcquireResourceSharedLite(Resource, - (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) + IrpContext->Flags & IRPCONTEXT_CANWAIT ? TRUE : FALSE)) { Resource = NULL; Status = STATUS_PENDING; _____ Modified: trunk/reactos/drivers/fs/vfat/vfat.h --- trunk/reactos/drivers/fs/vfat/vfat.h 2005-01-01 11:02:35 UTC (rev 12686) +++ trunk/reactos/drivers/fs/vfat/vfat.h 2005-01-01 11:11:52 UTC (rev 12687) @@ -1,4 +1,4 @@ -/* $Id: vfat.h,v 1.70 2004/12/05 16:31:51 gvg Exp $ */ +/* $Id$ */ #include <ddk/ntifs.h> @@ -457,7 +457,7 @@ NTSTATUS VfatOpenFile (PDEVICE_EXTENSION DeviceExt, PFILE_OBJECT FileObject, - PUNICODE_STRING FileNameU); + PVFATFCB* parentFcb); NTSTATUS FindFile (PDEVICE_EXTENSION DeviceExt, PVFATFCB Parent, @@ -507,7 +507,8 @@ NTSTATUS VfatAddEntry (PDEVICE_EXTENSION DeviceExt, PUNICODE_STRING PathNameU, - PFILE_OBJECT pFileObject, + PVFATFCB* Fcb, + PVFATFCB ParentFcb, ULONG RequestedOptions, UCHAR ReqAttr);

19 years, 11 months

[hbirr] 12686: - Initialized the pointers for the init environment.

by hbirr＠svn.reactos.com

- Initialized the pointers for the init environment. Modified: trunk/reactos/lib/msvcrt/misc/environ.c _____ Modified: trunk/reactos/lib/msvcrt/misc/environ.c --- trunk/reactos/lib/msvcrt/misc/environ.c 2005-01-01 10:59:31 UTC (rev 12685) +++ trunk/reactos/lib/msvcrt/misc/environ.c 2005-01-01 11:02:35 UTC (rev 12686) @@ -1,4 +1,4 @@ -/* $Id: environ.c,v 1.12 2004/12/13 18:30:08 hbirr Exp $ +/* $Id$ * * dllmain.c * @@ -56,7 +56,7 @@ count++; } - _environ = malloc(count * sizeof(char*)); + __initenv = _environ = malloc(count * sizeof(char*)); if (_environ) { for (ptr = environment_strings, envptr = _environ; count > 1; ptr += len) @@ -71,6 +71,7 @@ free(*envptr); FreeEnvironmentStringsA(environment_strings); free(_environ); + __initenv = _environ = NULL; return -1; } memcpy(*envptr++, ptr, len); @@ -106,7 +107,7 @@ count++; } - _wenviron = malloc(count * sizeof(wchar_t*)); + __winitenv = _wenviron = malloc(count * sizeof(wchar_t*)); if (_wenviron) { for (ptr = environment_strings, envptr = _wenviron; count > 1; ptr += len) @@ -121,6 +122,7 @@ free(*envptr); FreeEnvironmentStringsW(environment_strings); free(_wenviron); + __winitenv = _wenviron = NULL; return -1; } memcpy(*envptr++, ptr, len * sizeof(wchar_t));

19 years, 11 months

[hbirr] 12685: - Fixed the releasing of the memory from the init section.

by hbirr＠svn.reactos.com

- Fixed the releasing of the memory from the init section. Modified: trunk/reactos/ntoskrnl/mm/mminit.c _____ Modified: trunk/reactos/ntoskrnl/mm/mminit.c --- trunk/reactos/ntoskrnl/mm/mminit.c 2005-01-01 10:57:39 UTC (rev 12684) +++ trunk/reactos/ntoskrnl/mm/mminit.c 2005-01-01 10:59:31 UTC (rev 12685) @@ -1,4 +1,4 @@ -/* $Id: mminit.c,v 1.71 2004/10/22 20:38:22 ekohl Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top directory * PROJECT: ReactOS kernel @@ -482,7 +482,7 @@ MmLockAddressSpace(MmGetKernelAddressSpace()); MmFreeMemoryArea(MmGetKernelAddressSpace(), (PVOID)&_init_start__, - PAGE_ROUND_UP((ULONG)&_init_end__) - (ULONG)_init_start__, + PAGE_ROUND_UP((ULONG)&_init_end__) - (ULONG)&_init_start__, MiFreeInitMemoryPage, NULL); MmUnlockAddressSpace(MmGetKernelAddressSpace());

19 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2005