- Invert CONFIG_SMP defines as requested by Hartmut

[reactos.git] / reactos / ntoskrnl / ke / gate.c

diff --git a/reactos/ntoskrnl/ke/gate.c b/reactos/ntoskrnl/ke/gate.c
index 34cbb0c..228ed3c 100644 (file)
--- a/reactos/ntoskrnl/ke/gate.c
+++ b/reactos/ntoskrnl/ke/gate.c
@@ -3,7 +3,7 @@
  * PROJECT:         ReactOS Kernel
  * FILE:            ntoskrnl/ke/gate.c
  * PURPOSE:         Implements the Gate Dispatcher Object
- * 
+ *
  * PROGRAMMERS:     Alex Ionescu (alex@relsoft.net)
  */
 
@@ -15,12 +15,12 @@
 
 /* FUNCTIONS ****************************************************************/
 
-VOID 
+VOID
 FASTCALL
 KeInitializeGate(PKGATE Gate)
 {
-    DPRINT1("KeInitializeGate(Gate %x)\n", Gate);
-    
+    DPRINT("KeInitializeGate(Gate %x)\n", Gate);
+
     /* Initialize the Dispatcher Header */
     KeInitializeDispatcherHeader(&Gate->Header,
                                  GateObject,
@@ -32,66 +32,66 @@ VOID
 FASTCALL
 KeWaitForGate(PKGATE Gate,
               KWAIT_REASON WaitReason,
-              KPROCESSOR_MODE WaitMode)       
+              KPROCESSOR_MODE WaitMode)
 {
     KIRQL OldIrql;
     PKTHREAD CurrentThread = KeGetCurrentThread();
     PKWAIT_BLOCK GateWaitBlock;
     NTSTATUS Status;
-    
-    DPRINT1("KeWaitForGate(Gate %x)\n", Gate);
-    
-    do 
+
+    DPRINT("KeWaitForGate(Gate %x)\n", Gate);
+
+    do
     {
         /* Lock the APC Queue */
-        KeAcquireSpinLock(&CurrentThread->ApcQueueLock, &OldIrql);
-    
+        OldIrql = KeAcquireDispatcherDatabaseLock();
+        
         /* Check if it's already signaled */
-        if (!Gate->Header.SignalState)
+        if (Gate->Header.SignalState)
         {
             /* Unsignal it */
             Gate->Header.SignalState = 0;
-    
+
             /* Unlock the Queue and return */
-            KeReleaseSpinLock(&CurrentThread->ApcQueueLock, OldIrql);
+            KeReleaseDispatcherDatabaseLock(OldIrql);
             return;
         }
-    
+
         /* Setup a Wait Block */
         GateWaitBlock = &CurrentThread->WaitBlock[0];
         GateWaitBlock->Object = (PVOID)Gate;
         GateWaitBlock->Thread = CurrentThread;
-    
+
         /* Set the Thread Wait Data */
         CurrentThread->WaitReason = WaitReason;
         CurrentThread->WaitMode = WaitMode;
         CurrentThread->WaitIrql = OldIrql;
         CurrentThread->GateObject = Gate;
-    
+
         /* Insert into the Wait List */
         InsertTailList(&Gate->Header.WaitListHead, &GateWaitBlock->WaitListEntry);
-    
+
         /* Handle Kernel Queues */
-        if (CurrentThread->Queue) 
+        if (CurrentThread->Queue)
         {
-            DPRINT1("Waking Queue\n");
+            DPRINT("Waking Queue\n");
             KiWakeQueue(CurrentThread->Queue);
         }
-    
-        /* Unlock the Queue*/
-        KeReleaseSpinLock(&CurrentThread->ApcQueueLock, OldIrql);
-    
-        /* Block the Thread */
-        DPRINT1("Blocking the Thread: %x\n", CurrentThread);
-        KiBlockThread(&Status, 
-                      CurrentThread->Alertable, 
-                      WaitMode, 
-                      WaitReason);
-    
+
+        /* Setup the wait information */
+        CurrentThread->WaitMode = WaitMode;
+        CurrentThread->WaitReason = WaitReason;
+        CurrentThread->WaitTime = 0;
+        CurrentThread->State = Waiting;
+
+        /* Find a new thread to run */
+        DPRINT("Swapping threads\n");
+        Status = KiSwapThread();
+
         /* Check if we were executing an APC */
         if (Status != STATUS_KERNEL_APC) return;
-        
-        DPRINT1("Looping Again\n");
+
+        DPRINT("Looping Again\n");
     } while (TRUE);
 }
 
@@ -104,44 +104,44 @@ KeSignalGateBoostPriority(PKGATE Gate)
     KIRQL OldIrql;
     NTSTATUS WaitStatus = STATUS_SUCCESS;
 
-    DPRINT1("KeSignalGateBoostPriority(EveGate %x)\n", Gate);
-    
+    DPRINT("KeSignalGateBoostPriority(EveGate %x)\n", Gate);
+
     /* Acquire Dispatcher Database Lock */
     OldIrql = KeAcquireDispatcherDatabaseLock();
-    
+
     /* Make sure we're not already signaled or that the list is empty */
     if (Gate->Header.SignalState) goto quit;
-    
+
     /* If our wait list is empty, then signal the event and return */
     if (IsListEmpty(&Gate->Header.WaitListHead))
-    {    
+    {
         Gate->Header.SignalState = 1;
         goto quit;
     }
-    
+
     /* Get WaitBlock */
-    WaitBlock = CONTAINING_RECORD(Gate->Header.WaitListHead.Flink, 
-                                  KWAIT_BLOCK, 
-                                  WaitListEntry);                      
+    WaitBlock = CONTAINING_RECORD(Gate->Header.WaitListHead.Flink,
+                                  KWAIT_BLOCK,
+                                  WaitListEntry);
     /* Remove it */
     RemoveEntryList(&WaitBlock->WaitListEntry);
-    
+
     /* Get the Associated thread */
     WaitThread = WaitBlock->Thread;
 
     /* Increment the Queue's active threads */
-    if (WaitThread->Queue) 
+    if (WaitThread->Queue)
     {
-        DPRINT1("Incrementing Queue's active threads\n");
+        DPRINT("Incrementing Queue's active threads\n");
         WaitThread->Queue->CurrentCount++;
     }
-    
+
     /* Reschedule the Thread */
-    DPRINT1("Unblocking the Thread\n");
+    DPRINT("Unblocking the Thread\n");
     KiUnblockThread(WaitThread, &WaitStatus, EVENT_INCREMENT);
     return;
 
-quit:    
+quit:
     /* Release the Dispatcher Database Lock */
     KeReleaseDispatcherDatabaseLock(OldIrql);
 }