Changeset 58521 in vbox for trunk

Timestamp:

Oct 30, 2015 9:03:19 AM (9 years ago)

Author:

vboxsync

Message:

pr7179. GuestSession, GuestProcess, GuestControl classes have been modified.

Location:

trunk/src/VBox/Main

Files:

• include/GuestProcessImpl.h (modified) (2 diffs)
• include/GuestSessionImpl.h (modified) (8 diffs)
• src-client/GuestCtrlImpl.cpp (modified) (2 diffs)
• src-client/GuestProcessImpl.cpp (modified) (5 diffs)
• src-client/GuestSessionImpl.cpp (modified) (8 diffs)
• src-client/GuestSessionImplTasks.cpp (modified) (13 diffs)

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

@@ -167 +167 @@
         }
     } mData;
+
+    friend class GuestProcessStartTask;
 };
 
@@ -224 +226 @@
     GuestProcessStream          mStdOut;
     GuestProcessStream          mStdErr;
+
 };
 

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

@@ -27 +27 @@
 #include "GuestFileImpl.h"
 #include "GuestFsObjInfoImpl.h"
+#include "ThreadTask.h"
 
 #include <iprt/isofs.h> /* For UpdateAdditions. */
@@ -36 +37 @@
  * runs in a Main worker thread.
  */
-class GuestSessionTask
+class GuestSessionTask : public ThreadTask
 {
 public:
@@ -48 +49 @@
     virtual int Run(void) = 0;
     virtual int RunAsync(const Utf8Str &strDesc, ComObjPtr<Progress> &pProgress) = 0;
+
+    HRESULT Init(const Utf8Str &strTaskDesc)
+    {
+        HRESULT hr = S_OK;
+        setTaskDesc(strTaskDesc);
+        hr = createAndSetProgressObject();
+        return hr;
+    }
+
+    ComObjPtr<Progress> GetProgressObject() const;
 
 protected:
@@ -56 +67 @@
     int setProgressSuccess(void);
     HRESULT setProgressErrorMsg(HRESULT hr, const Utf8Str &strMsg);
-
+    inline void setTaskDesc(const Utf8Str &strTaskDesc) throw()
+    {
+        mDesc = strTaskDesc;
+    }
+
+    HRESULT createAndSetProgressObject();
 protected:
 
@@ -84 +100 @@
     int RunAsync(const Utf8Str &strDesc, ComObjPtr<Progress> &pProgress);
     static DECLCALLBACK(int) taskThread(RTTHREAD Thread, void *pvUser);
+    void handler()
+    {
+        int vrc = SessionTaskOpen::taskThread(NULL, this);
+    }
 
 protected:
@@ -114 +134 @@
     int RunAsync(const Utf8Str &strDesc, ComObjPtr<Progress> &pProgress);
     static DECLCALLBACK(int) taskThread(RTTHREAD Thread, void *pvUser);
+    void handler()
+    {
+        int vrc = SessionTaskCopyTo::taskThread(NULL, this);
+    }
 
 protected:
@@ -142 +166 @@
     int RunAsync(const Utf8Str &strDesc, ComObjPtr<Progress> &pProgress);
     static DECLCALLBACK(int) taskThread(RTTHREAD Thread, void *pvUser);
+    void handler()
+    {
+        int vrc = SessionTaskCopyFrom::taskThread(NULL, this);
+    }
 
 protected:
@@ -168 +196 @@
     int RunAsync(const Utf8Str &strDesc, ComObjPtr<Progress> &pProgress);
     static DECLCALLBACK(int) taskThread(RTTHREAD Thread, void *pvUser);
+    void handler()
+    {
+        int vrc = SessionTaskUpdateAdditions::taskThread(NULL, this);
+    }
 
 protected:

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

@@ -559 +559 @@
         else
         {
+
+            ComObjPtr<Progress> pProgress;
+            SessionTaskUpdateAdditions *pTask = NULL;
             try
             {
-                ComObjPtr<Progress> pProgress;
-                SessionTaskUpdateAdditions *pTask = new SessionTaskUpdateAdditions(pSession /* GuestSession */,
-                                                                                   aSource, aArgs, fFlags);
-                rc = pSession->i_startTaskAsync(tr("Updating Guest Additions"), pTask, pProgress);
-                if (RT_SUCCESS(rc))
+                try
+                {
+                    pTask = new SessionTaskUpdateAdditions(pSession /* GuestSession */, aSource, aArgs, fFlags);
+                }
+                catch(...)
+                {
+                    hr = setError(VBOX_E_IPRT_ERROR, tr("Failed to create SessionTaskUpdateAdditions object "));
+                    throw;
+                }
+
+
+                hr = pTask->Init(Utf8StrFmt(tr("Updating Guest Additions")));
+                if (FAILED(hr))
+                {
+                    delete pTask;
+                    hr = setError(VBOX_E_IPRT_ERROR,
+                                  tr("Creating progress object for SessionTaskUpdateAdditions object failed"));
+                    throw hr;
+                }
+
+                hr = pTask->createThread(NULL, RTTHREADTYPE_MAIN_HEAVY_WORKER);
+
+                if (SUCCEEDED(hr))
                 {
                     /* Return progress to the caller. */
+                    pProgress = pTask->GetProgressObject();
                     hr = pProgress.queryInterfaceTo(aProgress.asOutParam());
                 }
                 else
                     hr = setError(VBOX_E_IPRT_ERROR,
-                                  tr("Starting task for updating Guest Additions on the guest failed: %Rrc"), rc);
+                                  tr("Starting thread for updating Guest Additions on the guest failed "));
             }
             catch(std::bad_alloc &)
@@ -578 +600 @@
                 hr = E_OUTOFMEMORY;
             }
