Changeset 90546 in vbox

Timestamp:

Aug 6, 2021 1:17:21 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: UINetworkRequestManager: Reworking network-customer [un]registration management.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/networking

Files:

• UINetworkCustomer.cpp (modified) (1 diff)
• UINetworkCustomer.h (modified) (2 diffs)
• UINetworkRequestManager.cpp (modified) (7 diffs)
• UINetworkRequestManager.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/networking/UINetworkCustomer.cpp

@@ -27 +27 @@
 }
 
+UINetworkCustomer::~UINetworkCustomer()
+{
+    emit sigBeingDestroyed(this);
+}
+
 void UINetworkCustomer::createNetworkRequest(UINetworkRequestType enmType,
                                              const QList<QUrl> urls,

trunk/src/VBox/Frontends/VirtualBox/src/networking/UINetworkCustomer.h

@@ -38 +38 @@
     Q_OBJECT;
 
+signals:
+
+    /** Notifies listeners about @a pNetworkCustomer being destroyed. */
+    void sigBeingDestroyed(UINetworkCustomer *pNetworkCustomer);
+
 public:
 
@@ -43 +48 @@
       * @param  fForceCall  Brings whether this customer has forced privelegies. */
     UINetworkCustomer(QObject *pParent = 0, bool fForceCall = true);
+    /** Destructs network customer. */
+    virtual ~UINetworkCustomer() /* override */;
 
     /** Returns whether this customer has forced privelegies. */

trunk/src/VBox/Frontends/VirtualBox/src/networking/UINetworkRequestManager.cpp

@@ -79 +79 @@
         m_requests.insert(uId, pNetworkRequest);
         m_customers.insert(uId, pCustomer);
+        connect(pCustomer, &UINetworkCustomer::sigBeingDestroyed,
+                this, &UINetworkRequestManager::sltHandleNetworkCustomerBeingDestroyed,
+                Qt::UniqueConnection);
 
         /* Return ID: */
@@ -110 +113 @@
     /* Delegate request to customer: */
     UINetworkCustomer *pNetworkCustomer = m_customers.value(uId);
-    AssertPtrReturnVoid(pNetworkCustomer);
-    pNetworkCustomer->processNetworkReplyProgress(iReceived, iTotal);
+    if (pNetworkCustomer)
+        pNetworkCustomer->processNetworkReplyProgress(iReceived, iTotal);
 }
 
@@ -124 +127 @@
     /* Delegate request to customer: */
     UINetworkCustomer *pNetworkCustomer = m_customers.value(uId);
-    AssertPtrReturnVoid(pNetworkCustomer);
-    pNetworkCustomer->processNetworkReplyFailed(strError);
+    if (pNetworkCustomer)
+        pNetworkCustomer->processNetworkReplyFailed(strError);
 
     /* Cleanup request: */
@@ -141 +144 @@
     /* Delegate request to customer: */
     UINetworkCustomer *pNetworkCustomer = m_customers.value(uId);
-    AssertPtrReturnVoid(pNetworkCustomer);
-    pNetworkCustomer->processNetworkReplyCanceled(pNetworkRequest->reply());
+    if (pNetworkCustomer)
+        pNetworkCustomer->processNetworkReplyCanceled(pNetworkRequest->reply());
 
     /* Cleanup request: */
@@ -158 +161 @@
     /* Delegate request to customer: */
     UINetworkCustomer *pNetworkCustomer = m_customers.value(uId);
-    AssertPtrReturnVoid(pNetworkCustomer);
-    pNetworkCustomer->processNetworkReplyFinished(pNetworkRequest->reply());
+    if (pNetworkCustomer)
+        pNetworkCustomer->processNetworkReplyFinished(pNetworkRequest->reply());
 
     /* Cleanup request: */
@@ -165 +168 @@
 }
 
+void UINetworkRequestManager::sltHandleNetworkCustomerBeingDestroyed(UINetworkCustomer *pNetworkCustomer)
+{
+    /* Make sure customer was and still registered: */
+    const QList<QUuid> ids = m_customers.keys(pNetworkCustomer);
+    AssertReturnVoid(!ids.isEmpty());
+    /* Unregister it: */
+    foreach (const QUuid &uId, ids)
+        m_customers.remove(uId);
+}
+
 void UINetworkRequestManager::prepare()
 {
@@ -174 +187 @@
     delete m_requests.value(uId);
     m_requests.remove(uId);
-    m_customers.remove(uId);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/networking/UINetworkRequestManager.h

@@ -80 +80 @@
     void sltHandleNetworkRequestFinish();
 
+    /** Handles signal about @a pNetworkCustomer being destroyed. */
+    void sltHandleNetworkCustomerBeingDestroyed(UINetworkCustomer *pNetworkCustomer);
+
 private: