Changeset 14922

Timestamp:

Oct 1, 2000, 11:16:29 PM (25 years ago)

Author:

phaller

Message:

Fix for timers

File:

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

tags/trunk/src/winmm/os2timer.cpp ¶

@@ -1 @@
-/* $Id: os2timer.cpp,v 1.15 2000-05-24 01:56:25 phaller Exp $ */
+/* $Id: os2timer.cpp,v 1.16 2000-10-01 21:16:29 phaller Exp $ */
 
 /*
@@ -44 +44 @@
 {
   typedef DWORD (* CALLBACK LPTHREAD_START_ROUTINE)(LPVOID);
-
+  
+  DWORD WIN32API GetLastError();
+  
   HANDLE WIN32API CreateThread(LPSECURITY_ATTRIBUTES lpsa,
                                DWORD cbStack,
@@ -268 +270 @@
     timers = this;
   
+  // create timer semaphore
+  int rc = DosCreateEventSem(NULL, &TimerSem, DC_SEM_SHARED, 0);
+  if(rc != 0)
+  {
+    dprintf(("WINMM: OS2Timer: DosCreateEventSem failed rc=#%08xh\n", rc));
+    return; // terminate thread
+  }
+  
+  
   //hTimerThread = _beginthread(TimerHlpHandler, NULL, 0x4000, (void *)this);
   hTimerThread = CreateThread(NULL,
@@ -275 +286 @@
                               0, // thread creation flags
                               &TimerThreadID);
-
-  //@@@PH: CreateThread() should be used instead
-  //@@@PH: logic sux ... waits for creation of semaphores
-  DosSleep(10);
+  
+  if (hTimerThread == NULL)
+  {
+    dprintf(("WINMM: OS2Timer: CreateThread failed rc=#%08xh\n", 
+             GetLastError()));
+    DosCloseEventSem(TimerSem);
+  }
 }
 /******************************************************************************/
@@ -402 +416 @@
                        0L);                 /* Assume current thread  */
 
-  rc = DosCreateEventSem(NULL, &TimerSem, DC_SEM_SHARED, 0);
-  if(rc != 0)
-  {
-    dprintf(("WINMM: OS2Timer: DosCreateEventSem failed rc=#%08xh\n", rc));
-    return; // terminate thread
-  }
-
   TimerStatus = Stopped;
 
   while(!fFatal)
   {
+    dprintf(("WINMM: OS2Timer::TimerHandler waiting on timer (%04xh, %08xh\n",
+             dwFlags,
+            clientCallback));
+    
     DosWaitEventSem(TimerSem, SEM_INDEFINITE_WAIT);
     DosResetEventSem(TimerSem, &Count);
@@ -423 +434 @@
         if (TimerStatus == Running)
         {
+          dprintf(("WINMM: OS2Timer::TimerHandler firing (%04xh, %08xh\n",
+                   dwFlags,
+                  clientCallback));
+          
           // process the event
           switch (dwFlags & 0x0030)