+            catch(HRESULT eHR)
+            {
+                LogFlowThisFunc(("Exception was caught in the function \n"));
+            }
         }
     }

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

@@ -41 +41 @@
 #include "AutoCaller.h"
 #include "VBoxEvents.h"
+#include "ThreadTask.h"
 
 #include <memory> /* For auto_ptr. */
@@ -59 +60 @@
 
 
-class GuestProcessTask
+class GuestProcessTask : public ThreadTask
 {
 public:
@@ -84 +85 @@
 
     GuestProcessStartTask(GuestProcess *pProcess)
-        : GuestProcessTask(pProcess) { }
+        : GuestProcessTask(pProcess)
+    {
+        m_strTaskName = "gctlPrcStart";
+    }
+
+    void handler()
+    {
+        int vrc = GuestProcess::i_startProcessThread(NULL, this);
+    }
 };
 
@@ -1128 +1137 @@
 
     int vrc;
-
+    HRESULT hr = S_OK;
+
+    GuestProcessStartTask* pTask = NULL;
     try
     {
-        /* Asynchronously start the process on the guest by kicking off a
-         * worker thread. */
-        std::auto_ptr<GuestProcessStartTask> pTask(new GuestProcessStartTask(this));
-        AssertReturn(pTask->i_isOk(), pTask->i_rc());
-
-        vrc = RTThreadCreate(NULL, GuestProcess::i_startProcessThread,
-                             (void *)pTask.get(), 0,
-                             RTTHREADTYPE_MAIN_WORKER, 0,
-                             "gctlPrcStart");
-        if (RT_SUCCESS(vrc))
-        {
-            /* pTask is now owned by startProcessThread(), so release it. */
-            pTask.release();
-        }
+        pTask = new GuestProcessStartTask(this);
+        if (!pTask->i_isOk())
+        {
+            delete pTask;
+            LogRel2(("GuestProcess: Could not create GuestProcessStartTask object \n"));
+            throw hr = E_FAIL;
+        }
+
+        //this function delete pTask in case of exceptions, so there is no need in the call of delete operator
+        hr = pTask->createThread();
     }
     catch(std::bad_alloc &)
     {
         vrc = VERR_NO_MEMORY;
+    }
+    catch(...)
+    {
+        LogRel2(("GuestProcess: Could not create thread for GuestProcessStartTask task \n"));
+        if (hr == E_FAIL)
+            vrc = VERR_NO_MEMORY;
     }
 
@@ -1160 +1173 @@
     LogFlowFunc(("pvUser=%p\n", pvUser));
 
