Changeset 63183 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Aug 8, 2016 4:37:26 PM (8 years ago)

Author:

vboxsync

Message:

ThreadTask: Dealt with totally misguided m_pThread member. Started cleaning up handler() methods.

Location:

trunk/src/VBox/Main/src-client

Files:

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

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

@@ -86 +86 @@
     void handler()
     {
-        int vrc = GuestDnDSource::i_receiveDataThread(*m_pThread, this);
+        GuestDnDSource::i_receiveDataThreadTask(this);
     }
 
@@ -962 +962 @@
 #endif /* VBOX_WITH_DRAG_AND_DROP_GH */
 
+/**
+ * @returns VBox status code that the caller ignores. Not sure if that's
+ *          intentional or not.
+ */
 int GuestDnDSource::i_receiveData(PRECVDATACTX pCtx, RTMSINTERVAL msTimeout)
 {
@@ -1062 +1066 @@
 
 /* static */
-DECLCALLBACK(int) GuestDnDSource::i_receiveDataThread(RTTHREAD Thread, void *pvUser)
-{
-    LogFlowFunc(("pvUser=%p\n", pvUser));
-
-    RecvDataTask *pTask = (RecvDataTask *)pvUser;
-    AssertPtrReturn(pTask, VERR_INVALID_POINTER);
+DECLCALLBACK(void) GuestDnDSource::i_receiveDataThreadTask(RecvDataTask *pTask)
+{
+    LogFlowFunc(("pTask=%p\n", pTask));
+    AssertPtrReturnVoid(pTask);
 
     const ComObjPtr<GuestDnDSource> pThis(pTask->getSource());
@@ -1073 +1075 @@
 
     AutoCaller autoCaller(pThis);
-    if (FAILED(autoCaller.rc())) return VERR_COM_INVALID_OBJECT_STATE;
-
-    int rc = RTThreadUserSignal(Thread);
-    AssertRC(rc);
-
-    rc = pThis->i_receiveData(pTask->getCtx(), RT_INDEFINITE_WAIT /* msTimeout */);
+    if (FAILED(autoCaller.rc()))
+        return;
+
+    int vrc = RTThreadUserSignal(RTThreadSelf());
+    AssertRC(vrc);
+
+    vrc = pThis->i_receiveData(pTask->getCtx(), RT_INDEFINITE_WAIT /* msTimeout */);
+/** @todo
+ *
+ *  r=bird: What happens with @a vrc?
+ *
+ */
 
     AutoWriteLock alock(pThis COMMA_LOCKVAL_SRC_POS);
@@ -1085 +1093 @@
     pThis->mDataBase.m_cTransfersPending--;
 
-    LogFlowFunc(("pSource=%p returning rc=%Rrc\n", (GuestDnDSource *)pThis, rc));
-    return rc;
+    LogFlowFunc(("pSource=%p vrc=%Rrc (ignored)\n", (GuestDnDSource *)pThis, vrc));
 }
 

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

@@ -90 +90 @@
     void handler()
     {
-        int vrc = GuestDnDTarget::i_sendDataThread(*m_pThread, this);
-        NOREF(vrc);
+        GuestDnDTarget::i_sendDataThreadTask(this);
     }
 
@@ -558 +557 @@
 
 /* static */
-DECLCALLBACK(int) GuestDnDTarget::i_sendDataThread(RTTHREAD Thread, void *pvUser)
-{
-    LogFlowFunc(("pvUser=%p\n", pvUser));
-
-    SendDataTask *pTask = (SendDataTask *)pvUser;
-    AssertPtrReturn(pTask, VERR_INVALID_POINTER);
+void GuestDnDTarget::i_sendDataThreadTask(SendDataTask *pTask)
+{
+    LogFlowFunc(("pTask=%p\n", pTask));
+
+    AssertPtrReturnVoid(pTask);
 
     const ComObjPtr<GuestDnDTarget> pThis(pTask->getTarget());
@@ -569 +567 @@
 
     AutoCaller autoCaller(pThis);
-    if (FAILED(autoCaller.rc())) return VERR_COM_INVALID_OBJECT_STATE;
-
-    int rc = RTThreadUserSignal(Thread);
-    AssertRC(rc);
-
-    rc = pThis->i_sendData(pTask->getCtx(), RT_INDEFINITE_WAIT /* msTimeout */);
+    if (FAILED(autoCaller.rc()))
+        return;
+
+    int vrc = RTThreadUserSignal(RTThreadSelf());
+    AssertRC(vrc);
+
+    vrc = pThis->i_sendData(pTask->getCtx(), RT_INDEFINITE_WAIT /* msTimeout */);
+/** @todo
+ *
+ *  r=bird: What happens with @a vrc?
+ *
+ */
 
     AutoWriteLock alock(pThis COMMA_LOCKVAL_SRC_POS);
@@ -581 +585 @@
     pThis->mDataBase.m_cTransfersPending--;
 
-    LogFlowFunc(("pTarget=%p returning rc=%Rrc\n", (GuestDnDTarget *)pThis, rc));
-    return rc;
+    LogFlowFunc(("pTarget=%p vrc=%Rrc (ignored)\n", (GuestDnDTarget *)pThis, vrc));
 }
 
@@ -779 +782 @@
 }
 
+/**
+ * @returns VBox status code that the caller ignores. Not sure if that's
+ *          intentional or not.
+ */
 int GuestDnDTarget::i_sendData(PSENDDATACTX pCtx, RTMSINTERVAL msTimeout)
 {