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

Timestamp:

Oct 13, 2003, 11:18:38 AM (22 years ago)

Author:

sandervl

Message:

Make sure the timer object is not deleted inside the timer callback handler

File:

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

trunk/src/winmm/os2timer.cpp

@@ -1 @@
-/* $Id: os2timer.cpp,v 1.21 2003-03-06 15:42:33 sandervl Exp $ */
+/* $Id: os2timer.cpp,v 1.22 2003-10-13 09:18:37 sandervl Exp $ */
 
 /*
@@ -239 +239 @@
 OS2Timer::OS2Timer() : TimerSem(0), TimerHandle(0), hTimerThread(0),
                   clientCallback(NULL), TimerStatus(Stopped), fFatal(FALSE),
-                  next(NULL), timerID(0)
+                  next(NULL), timerID(0), refCount(0)
 {
   dprintf(("WINMM:OS2Timer: OS2Timer::OS2Timer(%08xh)\n",
@@ -266 +266 @@
     return; // terminate thread
   }
-  
-  
-  //hTimerThread = _beginthread(TimerHlpHandler, NULL, 0x4000, (void *)this);
+ 
+  //increase reference count for creation
+  addRef();
+
+  //increase reference count since the thread will access the object
+  addRef();  
   hTimerThread = CreateThread(NULL,
                               0x4000,
@@ -392 +395 @@
   TimerStatus = InActive;
 }
+//******************************************************************************
+//******************************************************************************
+#ifdef DEBUG
+LONG OS2Timer::addRef()
+{ 
+////  dprintf2(("addRef %x -> refcount %x", this, refCount+1));
+    return InterlockedIncrement(&refCount); 
+};
+#endif
+/******************************************************************************/
+//******************************************************************************
+LONG OS2Timer::release()
+{
+#ifdef DEBUG
+  if(refCount-1 < 0) {
+      DebugInt3();
+  }
+#endif
+  if(InterlockedDecrement(&refCount) == 0) {
+      dprintf2(("marked for deletion -> delete now"));
+      delete this;
+      return 0;
+  }
+  return refCount;
+}
 /******************************************************************************/
 //******************************************************************************
@@ -414 +442 @@
             clientCallback));
     
-    DosWaitEventSem(TimerSem, SEM_INDEFINITE_WAIT);
-    DosResetEventSem(TimerSem, &Count);
+    rc = DosWaitEventSem(TimerSem, SEM_INDEFINITE_WAIT);
+    if(rc) {
+        dprintf(("DosWaitEventSem failed with %d", rc));
+        DebugInt3();
+    }
+    rc = DosResetEventSem(TimerSem, &Count);
+    if(rc) {
+        dprintf(("DosResetEventSem failed with %d", rc));
+        DebugInt3();
+    }
     if(!fFatal)
     {
@@ -434 +470 @@
               if (clientCallback != NULL)
               {
-                selTIB = SetWin32TIB();
-                clientCallback((UINT)timerID, 0, userData, 0, 0);
-                SetFS(selTIB);
+                  clientCallback((UINT)timerID, 0, userData, 0, 0);
               }
               break;
@@ -462 +496 @@
   
   DosCloseEventSem(TimerSem);
+
+  //release object
+  release();
   
   // mark this thread as terminated
@@ -474 +511 @@
   return 0;
 }
-
-
 //******************************************************************************
 //******************************************************************************