-    std::auto_ptr<GuestProcessStartTask> pTask(static_cast<GuestProcessStartTask*>(pvUser));
-    AssertPtr(pTask.get());
+    GuestProcessStartTask* pTask = static_cast<GuestProcessStartTask*>(pvUser);
 
     const ComObjPtr<GuestProcess> pProcess(pTask->i_process());

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

@@ -33 +33 @@
 #include "VBoxEvents.h"
 #include "VMMDev.h"
+#include "ThreadTask.h"
 
 #include <memory> /* For auto_ptr. */
@@ -55 +56 @@
  * asynchronous session task.
  */
-class GuestSessionTaskInternal
+class GuestSessionTaskInternal : public ThreadTask
 {
 public:
 
     GuestSessionTaskInternal(GuestSession *pSession)
-        : mSession(pSession),
-          mRC(VINF_SUCCESS) { }
+        : ThreadTask("GenericGuestSessionTaskInternal")
+        , mSession(pSession)
+        , mRC(VINF_SUCCESS) { }
 
     virtual ~GuestSessionTaskInternal(void) { }
@@ -83 +85 @@
 
     GuestSessionTaskInternalOpen(GuestSession *pSession)
-        : GuestSessionTaskInternal(pSession) { }
+        : GuestSessionTaskInternal(pSession)
+    {
+        m_strTaskName = "gctlSesStart";
+    }
+
+    void handler()
+    {
+        int vrc = GuestSession::i_startSessionThread(NULL, this);
+    }
 };
 
@@ -1709 +1719 @@
     LogFlowThisFuncEnter();
 
+    HRESULT hr = S_OK;
     int vrc;
 
+    GuestSessionTaskInternalOpen* pTask = NULL;
     try
     {
+        pTask = new GuestSessionTaskInternalOpen(this);
+        if (!pTask->isOk())
+        {
+            delete pTask;
+            LogRel2(("GuestSession: Could not create GuestSessionTaskInternalOpen object \n"));
+            throw hr = E_FAIL;
+        }
+
         /* Asynchronously open the session on the guest by kicking off a
          * worker thread. */
-        std::auto_ptr<GuestSessionTaskInternalOpen> pTask(new GuestSessionTaskInternalOpen(this));
-        AssertReturn(pTask->isOk(), pTask->rc());
-
-        vrc = RTThreadCreate(NULL, GuestSession::i_startSessionThread,
-                             (void *)pTask.get(), 0,
-                             RTTHREADTYPE_MAIN_WORKER, 0,
-                             "gctlSesStart");
-        if (RT_SUCCESS(vrc))
-        {
-            /* pTask is now owned by openSessionThread(), so release it. */
-            pTask.release();
-        }
+        //this function delete pTask in case of exceptions, so there is no need in the call of delete operator
+        hr = pTask->createThread();
+
     }
     catch(std::bad_alloc &)
     {
         vrc = VERR_NO_MEMORY;
+    }
+    catch(...)
+    {
+        LogRel2(("GuestSession: Could not create thread for GuestSessionTaskInternalOpen task \n"));
+        if (hr == E_FAIL)
+            vrc = VERR_NO_MEMORY;
     }
 
@@ -1742 +1759 @@
     LogFlowFunc(("pvUser=%p\n", pvUser));
 
-    std::auto_ptr<GuestSessionTaskInternalOpen> pTask(static_cast<GuestSessionTaskInternalOpen*>(pvUser));
-    AssertPtr(pTask.get());
+
+    GuestSessionTaskInternalOpen* pTask = static_cast<GuestSessionTaskInternalOpen*>(pvUser);
+    AssertPtr(pTask);
 
     const ComObjPtr<GuestSession> pSession(pTask->Session());
@@ -2128 +2146 @@
     /* Initialize our worker task. */
     std::auto_ptr<GuestSessionTask> task(pTask);
-
     int rc = task->RunAsync(strTaskDesc, pProgress);
     if (RT_FAILURE(rc))
@@ -2459 +2476 @@
     try
     {
+        SessionTaskCopyFrom *pTask = NULL;
         ComObjPtr<Progress> pProgress;
-        SessionTaskCopyFrom *pTask = new SessionTaskCopyFrom(this /* GuestSession */,
-                                                             aSource, aDest, fFlags);
-        int rc = i_startTaskAsync(Utf8StrFmt(tr("Copying \"%s\" from guest to \"%s\" on the host"), aSource.c_str(),
-                                  aDest.c_str()), pTask, pProgress);
-        if (RT_SUCCESS(rc))
+        try
+        {
+            pTask = new SessionTaskCopyFrom(this /* GuestSession */, aSource, aDest, fFlags);
+        }
+        catch(...)
+        {
+            hr = setError(VBOX_E_IPRT_ERROR, tr("Failed to create SessionTaskCopyFrom object "));
+            throw;
+        }
+
+
+        hr = pTask->Init(Utf8StrFmt(tr("Copying \"%s\" from guest to \"%s\" on the host"), aSource.c_str(), aDest.c_str()));
+        if (FAILED(hr))
+        {
+            delete pTask;
+            hr = setError(VBOX_E_IPRT_ERROR,
+                          tr("Creating progress object for SessionTaskCopyFrom object failed"));
+            throw hr;
+        }
+
+        hr = pTask->createThread(NULL, RTTHREADTYPE_MAIN_HEAVY_WORKER);
+
+        if (SUCCEEDED(hr))
+        {
             /* Return progress to the caller. */
+            pProgress = pTask->GetProgressObject();
             hr = pProgress.queryInterfaceTo(aProgress.asOutParam());
+        }
         else
             hr = setError(VBOX_E_IPRT_ERROR,
-                          tr("Starting task for copying file \"%s\" from guest to \"%s\" on the host failed: %Rrc"), rc);
+                          tr("Starting thread for copying file \"%s\" from guest to \"%s\" on the host failed "),
+                          aSource.c_str(), aDest.c_str());
+
     }
     catch(std::bad_alloc &)
     {
         hr = E_OUTOFMEMORY;
+    }
+    catch(HRESULT eHR)
+    {
+        hr = eHR;
+        LogFlowThisFunc(("Exception was caught in the function \n"));
     }
 
@@ -2503 +2549 @@
     try
     {
+        SessionTaskCopyTo *pTask = NULL;
         ComObjPtr<Progress> pProgress;
-        SessionTaskCopyTo *pTask = new SessionTaskCopyTo(this /* GuestSession */,
-                                                         aSource, aDest, fFlags);
-        AssertPtrReturn(pTask, E_OUTOFMEMORY);
-        int rc = i_startTaskAsync(Utf8StrFmt(tr("Copying \"%s\" from host to \"%s\" on the guest"), aSource.c_str(),
-                                  aDest.c_str()), pTask, pProgress);
-        if (RT_SUCCESS(rc))
+        try
+        {
+            pTask = new SessionTaskCopyTo(this /* GuestSession */, aSource, aDest, fFlags);
+        }
+        catch(...)
+        {
+            hr = setError(VBOX_E_IPRT_ERROR, tr("Failed to create SessionTaskCopyTo object "));
+            throw;
+        }
+
+
+        hr = pTask->Init(Utf8StrFmt(tr("Copying \"%s\" from host to \"%s\" on the guest"), aSource.c_str(), aDest.c_str()));
+        if (FAILED(hr))
+        {
+            delete pTask;
+            hr = setError(VBOX_E_IPRT_ERROR,
+                          tr("Creating progress object for SessionTaskCopyTo object failed"));
+            throw hr;
+        }
+
+        hr = pTask->createThread(NULL, RTTHREADTYPE_MAIN_HEAVY_WORKER);
+
+        if (SUCCEEDED(hr))
         {
             /* Return progress to the caller. */
+            pProgress = pTask->GetProgressObject();
             hr = pProgress.queryInterfaceTo(aProgress.asOutParam());
         }
         else
             hr = setError(VBOX_E_IPRT_ERROR,
-                          tr("Starting task for copying file \"%s\" from host to \"%s\" on the guest failed: %Rrc"), rc);
+                          tr("Starting thread for copying file \"%s\" from guest to \"%s\" on the host failed "),
+                          aSource.c_str(), aDest.c_str());
     }
     catch(std::bad_alloc &)
     {
         hr = E_OUTOFMEMORY;
+    }
+    catch(HRESULT eHR)
+    {
+        hr = eHR;
+        LogFlowThisFunc(("Exception was caught in the function \n"));
     }
 

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

@@ -66 +66 @@
 /////////////////////////////////////////////////////////////////////////////
 
-GuestSessionTask::GuestSessionTask(GuestSession *pSession)
+GuestSessionTask::GuestSessionTask(GuestSession *pSession):ThreadTask("GenericGuestSessionTask")
 {
     mSession = pSession;
@@ -73 +73 @@
 GuestSessionTask::~GuestSessionTask(void)
 {
+}
+
+HRESULT GuestSessionTask::createAndSetProgressObject()
+{
+    LogFlowThisFunc(("Task Description = %s, pTask=%p\n", mDesc.c_str(), this));
+
+    ComObjPtr<Progress> pProgress;
+    HRESULT hr = S_OK;
+    /* Create the progress object. */
+    hr = pProgress.createObject();
+    if (FAILED(hr))
+        return VERR_COM_UNEXPECTED;
+
+    hr = pProgress->init(static_cast<IGuestSession*>(mSession),
+                         Bstr(mDesc).raw(),
+                         TRUE /* aCancelable */);
+    if (FAILED(hr))
+        return VERR_COM_UNEXPECTED;
+
+    mProgress = pProgress;
+
+    LogFlowFuncLeave();
+
+    return hr;
+}
+
+ComObjPtr<Progress> GuestSessionTask::GetProgressObject() const
+{
+    if(mProgress != NULL)
+        return mProgress;
+    else
+        return NULL;
 }
 
@@ -170 +202 @@
                                    mTimeoutMS(uTimeoutMS)
 {
-
+    m_strTaskName = "gctlSesOpen";
 }
 
@@ -212 +244 @@
 DECLCALLBACK(int) SessionTaskOpen::taskThread(RTTHREAD Thread, void *pvUser)
 {
-    std::auto_ptr<SessionTaskOpen> task(static_cast<SessionTaskOpen*>(pvUser));
-    AssertReturn(task.get(), VERR_GENERAL_FAILURE);
-
-    LogFlowFunc(("pTask=%p\n", task.get()));
+    SessionTaskOpen* task = static_cast<SessionTaskOpen*>(pvUser);
+    AssertReturn(task, VERR_GENERAL_FAILURE);
+
+    LogFlowFunc(("pTask=%p\n", task));
+
     return task->Run(NULL /* guestRc */);
 }
@@ -229 +262 @@
 {
     mCopyFileFlags = uFlags;
+    m_strTaskName = "gctlCpyTo";
 }
 
@@ -243 +277 @@
     mDest          = strDest;
     mCopyFileFlags = uFlags;
+    m_strTaskName = "gctlCpyTo";
 }
 
@@ -572 +607 @@
 DECLCALLBACK(int) SessionTaskCopyTo::taskThread(RTTHREAD Thread, void *pvUser)
 {
-    std::auto_ptr<SessionTaskCopyTo> task(static_cast<SessionTaskCopyTo*>(pvUser));
-    AssertReturn(task.get(), VERR_GENERAL_FAILURE);
-
-    LogFlowFunc(("pTask=%p\n", task.get()));
+    SessionTaskCopyTo* task = static_cast<SessionTaskCopyTo*>(pvUser);
+    AssertReturn(task, VERR_GENERAL_FAILURE);
+
+    LogFlowFunc(("pTask=%p\n", task));
+
     return task->Run();
 }
@@ -586 +622 @@
     mDest   = strDest;
     mFlags  = uFlags;
+    m_strTaskName = "gctlCpyFrom";
 }
 
@@ -844 +881 @@
 DECLCALLBACK(int) SessionTaskCopyFrom::taskThread(RTTHREAD Thread, void *pvUser)
 {
-    std::auto_ptr<SessionTaskCopyFrom> task(static_cast<SessionTaskCopyFrom*>(pvUser));
-    AssertReturn(task.get(), VERR_GENERAL_FAILURE);
-
-    LogFlowFunc(("pTask=%p\n", task.get()));
+    SessionTaskCopyFrom* task = static_cast<SessionTaskCopyFrom*>(pvUser);
+    AssertReturn(task, VERR_GENERAL_FAILURE);
+
+    LogFlowFunc(("pTask=%p\n", task));
+
     return task->Run();
 }
