Changeset 31018 in vbox

Timestamp:

Jul 22, 2010 4:59:41 PM (15 years ago)

Author:

vboxsync

Message:

Events: handle dead listeners better

Location:

trunk

Files:

• include/VBox/com/defs.h (modified) (1 diff)
• src/VBox/Main/EventImpl.cpp (modified) (6 diffs)

trunk/include/VBox/com/defs.h

@@ -264 +264 @@
 #define SUCCEEDED_WARNING(rc)   (NS_SUCCEEDED (rc) && (rc) != NS_OK)
 
-#define FAILED_DEAD_INTERFACE(rc) (false) /**< @todo */
+#define FAILED_DEAD_INTERFACE(rc)  ( (rc) == NS_ERROR_ABORT )
 
 #define IUnknown nsISupports

trunk/src/VBox/Main/EventImpl.cpp

@@ -61 +61 @@
 #include <iprt/critsect.h>
 #include <iprt/asm.h>
+#include <iprt/time.h>
 
 #include <VBox/com/array.h>
@@ -576 +577 @@
     PassiveQueue                  mQueue;
     int32_t                       mRefCnt;
+    uint64_t                      mLastRead;
 
 public:
@@ -734 +736 @@
         ::RTCritSectInit(&mcsQLock);
         ::RTSemEventCreate (&mQEvent);
+        mLastRead = RTTimeMilliTS();
     }
 }
@@ -805 +808 @@
 {
     AssertMsg(!mActive, ("must be passive\n"));
+
     // put an event the queue
     ::RTCritSectEnter(&mcsQLock);
+
+    // If there was no events reading from the listener for the long time, 
+    // and events keep coming we shall unregister it.
+    if ((mQueue.size() > 200) && ((RTTimeMilliTS() - mLastRead) > 60 * 1000))
+    {
+        ::RTCritSectLeave(&mcsQLock);
+        return E_ABORT;
+    }
+
     mQueue.push_back(aEvent);
     ::RTCritSectLeave(&mcsQLock);
@@ -826 +839 @@
 
     ::RTCritSectEnter(&mcsQLock);
+
+    mLastRead = RTTimeMilliTS();
+
     if (mQueue.empty())    {
         ::RTCritSectLeave(&mcsQLock);
@@ -1026 +1042 @@
             cbRc = record.obj()->process(aEvent, aWaitable, pit, alock);
 
-            if (FAILED_DEAD_INTERFACE(cbRc))
+            if (FAILED_DEAD_INTERFACE(cbRc) || (cbRc == E_ABORT))
             {
                 Listeners::iterator lit = m->mListeners.find(record.obj()->mListener);