Changeset 3600 for trunk/src/winmm/os2timer.cpp

Timestamp:

May 24, 2000, 3:56:25 AM (25 years ago)

Author:

phaller

Message:

Fix: WINMM: OS2Timer stuff

File:

• trunk/src/winmm/os2timer.cpp (modified) (9 diffs)

trunk/src/winmm/os2timer.cpp

@@ -1 @@
-/* $Id: os2timer.cpp,v 1.14 2000-02-17 14:09:32 sandervl Exp $ */
+/* $Id: os2timer.cpp,v 1.15 2000-05-24 01:56:25 phaller Exp $ */
 
 /*
@@ -51 +51 @@
                                DWORD fdwCreate,
                                LPDWORD lpIDThread);
+  
+  VOID WIN32API ExitThread(DWORD dwExitCode);
+  
+  BOOL WIN32API TerminateThread(HANDLE hThread,
+                                DWORD dwExitCode);
+  
+  BOOL WIN32API SetEvent   (HANDLE hEvent);
+    
+  BOOL WIN32API PulseEvent (HANDLE hEvent);
+    
 }
 
@@ -238 +248 @@
 /******************************************************************************/
 /******************************************************************************/
-OS2Timer::OS2Timer() : TimerSem(0), TimerHandle(0), TimerThreadID(0),
+OS2Timer::OS2Timer() : TimerSem(0), TimerHandle(0), hTimerThread(0),
                   clientCallback(NULL), TimerStatus(Stopped), fFatal(FALSE),
                   next(NULL)
@@ -257 +267 @@
   else
     timers = this;
-
-  //TimerThreadID = _beginthread(TimerHlpHandler, NULL, 0x4000, (void *)this);
+  
+  //hTimerThread = _beginthread(TimerHlpHandler, NULL, 0x4000, (void *)this);
   hTimerThread = CreateThread(NULL,
                               0x4000,
@@ -266 +276 @@
                               &TimerThreadID);
 
-
   //@@@PH: CreateThread() should be used instead
   //@@@PH: logic sux ... waits for creation of semaphores
-  DosSleep(100);
+  DosSleep(10);
 }
 /******************************************************************************/
@@ -310 +319 @@
 
   APIRET rc;
-
-  if(TimerThreadID == -1)
+  
+  // has the thread been created properly?
+  if(hTimerThread == NULLHANDLE)
     return(FALSE);
 
   if(TimerStatus == Stopped)
   {
-    clientCallback = lptc;
-    userData       = dwUser;
-
-    if(fuEvent == TIME_PERIODIC)
+    clientCallback = lptc;    // callback data (id / addr)
+    userData       = dwUser;  // user-supplied data
+    dwFlags        = fuEvent; // type of timer / callback
+
+    if(fuEvent & TIME_PERIODIC)
       rc = DosStartTimer(period, (HSEM)TimerSem, &TimerHandle);
     else
@@ -328 +339 @@
 
 #ifdef DEBUG
-      if(fuEvent == TIME_PERIODIC)
+      if(fuEvent & TIME_PERIODIC)
         WriteLog("DosStartTimer failed %d\n", rc);
       else
@@ -365 +376 @@
 
   fFatal = TRUE;
-  DosStopTimer(TimerHandle);
+  
+  StopTimer();
+  
   if(DosPostEventSem(TimerSem))
-  {  //something went wrong
-     DosKillThread(TimerThreadID);
-     DosCloseEventSem(TimerSem);
+  {  
+    //something went wrong, kill the thread
+    TerminateThread(hTimerThread, -1);
   }
   TimerStatus = InActive;
@@ -406 +419 @@
         // @@@PH: we're calling the client with PRTYC_TIMECRITICAL !!!
         //        It'd be much nicer to call with original priority!
-
-        selTIB = SetWin32TIB();
-        clientCallback((UINT)this, 0, userData, 0, 0);
-        SetFS(selTIB);
-    }
-  }
+      
+        // check timer running condition
+        if (TimerStatus == Running)
+        {
+          // process the event
+          switch (dwFlags & 0x0030)
+          {
+            case TIME_CALLBACK_FUNCTION:
+              if (clientCallback != NULL)
+              {
+                selTIB = SetWin32TIB();
+                clientCallback((UINT)this, 0, userData, 0, 0);
+                SetFS(selTIB);
+              }
+              break;
+            
+            case TIME_CALLBACK_EVENT_SET:
+              SetEvent( (HANDLE)clientCallback );
+              break;
+            
+            case TIME_CALLBACK_EVENT_PULSE:
+              PulseEvent( (HANDLE)clientCallback );
+              break;
+            
+            default:
+              dprintf(("WINMM: OS2Timer %08xh: unknown type for mmtime callback(%08xh)\n",
+                       this,
+                       dwFlags));
+          }
+        }
+    }
+  }
+  
+  // last message
+  dprintf(("WINMM: OS2Timer: Timer thread terminating (%08xh)\n",
+           this));
+  
   DosCloseEventSem(TimerSem);
+  
+  // mark this thread as terminated
+  ExitThread(0);
 }
 //******************************************************************************