@@ -860 +898 @@
     mArguments = aArguments;
     mFlags  = uFlags;
+    m_strTaskName = "gctlUpGA";
 }
 
@@ -930 +969 @@
     rc = RTFileSeek(pISO->file, cbOffset, RTFILE_SEEK_BEGIN, NULL);
 
+    HRESULT hr = S_OK;
     /* Copy over the Guest Additions file to the guest. */
     if (RT_SUCCESS(rc))
@@ -938 +978 @@
         if (RT_SUCCESS(rc))
         {
-            SessionTaskCopyTo *pTask = new SessionTaskCopyTo(pSession /* GuestSession */,
-                                                             &pISO->file, cbOffset, cbSize,
-                                                             strFileDest, FileCopyFlag_None);
-            AssertPtrReturn(pTask, VERR_NO_MEMORY);
-
+            SessionTaskCopyTo *pTask = NULL;
             ComObjPtr<Progress> pProgressCopyTo;
-            rc = pSession->i_startTaskAsync(Utf8StrFmt(GuestSession::tr("Copying Guest Additions installer file \"%s\" to \"%s\" on guest"),
-                                                       mSource.c_str(), strFileDest.c_str()),
-                                                       pTask, pProgressCopyTo);
-            if (RT_SUCCESS(rc))
+            try
+            {
+                try
+                {
+                    pTask = new SessionTaskCopyTo(pSession /* GuestSession */,
+                                                  &pISO->file, cbOffset, cbSize,
+                                                  strFileDest, FileCopyFlag_None);
+                }
+                catch(...)
+                {
+                    hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR, 
+                                  GuestSession::tr("Failed to create SessionTaskCopyTo object "));
+                    throw;
+                }
+
+                hr = pTask->Init(Utf8StrFmt(GuestSession::tr("Copying Guest Additions installer file \"%s\" to \"%s\" on guest"),
+                                            mSource.c_str(), strFileDest.c_str()));
+                if (FAILED(hr))
+                {
+                    delete pTask;
+                    hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                  GuestSession::tr("Creating progress object for SessionTaskCopyTo object failed"));
+                    throw hr;
+                }
+
+                hr = pTask->createThread(NULL, RTTHREADTYPE_MAIN_HEAVY_WORKER);
+
+                if (SUCCEEDED(hr))
+                {
+                    /* Return progress to the caller. */
+                    pProgressCopyTo = pTask->GetProgressObject();
+                }
+                else
+                    hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR, 
+                                  GuestSession::tr("Starting thread for updating additions failed "));
+            }
+            catch(std::bad_alloc &)
+            {
+                hr = E_OUTOFMEMORY;
+            }
+            catch(HRESULT eHR)
+            {
+                hr = eHR;
+                LogFlowThisFunc(("Exception was caught in the function \n"));
+            }
+
+            if (SUCCEEDED(hr))
             {
                 BOOL fCanceled = FALSE;
-                HRESULT hr = pProgressCopyTo->WaitForCompletion(-1);
+                hr = pProgressCopyTo->WaitForCompletion(-1);
                 if (   SUCCEEDED(pProgressCopyTo->COMGETTER(Canceled)(&fCanceled))
                     && fCanceled)
@@ -1540 +1619 @@
 DECLCALLBACK(int) SessionTaskUpdateAdditions::taskThread(RTTHREAD Thread, void *pvUser)
 {
-    std::auto_ptr<SessionTaskUpdateAdditions> task(static_cast<SessionTaskUpdateAdditions*>(pvUser));
-    AssertReturn(task.get(), VERR_GENERAL_FAILURE);
-
-    LogFlowFunc(("pTask=%p\n", task.get()));
+    SessionTaskUpdateAdditions* task = static_cast<SessionTaskUpdateAdditions*>(pvUser);
+    AssertReturn(task, VERR_GENERAL_FAILURE);
+
+    LogFlowFunc(("pTask=%p\n", task));
+
     return task->Run();
 }