Changeset 296 for trunk/src/kernel32/console.cpp

Timestamp:

Jul 12, 1999, 7:20:04 PM (26 years ago)

Author:

phaller

Message:

Fix: console input queue fixes

File:

• trunk/src/kernel32/console.cpp (modified) (8 diffs)

trunk/src/kernel32/console.cpp

@@ -1 @@
-/* $Id: console.cpp,v 1.8 1999-07-06 15:48:45 phaller Exp $ */
+/* $Id: console.cpp,v 1.9 1999-07-12 17:20:03 phaller Exp $ */
 
 /*
@@ -184 +184 @@
 
 /*****************************************************************************
+ * Name      : iConsoleInputQueueLock
+ * Purpose   : lock the input queue to ensure correct event sequence
+ * Parameters:
+ * Variables :
+ * Result    :
+ * Remark    :
+ * Status    :
+ *
+ * Author    : Patrick Haller [Tue, 1998/02/10 01:55]
+ *****************************************************************************/
+
+void static iConsoleInputQueueLock()
+{
+  DosRequestMutexSem(ConsoleInput.hmtxInputQueue,
+                     SEM_INDEFINITE_WAIT);
+}
+
+
+/*****************************************************************************
+ * Name      : iConsoleInputQueueUnlock
+ * Purpose   : unlock the input queue
+ * Parameters:
+ * Variables :
+ * Result    :
+ * Remark    :
+ * Status    :
+ *
+ * Author    : Patrick Haller [Tue, 1998/02/10 01:55]
+ *****************************************************************************/
+
+void static iConsoleInputQueueUnlock()
+{
+  DosReleaseMutexSem(ConsoleInput.hmtxInputQueue);
+}
+
+
+/*****************************************************************************
  * Name      :
  * Purpose   :
@@ -225 +262 @@
   }
 
+
+  rc = DosCreateMutexSem(NULL,
+                         &ConsoleInput.hmtxInputQueue,
+                         0L,
+                         FALSE);
+  if (rc != NO_ERROR)                                       /* other error ? */
+  {
+    DosCloseEventSem(ConsoleGlobals.hevConsole);    /* close other semaphore */
+    DosCloseEventSem(ConsoleInput.hevInputQueue);   /* close other semaphore */
+    return (rc);                                    /* raise error condition */
+  }
 
   /***************************************************************************
@@ -332 +380 @@
   ConsoleGlobals.Options.coordDefaultPosition.Y  = 0;
   ConsoleGlobals.Options.coordDefaultSize.X      = 80;
-  ConsoleGlobals.Options.coordDefaultSize.Y      = 35;
+  ConsoleGlobals.Options.coordDefaultSize.Y      = 25;
   ConsoleGlobals.coordWindowSize.X               = ConsoleGlobals.Options.coordDefaultSize.X;
   ConsoleGlobals.coordWindowSize.Y               = ConsoleGlobals.Options.coordDefaultSize.Y;
@@ -496 +544 @@
 {
   APIRET rc;
+
+  DosCloseEventSem(ConsoleGlobals.hevConsole);      /* close other semaphore */
+  DosCloseEventSem(ConsoleInput.hevInputQueue);     /* close other semaphore */
+  DosCloseMutexSem(ConsoleInput.hmtxInputQueue);          /* close semaphore */
+
 
   WinPostMsg (ConsoleGlobals.hwndFrame,         /* force thread to terminate */
@@ -1308 +1361 @@
            pInputRecord));
 #endif
+
+  iConsoleInputQueueLock();
                                                            /* get free event */
   pirFree = &ConsoleInput.arrInputRecord[ConsoleInput.ulIndexFree];
   if (pirFree->EventType != 0x0000)
+  {
+    iConsoleInputQueueUnlock();
     return (ERROR_QUE_NO_MEMORY);                         /* queue is full ! */
-
+  }
                                                        /* put event in queue */
+
+  ConsoleInput.ulIndexFree++;                        /* update index counter */
+  if (ConsoleInput.ulIndexFree >= CONSOLE_INPUTQUEUESIZE)
+    ConsoleInput.ulIndexFree = 0;
+
+  ConsoleInput.ulEvents++;                   /* increate queue event counter */
+
+  iConsoleInputQueueUnlock();
+
   memcpy(pirFree,                                               /* copy data */
          pInputRecord,
          sizeof (INPUT_RECORD) );
-
-  ConsoleInput.ulIndexFree++;                        /* update index counter */
-  if (ConsoleInput.ulIndexFree >= CONSOLE_INPUTQUEUESIZE)
-    ConsoleInput.ulIndexFree = 0;
-
-  ConsoleInput.ulEvents++;                   /* increate queue event counter */
-
                                                   /* unblock reading threads */
   rc = DosPostEventSem(ConsoleInput.hevInputQueue);
@@ -1355 +1414 @@
     return (ERROR_QUE_EMPTY);                            /* queue is empty ! */
 
+  iConsoleInputQueueLock();
                                                           /* get first event */
   pirEvent = &ConsoleInput.arrInputRecord[ConsoleInput.ulIndexEvent];
   if (pirEvent->EventType == 0x0000)
+  {
+    iConsoleInputQueueUnlock();
     return (ERROR_QUE_EMPTY);                            /* queue is empty ! */
+  }
+
+  if (ConsoleInput.ulEvents >= 0)       /* decrease number of console events */
+    ConsoleInput.ulEvents--;
+
+  ConsoleInput.ulIndexEvent++;                       /* update index counter */
+  if (ConsoleInput.ulIndexEvent >= CONSOLE_INPUTQUEUESIZE)
+    ConsoleInput.ulIndexEvent = 0;
 
                                                        /* put event in queue */
@@ -1367 +1437 @@
   pirEvent->EventType = 0x0000;                 /* mark event as read = free */
 
-  if (ConsoleInput.ulEvents >= 0)       /* decrease number of console events */
-    ConsoleInput.ulEvents--;
-
-  ConsoleInput.ulIndexEvent++;                       /* update index counter */
-  if (ConsoleInput.ulIndexEvent >= CONSOLE_INPUTQUEUESIZE)
-    ConsoleInput.ulIndexEvent = 0;
+  iConsoleInputQueueUnlock();
 
   return (NO_ERROR);                                                   /* OK */