Changeset 58552 in vbox

Timestamp:

Nov 3, 2015 2:55:58 PM (9 years ago)

Author:

vboxsync

Message:

pr7179. Fixes and improvement in the classes GuestSessionTask, GuestSession, GuestProcess, ThreadTask

Location:

trunk/src/VBox/Main

Files:

• include/GuestSessionImpl.h (modified) (1 diff)
• include/ThreadTask.h (modified) (1 diff)
• src-client/GuestProcessImpl.cpp (modified) (4 diffs)
• src-client/GuestSessionImpl.cpp (modified) (3 diffs)
• src-client/GuestSessionImplTasks.cpp (modified) (1 diff)

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

@@ -58 +58 @@
     }
 
-    ComObjPtr<Progress> GetProgressObject() const;
+    const ComObjPtr<Progress>& GetProgressObject() const {return mProgress;}
 
 protected:

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

@@ -40 +40 @@
 
 protected:
-    ThreadTask():m_strTaskName("GenericTask"){};
+    ThreadTask():m_pThread(NULL), m_strTaskName("GenericTask"){};
     PRTTHREAD m_pThread;
     Utf8Str m_strTaskName;

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

@@ -65 +65 @@
 
     GuestProcessTask(GuestProcess *pProcess)
-        : mProcess(pProcess),
-          mRC(VINF_SUCCESS) { }
+        : ThreadTask("GenericGuestProcessTask")
+        , mProcess(pProcess)
+        , mRC(VINF_SUCCESS) { }
 
     virtual ~GuestProcessTask(void) { }
@@ -1136 +1137 @@
     LogFlowThisFuncEnter();
 
-    int vrc;
+    int vrc = VINF_SUCCESS;
     HRESULT hr = S_OK;
 
@@ -1146 +1147 @@
         {
             delete pTask;
-            LogRel2(("GuestProcess: Could not create GuestProcessStartTask object \n"));
-            throw hr = E_FAIL;
-        }
-
+            LogFlow(("GuestProcess: Could not create GuestProcessStartTask object \n"));
+            throw VERR_MEMOBJ_INIT_FAILED;
+        }
+        LogFlow(("GuestProcess: Successfully created GuestProcessStartTask object \n"));
         //this function delete pTask in case of exceptions, so there is no need in the call of delete operator
         hr = pTask->createThread();
@@ -1157 +1158 @@
         vrc = VERR_NO_MEMORY;
     }
-    catch(...)
-    {
-        LogRel2(("GuestProcess: Could not create thread for GuestProcessStartTask task \n"));
-        if (hr == E_FAIL)
-            vrc = VERR_NO_MEMORY;
+    catch(int eVRC)
+    {
+        vrc = eVRC;
+        LogFlow(("GuestSession: Could not create thread for GuestProcessStartTask task %Rrc\n", vrc));
     }
 

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

@@ -1720 +1720 @@
 
     HRESULT hr = S_OK;
-    int vrc;
+    int vrc = VINF_SUCCESS;
 
     GuestSessionTaskInternalOpen* pTask = NULL;
@@ -1729 +1729 @@
         {
             delete pTask;
-            LogRel2(("GuestSession: Could not create GuestSessionTaskInternalOpen object \n"));
-            throw hr = E_FAIL;
+            LogFlow(("GuestSession: Could not create GuestSessionTaskInternalOpen object \n"));
+            throw VERR_MEMOBJ_INIT_FAILED;
         }
 
@@ -1743 +1743 @@
         vrc = VERR_NO_MEMORY;
     }
-    catch(...)
-    {
-        LogRel2(("GuestSession: Could not create thread for GuestSessionTaskInternalOpen task \n"));
-        if (hr == E_FAIL)
-            vrc = VERR_NO_MEMORY;
+    catch(int eVRC)
+    {
+        vrc = eVRC;
+        LogFlow(("GuestSession: Could not create thread for GuestSessionTaskInternalOpen task %Rrc\n", vrc));
     }
 

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

@@ -97 +97 @@
 
     return hr;
-}
-
-ComObjPtr<Progress> GuestSessionTask::GetProgressObject() const
-{
-    if(mProgress != NULL)
-        return mProgress;
-    else
-        return NULL;
 }