Changeset 77079 in vbox for trunk/src/VBox

Timestamp:

Jan 31, 2019 4:05:05 PM (6 years ago)

Author:

vboxsync

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

128532

Message:

Guest Control/Main: Fixed GuestWaitEvent initialization by now having dedicated Init() functions and use proper memory / exception handling in GuestBase::registerWaitEventEx().

Location:

trunk/src/VBox/Main

Files:

• include/GuestCtrlImplPrivate.h (modified) (2 diffs)
• src-client/GuestCtrlPrivate.cpp (modified) (5 diffs)

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

@@ -1066 +1066 @@
 public:
 
-    GuestWaitEvent(uint32_t uCID);
-    GuestWaitEvent(uint32_t uCID, const GuestEventTypes &lstEvents);
+    GuestWaitEvent(void);
     virtual ~GuestWaitEvent(void);
 
 public:
 
+    int                              Init(uint32_t uCID);
+    int                              Init(uint32_t uCID, const GuestEventTypes &lstEvents);
     int                              Cancel(void);
     const ComPtr<IEvent>             Event(void) { return mEvent; }
@@ -1079 +1080 @@
     const GuestEventTypes           &Types(void) { return mEventTypes; }
     size_t                           TypeCount(void) { return mEventTypes.size(); }
-
-protected:
-
-    int                              Init(uint32_t uCID);
 
 protected:

trunk/src/VBox/Main/src-client/GuestCtrlPrivate.cpp

@@ -939 +939 @@
     AssertRCReturn(rc, rc);
 
-#if 1 /** @todo r=bird: Incorrect exception and memory handling, no strategy for dealing with duplicate IDs: */
-    rc = RTCritSectEnter(&mWaitEventCritSect);
-    if (RT_SUCCESS(rc))
-    {
-        try
-        {
-            GuestWaitEvent *pEvent = new GuestWaitEvent(idContext, lstEvents);
-            AssertPtr(pEvent);
-
-            LogFlowThisFunc(("New event=%p, CID=%RU32\n", pEvent, idContext));
-
-            /* Insert event into matching event group. This is for faster per-group
-             * lookup of all events later. */
-            for (GuestEventTypes::const_iterator itEvents = lstEvents.begin();
-                 itEvents != lstEvents.end(); ++itEvents)
-            {
-                /* Check if the event group already has an event with the same
-                 * context ID in it (collision). */
-                GuestWaitEvents eventGroup = mWaitEventGroups[(*itEvents)]; /** @todo r=bird: Why copy it? */
-                if (eventGroup.find(idContext) == eventGroup.end())
-                {
-                    /* No, insert. */
-                    mWaitEventGroups[(*itEvents)].insert(std::pair<uint32_t, GuestWaitEvent *>(idContext, pEvent));
-                }
-                else
-                {
-                    rc = VERR_ALREADY_EXISTS;
-                    break;
-                }
-            }
-
-            if (RT_SUCCESS(rc))
-            {
-                /* Register event in regular event list. */
-                if (mWaitEvents.find(idContext) == mWaitEvents.end())
-                {
-                    mWaitEvents[idContext] = pEvent;
-                }
-                else
-                    rc  = VERR_ALREADY_EXISTS;
-            }
-
-            if (RT_SUCCESS(rc))
-                *ppEvent = pEvent;
-        }
-        catch(std::bad_alloc &)
-        {
-            rc = VERR_NO_MEMORY;
-        }
-
-        int rc2 = RTCritSectLeave(&mWaitEventCritSect);
-        if (RT_SUCCESS(rc))
-            rc = rc2;
-    }
-    return rc;
-
-#else /** @todo r=bird: Version with proper exception handling, no leaks and limited duplicate CID handling:  */
-
-    GuestWaitEvent *pEvent = new GuestWaitEvent(idContext, lstEvents);
-    AssertReturn(pEvent, VERR_NO_MEMORY);
+    GuestWaitEvent *pEvent = new GuestWaitEvent();
+    AssertPtrReturn(pEvent, VERR_NO_MEMORY);
+
+    rc = pEvent->Init(idContext, lstEvents);
+    AssertRCReturn(rc, rc);
+
     LogFlowThisFunc(("New event=%p, CID=%RU32\n", pEvent, idContext));
 
@@ -1055 +1001 @@
             {
                 Assert(cInserts > 0);
-                NOREF(cInserts);
+                RT_NOREF(cInserts);
 
                 /*
@@ -1080 +1026 @@
     delete pEvent;
     return rc;
-#endif
 }
 
@@ -1528 +1473 @@
 }
 
-GuestWaitEvent::GuestWaitEvent(uint32_t uCID,
-                               const GuestEventTypes &lstEvents)
-{
-    int rc2 = Init(uCID);
-    AssertRC(rc2); /** @todo Throw exception here. */ /** @todo r=bird: add+use Init() instead. Will cause weird VERR_CANCELLED errors in GuestBase::signalWaitEvent. */
-
-    mEventTypes = lstEvents;
-}
-
-GuestWaitEvent::GuestWaitEvent(uint32_t uCID)
-{
-    int rc2 = Init(uCID);
-    AssertRC(rc2); /** @todo Throw exception here. */ /** @todo r=bird: add+use Init() instead. Will cause weird VERR_CANCELLED errors in GuestBase::signalWaitEvent. */
+GuestWaitEvent::GuestWaitEvent(void)
+{
 }
 
@@ -1562 +1496 @@
 }
 
+/**
+ * Initializes a wait event with a given context ID (CID).
+ *
+ * @returns IPRT status code.
+ * @param   uCID                Context ID to initialize wait event with.
+ */
 int GuestWaitEvent::Init(uint32_t uCID)
 {
     return GuestWaitEventBase::Init(uCID);
+}
+
+/**
+ * Initializes a wait event with a given context ID (CID) and a list of event types to wait for.
+ *
+ * @returns IPRT status code.
+ * @param   uCID                Context ID to initialize wait event with.
+ * @param   lstEvent            List of event types to wait for this wait event to get signalled.
+ */
+int GuestWaitEvent::Init(uint32_t uCID, const GuestEventTypes &lstEvents)
+{
+    int rc = GuestWaitEventBase::Init(uCID);
+    if (RT_SUCCESS(rc))
+    {
+        mEventTypes = lstEvents;
+    }
+
+    return rc;
 }