[ros-diffs] [gdalsnes] 12942: -move alert stuff into own file

-move alert stuff into own file
-only use Thread->Alerted[0]. Alerted[1] is not used.
-misc
Modified: trunk/reactos/ntoskrnl/Makefile
Added: trunk/reactos/ntoskrnl/ke/alert.c
Modified: trunk/reactos/ntoskrnl/ke/apc.c
Modified: trunk/reactos/ntoskrnl/ps/thread.c
  _____  

Modified: trunk/reactos/ntoskrnl/Makefile
--- trunk/reactos/ntoskrnl/Makefile	2005-01-11 23:19:40 UTC (rev
12941)
+++ trunk/reactos/ntoskrnl/Makefile	2005-01-11 23:31:58 UTC (rev
12942)
@@ -121,6 +121,7 @@

 	ke/spinlock.o \
 	ke/timer.o \
 	ke/wait.o \
+	ke/alert.o
 
 # Memory Manager (Mm)
 OBJECTS_MM = \
  _____  

Added: trunk/reactos/ntoskrnl/ke/alert.c
--- trunk/reactos/ntoskrnl/ke/alert.c	2005-01-11 23:19:40 UTC (rev
12941)
+++ trunk/reactos/ntoskrnl/ke/alert.c	2005-01-11 23:31:58 UTC (rev
12942)
@@ -0,0 +1,166 @@

+/*
+ *  ReactOS kernel
+ *  Copyright (C) 1998, 1999, 2000, 2001 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
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+/*
+ * PROJECT:         ReactOS kernel
+ * FILE:            ntoskrnl/ke/alert.c
+ * PURPOSE:         Alerts
+ * PROGRAMMER:      Alex Ionescu (alex(a)relsoft.net)
+ * PORTABILITY:     Unchecked
+ * UPDATE HISTORY:
+ *                  Created 22/05/98
+ */
+
+/* INCLUDES
*****************************************************************/
+
+#include <ntoskrnl.h>
+#define NDEBUG
+#include <internal/debug.h>
+
+/* GLOBALS
*******************************************************************/
+
+
+/* FUNCTIONS
*****************************************************************/
+
+
+BOOLEAN
+STDCALL
+KeTestAlertThread(IN KPROCESSOR_MODE AlertMode)
+/*
+ * FUNCTION: Tests whether there are any pending APCs for the current
thread
+ * and if so the APCs will be delivered on exit from kernel mode
+ */
+{
+   KIRQL OldIrql;
+   PKTHREAD Thread = KeGetCurrentThread();
+   BOOLEAN OldState;
+   
+   ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL);
+   
+   OldIrql = KeAcquireDispatcherDatabaseLock();
+   KiAcquireSpinLock(&Thread->ApcQueueLock);
+   
+   /* NOTE: Albert Almeida claims Alerted[1] is never used. Two kind of
+    * alerts _do_ seem useless. -Gunnar
+    */
+   OldState = Thread->Alerted[0];
+   
+   /* If the Thread is Alerted, Clear it */
+   if (OldState) {
+      Thread->Alerted[0] = FALSE;  
+   } else if ((AlertMode == UserMode) &&
(!IsListEmpty(&Thread->ApcState.ApcListHead[UserMode]))) {
+      /* If the mode is User and the Queue isn't empty, set Pending */
+      Thread->ApcState.UserApcPending = TRUE;
+   }
+   
+   KiReleaseSpinLock(&Thread->ApcQueueLock);
+   KeReleaseDispatcherDatabaseLock(OldIrql);
+   return OldState;
+}
+
+
+VOID
+KeAlertThread(PKTHREAD Thread, KPROCESSOR_MODE AlertMode)
+{
+   KIRQL oldIrql;
+
+   
+   oldIrql = KeAcquireDispatcherDatabaseLock();
+      
+
+   /* Return if thread is already alerted.
+    * NOTE: Albert Almeida claims Alerted[1] is never used. Two kind of
+    * alerts _do_ seem useless. -Gunnar
+    */
+   if (Thread->Alerted[0] == FALSE)
+   {
+      Thread->Alerted[0] = TRUE;
+
+      if (Thread->State == THREAD_STATE_BLOCKED &&
+          Thread->WaitMode == AlertMode &&
+          Thread->Alertable)
+      {
+         KiAbortWaitThread(Thread, STATUS_ALERTED);
+      }
+   }
+   
+   KeReleaseDispatcherDatabaseLock(oldIrql);
+ 
+}
+
+
+/* 
+ *
+ * NOT EXPORTED
+ */
+NTSTATUS STDCALL
+NtAlertResumeThread(IN  HANDLE ThreadHandle,
+          OUT PULONG SuspendCount)
+{
+   UNIMPLEMENTED;
+   return(STATUS_NOT_IMPLEMENTED);
+
+}
+
+/* 
+ * @implemented
+ *
+ * EXPORTED
+ */
+NTSTATUS STDCALL
+NtAlertThread (IN HANDLE ThreadHandle)
+{
+   PETHREAD Thread;
+   NTSTATUS Status;
+
+   Status = ObReferenceObjectByHandle(ThreadHandle,
+                  THREAD_SUSPEND_RESUME,
+                  PsThreadType,
+                  ExGetPreviousMode(),
+                  (PVOID*)&Thread,
+                  NULL);
+   if (!NT_SUCCESS(Status))
+     {
+   return(Status);
+     }
+
+   /* FIXME: should we always use UserMode here, even if the ntoskrnl
exported
+    * ZwAlertThread was called?
+    * -Gunnar
+    */ 
+   KeAlertThread((PKTHREAD)Thread, UserMode);
+   
+   ObDereferenceObject(Thread);
+   return(STATUS_SUCCESS);
+}
+
+
+/* 
+ * NOT EXPORTED
+ */
+NTSTATUS
+STDCALL
+NtTestAlert(VOID)
+{
+   /* Check and Alert Thread if needed */
+   if (KeTestAlertThread(KeGetPreviousMode())) {
+      return STATUS_ALERTED;
+   } else {
+      return STATUS_SUCCESS;
+   }
+}
  _____  

