Changeset 63183 in vbox for trunk/src/VBox/Main/include

Timestamp:

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

Author:

vboxsync

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

109802

Message:

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

Location:

trunk/src/VBox/Main/include

Files:

• GuestDnDSourceImpl.h (modified) (2 diffs)
• GuestDnDTargetImpl.h (modified) (2 diffs)
• ThreadTask.h (modified) (3 diffs)

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

@@ -27 +27 @@
 #include "GuestDnDPrivate.h"
 
+class RecvDataTask;
 struct RECVDATACTX;
 typedef struct RECVDATACTX *PRECVDATACTX;
@@ -83 +84 @@
     static Utf8Str i_hostErrorToString(int hostRc);
 
-    /** @name Thread callbacks.
+    /** @name Thread task .
      * @{ */
-    static DECLCALLBACK(int) i_receiveDataThread(RTTHREAD Thread, void *pvUser);
+    static void i_receiveDataThreadTask(RecvDataTask *pTask);
     /** @}  */
 

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

@@ -27 +27 @@
 struct SENDDATACTX;
 typedef struct SENDDATACTX *PSENDDATACTX;
+class SendDataTask;
 
 class ATL_NO_VTABLE GuestDnDTarget :
@@ -71 +72 @@
     static Utf8Str i_hostErrorToString(int hostRc);
 
-    /** @name Thread callbacks.
+    /** @name Thread task workers.
      * @{ */
-    static DECLCALLBACK(int) i_sendDataThread(RTTHREAD Thread, void *pvUser);
+    static void i_sendDataThreadTask(SendDataTask *pTask);
     /** @}  */
 

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

@@ -20 +20 @@
 #include "VBox/com/string.h"
 
+/**
+ * The class ThreadVoidData is used as a base class for any data which we want to pass into a thread
+ */
 struct ThreadVoidData
 {
-/*
- * The class ThreadVoidData is used as a base class for any data which we want to pass into a thread
- */
 public:
-    ThreadVoidData(){};
-    virtual ~ThreadVoidData(){};
+    ThreadVoidData() { }
+    virtual ~ThreadVoidData() { }
 };
+
 
 class ThreadTask
 {
 public:
-    ThreadTask(const Utf8Str &t) : m_pThread(NULL), m_strTaskName(t)
-    { };
+    ThreadTask(const Utf8Str &t) : m_hThread(NIL_RTTHREAD), m_strTaskName(t)
+    { }
 
     virtual ~ThreadTask()
-    { };
+    { }
 
     HRESULT createThread(void);
@@ -44 +45 @@
 
     virtual void handler() = 0;
-    inline Utf8Str getTaskName() const {return m_strTaskName;};
+    inline Utf8Str getTaskName() const { return m_strTaskName; }
 
 protected:
@@ -50 +51 @@
     static DECLCALLBACK(int) taskHandlerThreadProc(RTTHREAD thread, void *pvUser);
 
-    ThreadTask():m_pThread(NULL), m_strTaskName("GenericTask"){};
+    ThreadTask() : m_hThread(NIL_RTTHREAD), m_strTaskName("GenericTask")
+    { }
 
-    PRTTHREAD m_pThread;
+    /** The worker thread handle (may be invalid if the thread has shut down). */
+    RTTHREAD m_hThread;
     Utf8Str m_strTaskName;
 };