Changeset 63471 in vbox for trunk

Timestamp:

Aug 15, 2016 12:23:46 PM (9 years ago)

Author:

vboxsync

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

110121

Message:

DnD/Main: Resolved worker thread @todos.

Location:

trunk/src/VBox/Main/src-client

Files:

• GuestDnDSourceImpl.cpp (modified) (5 diffs)
• GuestDnDTargetImpl.cpp (modified) (4 diffs)

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

@@ -358 +358 @@
 
     RecvDataTask *pTask = NULL;
-    RTTHREAD hThreadRcv;
-    int rc = S_OK;
 
     try
@@ -381 +379 @@
         /* This function delete pTask in case of exceptions,
          * so there is no need in the call of delete operator. */
-/** @todo r=bird: The code using hThreadRcv is racing the thread termination. Since the thread isn't
- * created waitable, the handle goes away if we it terminates before our RTThreadUserWait call returns. */
-        hr = pTask->createThreadWithRaceCondition(&hThreadRcv);
+        hr = pTask->createThreadWithType(RTTHREADTYPE_MAIN_WORKER);
 
     }
@@ -389 +385 @@
     {
         hr = setError(E_OUTOFMEMORY);
-        hThreadRcv = NIL_RTTHREAD;
     }
     catch (...)
     {
-        LogRel2(("DnD: Could not create thread for RecvDataTask \n"));
+        LogRel2(("DnD: Could not create thread for data receiving task\n"));
         hr = E_FAIL;
-        hThreadRcv = NIL_RTTHREAD;
     }
 
     if (SUCCEEDED(hr))
     {
-        rc = RTThreadUserWait(hThreadRcv, 30 * 1000 /* 30s timeout */);
-        if (RT_SUCCESS(rc))
-        {
-            mDataBase.m_cTransfersPending++;
-
-            hr = pResp->queryProgressTo(aProgress.asOutParam());
-            ComAssertComRC(hr);
-
-            /* Note: pTask is now owned by the worker thread. */
-        }
-        else
-            hr = setError(VBOX_E_IPRT_ERROR, tr("Waiting for receiving thread failed (%Rrc)"), rc);
+        mDataBase.m_cTransfersPending++;
+
+        hr = pResp->queryProgressTo(aProgress.asOutParam());
+        ComAssertComRC(hr);
+
+        /* Note: pTask is now owned by the worker thread. */
     }
     else
-        hr = setError(VBOX_E_IPRT_ERROR, tr("Starting thread for GuestDnDSource::i_receiveDataThread failed (%Rrc)"), rc);
+        hr = setError(VBOX_E_IPRT_ERROR, tr("Starting thread for GuestDnDSource::i_receiveDataThread failed (%Rhrc)"), hr);
     /* Note: mDataBase.mfTransferIsPending will be set to false again by i_receiveDataThread. */
 
@@ -1079 +1067 @@
         return;
 
-    int vrc = RTThreadUserSignal(RTThreadSelf());
-    AssertRC(vrc);
-
-    vrc = pThis->i_receiveData(pTask->getCtx(), RT_INDEFINITE_WAIT /* msTimeout */);
+    int vrc = pThis->i_receiveData(pTask->getCtx(), RT_INDEFINITE_WAIT /* msTimeout */);
 /** @todo
  *
@@ -1092 +1077 @@
 
     Assert(pThis->mDataBase.m_cTransfersPending);
-    pThis->mDataBase.m_cTransfersPending--;
+    if (pThis->mDataBase.m_cTransfersPending)
+        pThis->mDataBase.m_cTransfersPending--;
 
     LogFlowFunc(("pSource=%p vrc=%Rrc (ignored)\n", (GuestDnDSource *)pThis, vrc));

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

@@ -584 +584 @@
 
     Assert(pThis->mDataBase.m_cTransfersPending);
-    pThis->mDataBase.m_cTransfersPending--;
+    if (pThis->mDataBase.m_cTransfersPending)
+        pThis->mDataBase.m_cTransfersPending--;
 
     LogFlowFunc(("pTarget=%p vrc=%Rrc (ignored)\n", (GuestDnDTarget *)pThis, vrc));
@@ -631 +632 @@
     SendDataTask *pTask = NULL;
     PSENDDATACTX pSendCtx = NULL;
-    RTTHREAD rcThreadSend;
-    int rc = S_OK;
 
     try
@@ -655 +654 @@
         }
 
-        //this function delete pTask in case of exceptions, so there is no need in the call of delete operator
-        //pSendCtx is deleted in the pTask destructor
-/** @todo r=bird: The code using hThreadSend is racing the thread termination. Since the thread isn't
- * created waitable, the handle goes away if we it terminates before our RTThreadUserWait call returns. */
-        hr = pTask->createThreadWithRaceCondition(&rcThreadSend);
+        /* This function delete pTask in case of exceptions,
+         * so there is no need in the call of delete operator. */
+        hr = pTask->createThreadWithType(RTTHREADTYPE_MAIN_WORKER);
 
     }
@@ -665 +662 @@
     {
         hr = setError(E_OUTOFMEMORY);
-        rcThreadSend = NIL_RTTHREAD;
     }
     catch (...)
     {
-        LogRel2(("DnD: Could not create thread for SendDataTask \n"));
+        LogRel2(("DnD: Could not create thread for data sending task\n"));
         hr = E_FAIL;
-        rcThreadSend = NIL_RTTHREAD;
     }
 
     if (SUCCEEDED(hr))
     {
-        rc = RTThreadUserWait(rcThreadSend, 30 * 1000 /* 30s timeout */);
-        if (RT_SUCCESS(rc))
-        {
-            mDataBase.m_cTransfersPending++;
-
-            hr = pResp->queryProgressTo(aProgress.asOutParam());
-            ComAssertComRC(hr);
-
-            /* Note: pTask is now owned by the worker thread. */
-        }
-        else
-            hr = setError(VBOX_E_IPRT_ERROR, tr("Waiting for sending thread failed (%Rrc)"), rc);
+        mDataBase.m_cTransfersPending++;
+
+        hr = pResp->queryProgressTo(aProgress.asOutParam());
+        ComAssertComRC(hr);
+
+        /* Note: pTask is now owned by the worker thread. */
     }
     else
-        hr = setError(VBOX_E_IPRT_ERROR, tr("Starting thread for GuestDnDTarget::i_sendDataThread (%Rrc)"), rc);
+        hr = setError(VBOX_E_IPRT_ERROR, tr("Starting thread for GuestDnDTarget::i_sendDataThread (%Rhrc)"), hr);
 
     LogFlowFunc(("Returning hr=%Rhrc\n", hr));