Modified: trunk/reactos/ntoskrnl/ke/apc.c
--- trunk/reactos/ntoskrnl/ke/apc.c	2005-01-11 23:19:40 UTC (rev
12941)
+++ trunk/reactos/ntoskrnl/ke/apc.c	2005-01-11 23:31:58 UTC (rev
12942)
@@ -262,37 +262,6 @@

 	return(TRUE);
 }
 
-BOOLEAN
-STDCALL
-KeTestAlertThread(IN KPROCESSOR_MODE AlertMode)
-/*
- * FUNCTION: Tests whether there are any pending APCs for the current
thread
- * and if so the APCs will be delivered on exit from kernel mode
- */
-{
-	KIRQL OldIrql;
-	PKTHREAD Thread = KeGetCurrentThread();
-	BOOLEAN OldState;
-   
-   ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL);
-	
-	OldIrql = KeAcquireDispatcherDatabaseLock();
-	KiAcquireSpinLock(&Thread->ApcQueueLock);
-	
-	OldState = Thread->Alerted[(int)AlertMode];
-	
-	/* If the Thread is Alerted, Clear it */
-	if (OldState) {
-		Thread->Alerted[(int)AlertMode] = FALSE;	
-	} else if ((AlertMode == UserMode) &&
(!IsListEmpty(&Thread->ApcState.ApcListHead[UserMode]))) {
-		/* If the mode is User and the Queue isn't empty, set
Pending */
-		Thread->ApcState.UserApcPending = TRUE;
-	}
-	
-	KiReleaseSpinLock(&Thread->ApcQueueLock);
-	KeReleaseDispatcherDatabaseLock(OldIrql);
-	return OldState;
-}
 
 /*
  * @implemented
@@ -615,17 +584,6 @@
 	return Status;
 }
 
-NTSTATUS
-STDCALL
-NtTestAlert(VOID)
-{
-	/* Check and Alert Thread if needed */
-	if (KeTestAlertThread(KeGetPreviousMode())) {
-		return STATUS_ALERTED;
-	} else {
-		return STATUS_SUCCESS;
-	}
-}
 
 static inline VOID RepairList(PLIST_ENTRY Original, 
 			      PLIST_ENTRY Copy,
  _____  

Modified: trunk/reactos/ntoskrnl/ps/thread.c
--- trunk/reactos/ntoskrnl/ps/thread.c	2005-01-11 23:19:40 UTC (rev
12941)
+++ trunk/reactos/ntoskrnl/ps/thread.c	2005-01-11 23:31:58 UTC (rev
12942)
@@ -477,6 +477,8 @@

 VOID
 PsUnblockThread(PETHREAD Thread, PNTSTATUS WaitStatus)
 {
+   ASSERT(Thread->WaitBlockList == NULL);
+      
   if (THREAD_STATE_TERMINATED_1 == Thread->Tcb.State ||
       THREAD_STATE_TERMINATED_2 == Thread->Tcb.State)
     {
@@ -965,44 +967,7 @@
 }
 
 
-NTSTATUS STDCALL
-NtAlertResumeThread(IN	HANDLE ThreadHandle,
-		    OUT PULONG	SuspendCount)
-{
-   UNIMPLEMENTED;
-   return(STATUS_NOT_IMPLEMENTED);
 
-}
-
-
-NTSTATUS STDCALL
-NtAlertThread (IN HANDLE ThreadHandle)
-{
-   PETHREAD Thread;
-   NTSTATUS Status;
-   NTSTATUS ThreadStatus;
-   KIRQL oldIrql;
-
-   Status = ObReferenceObjectByHandle(ThreadHandle,
-				      THREAD_SUSPEND_RESUME,
-				      PsThreadType,
-				      UserMode,
-				      (PVOID*)&Thread,
-				      NULL);
-   if (Status != STATUS_SUCCESS)
-     {
-	return(Status);
-     }
-
-   ThreadStatus = STATUS_ALERTED;
-   oldIrql = KeAcquireDispatcherDatabaseLock();
-   (VOID)PsUnblockThread(Thread, &ThreadStatus);
-   KeReleaseDispatcherDatabaseLock(oldIrql);
-
-   ObDereferenceObject(Thread);
-   return(STATUS_SUCCESS);
-}
-
 /**********************************************************************
  *	NtOpenThread/4
  *