Changeset 30477 in vbox

Timestamp:

Jun 28, 2010 4:56:57 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

63160

Message:

Main: finer events locks

Location:

trunk/src/VBox/Main

Files:

• EventImpl.cpp (modified) (9 diffs)
• idl/autogen.xsl (modified) (1 diff)
• include/EventImpl.h (modified) (1 diff)

trunk/src/VBox/Main/EventImpl.cpp

@@ -239 +239 @@
     HRESULT process(IEvent* aEvent, BOOL aWaitable, PendingEventsMap::iterator& pit, AutoLockBase& alock);
     HRESULT enqueue(IEvent* aEvent);
-    HRESULT dequeue(IEvent* *aEvent, LONG aTimeout);
+    HRESULT dequeue(IEvent* *aEvent, LONG aTimeout, AutoLockBase& aAlock);
     HRESULT eventProcessed(IEvent * aEvent, PendingEventsMap::iterator& pit);
     void addRef()
@@ -397 +397 @@
 }
 
-HRESULT ListenerRecord::process(IEvent* aEvent, BOOL aWaitable, PendingEventsMap::iterator& pit, AutoLockBase& alock)
+HRESULT ListenerRecord::process(IEvent*                     aEvent, 
+                                BOOL                        aWaitable, 
+                                PendingEventsMap::iterator& pit, 
+                                AutoLockBase&               aAlock)
 {
     if (mActive)
@@ -407 +410 @@
         if (mListener)
         {
-            alock.release();
+            aAlock.release();
             rc =  mListener->HandleEvent(aEvent);
-            alock.acquire();
+            aAlock.acquire();
         }
         if (aWaitable)
@@ -434 +437 @@
 }
 
-HRESULT ListenerRecord::dequeue (IEvent* *aEvent, LONG aTimeout)
+HRESULT ListenerRecord::dequeue (IEvent*       *aEvent, 
+                                 LONG          aTimeout, 
+                                 AutoLockBase& aAlock)
 {
     AssertMsg(!mActive, ("must be passive\n"));
@@ -441 +446 @@
     if (mQueue.empty())
     {
-        ::RTCritSectLeave(&mcsQLock);
+        // retain listener record
+        ListenerRecordHolder holder(this);
+        ::RTCritSectLeave(&mcsQLock);        
         // Speed up common case
         if (aTimeout == 0)
@@ -448 +455 @@
             return S_OK;
         }
+        // release lock while waiting, listener will not go away due to above holder
+        aAlock.release();
         ::RTSemEventWait(mQEvent, aTimeout);
+        // reacquire lock
+        aAlock.acquire();
         ::RTCritSectEnter(&mcsQLock);
     }
@@ -510 +521 @@
 {
     m->mListeners.clear();
-    // m->mEvMap shall be cleared at this point too by destructors
+    // m->mEvMap shall be cleared at this point too by destructors, assert?
 }
 
@@ -644 +655 @@
      * here, to make this wait preemptible, thus both take read lock (write
      * lock in FireEvent() would do too, and probably is a bit stricter),
-     * but will interfere with .
+     * but will be unable to .
      */
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -652 +663 @@
 
     if (it != m->mListeners.end())
-        rc = it->second.obj()->dequeue(aEvent, aTimeout);
+        rc = it->second.obj()->dequeue(aEvent, aTimeout, alock);
     else
         rc = setError(VBOX_E_OBJECT_NOT_FOUND,

trunk/src/VBox/Main/idl/autogen.xsl

@@ -401 +401 @@
 <xsl:template name="genCommonEventCode">
   <xsl:text><![CDATA[
-void VBoxEventDesc::getEvent(IEvent ** aEvent)
-{
-    mEvent.queryInterfaceTo(aEvent);
-}
 HRESULT VBoxEventDesc::init(IEventSource* source, VBoxEventType_T aType, ...)
 {

trunk/src/VBox/Main/include/EventImpl.h

@@ -132 +132 @@
  {}
 
+ /**
+  * This function to be used with some care, as arguments order must match attribute declaration order 
+  * event class and its superclasses up to IEvent. If unsure, consult implementation in 
+  * generated VBoxEvents.cpp.
+  */
  HRESULT init(IEventSource* aSource, VBoxEventType_T aType, ...);
- void getEvent(IEvent ** aEvent);
+
+ void getEvent(IEvent ** aEvent)
+ {
+     mEvent.queryInterfaceTo(aEvent);
+ }
 
 private: