Changeset 57996 in vbox for trunk

Timestamp:

Oct 2, 2015 8:13:15 AM (9 years ago)

Author:

vboxsync

Message:

pr7179. First part. The tasks VMPowerDownTask, VMPowerUpTask, TaskOVF were changed

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (3 diffs)
• include/ApplianceImpl.h (modified) (1 diff)
• include/ApplianceImplPrivate.h (modified) (5 diffs)
• include/ConsoleImpl.h (modified) (2 diffs)
• src-client/ConsoleImpl.cpp (modified) (16 diffs)
• src-server/ApplianceImpl.cpp (modified) (5 diffs)
• src-server/ApplianceImplExport.cpp (modified) (3 diffs)
• src-server/ApplianceImplImport.cpp (modified) (2 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -359 +359 @@
         src-all/SharedFolderImpl.cpp \
         src-all/AutoCaller.cpp \
+        src-all/ThreadTask.cpp \
         src-all/VirtualBoxBase.cpp \
         src-all/VirtualBoxErrorInfoImpl.cpp \
@@ -737 +738 @@
         src-all/SharedFolderImpl.cpp \
         src-all/AutoCaller.cpp \
+        src-all/ThreadTask.cpp \
         src-all/VirtualBoxBase.cpp \
         src-all/VirtualBoxErrorInfoImpl.cpp \
@@ -857 +859 @@
         src-all/Global.cpp \
         src-all/AutoCaller.cpp \
+        src-all/ThreadTask.cpp \
         src-all/VirtualBoxBase.cpp \
         src-all/VirtualBoxErrorInfoImpl.cpp \

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

@@ -114 +114 @@
 
     struct ImportStack;
-    struct TaskOVF;
+    class TaskOVF;
     struct Data;            // opaque, defined in ApplianceImpl.cpp
     Data *m;

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

@@ -23 +23 @@
 #include "ovfreader.h"
 #include "SecretKeyStore.h"
+#include "ThreadTask.h"
 #include <map>
 #include <vector>
@@ -122 +123 @@
 };
 
-struct Appliance::TaskOVF
-{
+class Appliance::TaskOVF: public ThreadTask
+{
+public:
     enum TaskType
     {
@@ -135 +137 @@
             LocationInfo aLocInfo,
             ComObjPtr<Progress> &aProgress)
-      : pAppliance(aThat),
+      : ThreadTask("TaskOVF"),
+        pAppliance(aThat),
         taskType(aType),
         locInfo(aLocInfo),
@@ -141 +144 @@
         enFormat(ovf::OVFVersion_unknown),
         rc(S_OK)
-    {}
+    {
+        switch (taskType)
+        {
+            case TaskOVF::Read:     m_strTaskName = "ApplRead"; break;
+            case TaskOVF::Import:   m_strTaskName = "ApplImp"; break;
+            case TaskOVF::Write:    m_strTaskName = "ApplWrit"; break;
+            default:                m_strTaskName = "ApplTask"; break;
+        }
+    }
 
     static DECLCALLBACK(int) updateProgress(unsigned uPercent, void *pvUser);
-
-    HRESULT startThread();
 
     Appliance *pAppliance;
@@ -155 +164 @@
 
     HRESULT rc;
+
+    void handler()
+    {
+        int vrc = Appliance::i_taskThreadImportOrExport(NULL, this);
+    }
 };
 

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

@@ -563 +563 @@
     typedef std::map<Utf8Str, ComPtr<IMediumAttachment> > MediumAttachmentMap;
     typedef std::list <USBStorageDevice> USBStorageDeviceList;
+
+    static DECLCALLBACK(int)    i_powerUpThread(RTTHREAD Thread, void *pvUser);
+    static DECLCALLBACK(int)    i_powerDownThread(RTTHREAD Thread, void *pvUser);
 
 private:
@@ -739 +742 @@
     void                        i_detachAllUSBDevices(bool aDone);
 
-    static DECLCALLBACK(int)    i_powerUpThread(RTTHREAD Thread, void *pvUser);
-    static DECLCALLBACK(int)    i_powerDownThread(RTTHREAD Thread, void *pvUser);
 
     static DECLCALLBACK(int)    i_vmm2User_SaveState(PCVMM2USERMETHODS pThis, PUVM pUVM);

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

@@ -73 +73 @@
 #include "AutoCaller.h"
 #include "Logging.h"
+#include "ThreadTask.h"
 
 #include <VBox/com/array.h>
@@ -150 +151 @@
  * Console::addVMCaller() for more info.
  */
-struct VMTask
-{
+class VMTask: public ThreadTask
+{
+public:
     VMTask(Console *aConsole,
            Progress *aProgress,
            const ComPtr<IProgress> &aServerProgress,
            bool aUsesVMPtr)
-        : mConsole(aConsole),
+        : ThreadTask("GenericVMTask"),
+          mConsole(aConsole),
           mConsoleCaller(aConsole),
           mProgress(aProgress),
@@ -175 +178 @@
     }
 
-    ~VMTask()
+    virtual ~VMTask()
     {
         releaseVMCaller();
@@ -205 +208 @@
 
 
-struct VMPowerUpTask : public VMTask
-{
+class VMPowerUpTask : public VMTask
+{
+public:
     VMPowerUpTask(Console *aConsole,
                   Progress *aProgress)
@@ -215 +219 @@
           mTeleporterEnabled(FALSE),
           mEnmFaultToleranceState(FaultToleranceState_Inactive)
-    {}
+    {
+        m_strTaskName = "VMPwrUp";
+    }
 
     PFNCFGMCONSTRUCTOR mConfigConstructor;
@@ -227 +233 @@
     typedef std::list<ComPtr<IProgress> > ProgressList;
     ProgressList hardDiskProgresses;
+
+    void handler()
+    {
+        int vrc = Console::i_powerUpThread(NULL, this);
+    }
+
 };
 
-struct VMPowerDownTask : public VMTask
-{
+class VMPowerDownTask : public VMTask
+{
+public:
     VMPowerDownTask(Console *aConsole,
                     const ComPtr<IProgress> &aServerProgress)
         : VMTask(aConsole, NULL /* aProgress */, aServerProgress,
                  true /* aUsesVMPtr */)
-    {}
+    {
+        m_strTaskName = "VMPwrDwn";
+    }
+
+    void handler()
+    {
+        int vrc = Console::i_powerDownThread(NULL, this);
+    }
 };
 
@@ -2136 +2156 @@
         try
         {
-            /* Setup task object and thread to carry out the operation asynchronously.
-             * We are going to pass ownership of task pointer to another thread.
-             * So we are in charge of deletion this task pointer in case if RTThreadCreate 
-             * returns not successful result or in case of any exception 
-             */
-            
             task = new VMPowerDownTask(this, pProgress);
-            AssertBreakStmt(task->isOk(), rc = E_FAIL);
-            int vrc = RTThreadCreate(NULL, Console::i_powerDownThread,
-                                     (void *) task, 0,
-                                     RTTHREADTYPE_MAIN_WORKER, 0,
-                                     "VMPwrDwn");
-            if (RT_FAILURE(vrc))
+            if (!task->isOk())
             {
-                rc = setError(E_FAIL, "Could not create VMPowerDown thread (%Rrc)", vrc);
-                break;
+                throw E_FAIL;
             }
-            /* task is now owned by powerDownThread(), so release it */
-            //task.release();
-        }
-        catch(const std::exception &e)
-        {
-            rc = setError(E_FAIL, "Cought exception! Could not create VMPowerDown thread (%s)", e.what());
+        }
+        catch(...)
+        {
+            delete task;
+            rc = setError(E_FAIL, "Could not create VMPowerDownTask object \n");
             break;
         }
+
+        rc = task->createThread();
 
         /* pass the progress to the caller */
@@ -2169 +2178 @@
     if (FAILED(rc))
     {
-        if (task != NULL)
-        {
-            //we can delete this pointer because something
-            //was wrong and we hadn't passed pointer to another thread
-            LogFlowFunc(("Delete task VMPowerDownTask from Console::powerDown()\n"));
-            delete task;
-        }
         /* preserve existing error info */
         ErrorInfoKeeper eik;
@@ -6978 +6980 @@
 HRESULT Console::i_powerUp(IProgress **aProgress, bool aPaused)
 {
-
     LogFlowThisFuncEnter();
 
@@ -6995 +6996 @@
     LONG cOperations = 1;
     LONG ulTotalOperationsWeight = 1;
+    VMPowerUpTask* task = NULL;
 
     try
@@ -7112 +7114 @@
         /* Setup task object and thread to carry out the operation
          * asynchronously */
-        std::auto_ptr<VMPowerUpTask> task(new VMPowerUpTask(this, pPowerupProgress));
-        ComAssertComRCRetRC(task->rc());
+        try
+        {
+            task = new VMPowerUpTask(this, pPowerupProgress);
+            if (!task->isOk())
+            {
+                throw E_FAIL;
+            }
+        }
+        catch(...)
+        {
+            delete task;
+            rc = setError(E_FAIL, "Could not create VMPowerUpTask object \n");
+            throw rc;
+        }
 
         task->mConfigConstructor = i_configConstructor;
@@ -7371 +7385 @@
 #endif // 0
 
+        
         /* setup task object and thread to carry out the operation
          * asynchronously */
@@ -7378 +7393 @@
         }
 
-        int vrc = RTThreadCreate(NULL, Console::i_powerUpThread,
-                                 (void *)task.get(), 0,
-                                 RTTHREADTYPE_MAIN_WORKER, 0, "VMPwrUp");
-        if (RT_FAILURE(vrc))
-            throw setError(E_FAIL, "Could not create VMPowerUp thread (%Rrc)", vrc);
-
-        /* task is now owned by powerUpThread(), so release it */
-        task.release();
+        rc = task->createThread();
+
+        if (FAILED(rc))
+            throw rc;
 
         /* finally, set the state: no right to fail in this method afterwards
@@ -8252 +8263 @@
                     if (!task->isOk())
                     {
-                        LogFlowFunc(("Console is already being uninitialized.\n"));
-                    }
-                    else
-                    {
-                        /*
-                         * We are going to pass ownership of task pointer to another thread.
-                         * So we are in charge of deletion this task pointer in case if RTThreadCreate
-                         * returns not successful result or in case of any exception
-                         */
-                        int vrc = RTThreadCreate(NULL, Console::i_powerDownThread,
-                                                 (void *) task, 0,
-                                                 RTTHREADTYPE_MAIN_WORKER, 0,
-                                                 "VMPwrDwn");
-                        if (RT_FAILURE(vrc))
-                        {
-                            rc = E_FAIL;
-                            LogFlowFunc(("Could not create VMPowerDown thread (%Rrc)\n", vrc));
-                        }
+                        LogFlowFunc(("Console is already being uninitialized. \n"));
+                        throw E_FAIL;
                     }
                 }
-                catch(const std::exception &e)
+                catch(...)
                 {
-                    rc = E_FAIL;
-                    LogFlowFunc(("Cought exception! Could not create VMPowerDown thread (%s)\n", e.what()));
+                    delete task;
+                    LogFlowFunc(("Problem with creating VMPowerDownTask object. \n"));
                 }
 
-                if(FAILED(rc) || !task->isOk())
+                rc = task->createThread();
+
+                if (FAILED(rc))
                 {
-                    LogFlowFunc(("Delete task VMPowerDownTask from Console::i_vmstateChangeCallback()\n"));
-                    delete task;
+                    LogFlowFunc(("Problem with creating thread for VMPowerDownTask. \n"));
                 }
+
             }
             break;
@@ -9440 +9437 @@
     LogFlowFuncEnter();
 
-    std::auto_ptr<VMPowerUpTask> task(static_cast<VMPowerUpTask *>(pvUser));
-    AssertReturn(task.get(), VERR_INVALID_PARAMETER);
+    VMPowerUpTask* task = static_cast<VMPowerUpTask *>(pvUser);
+    AssertReturn(task, VERR_INVALID_PARAMETER);
 
     AssertReturn(!task->mConsole.isNull(), VERR_INVALID_PARAMETER);
@@ -10006 +10003 @@
     }
 
-    LogFlowFunc(("Delete task VMPowerDownTask from Console::i_powerDownThread()\n"));
-    delete task;
     LogFlowFuncLeave();
     return rc;
 }
-
 
 /**

trunk/src/VBox/Main/src-server/ApplianceImpl.cpp

@@ -1185 +1185 @@
 
 /**
- * Starts the worker thread for the task.
- *
- * @return COM status code.
- */
-HRESULT Appliance::TaskOVF::startThread()
-{
-    /* Pick a thread name suitable for logging (<= 8 chars). */
-    const char *pszTaskNm;
-    switch (taskType)
-    {
-        case TaskOVF::Read:     pszTaskNm = "ApplRead"; break;
-        case TaskOVF::Import:   pszTaskNm = "ApplImp"; break;
-        case TaskOVF::Write:    pszTaskNm = "ApplWrit"; break;
-        default:                pszTaskNm = "ApplTask"; break;
-    }
-
-    int vrc = RTThreadCreate(NULL, Appliance::i_taskThreadImportOrExport, this,
-                             0, RTTHREADTYPE_MAIN_HEAVY_WORKER, 0, pszTaskNm);
-    if (RT_SUCCESS(vrc))
-        return S_OK;
-    return Appliance::i_setErrorStatic(E_FAIL, Utf8StrFmt("Could not create OVF task thread (%Rrc)\n", vrc));
-}
-
-/**
  * Thread function for the thread started in Appliance::readImpl() and Appliance::importImpl()
  * and Appliance::writeImpl().
@@ -1220 +1196 @@
 DECLCALLBACK(int) Appliance::i_taskThreadImportOrExport(RTTHREAD /* aThread */, void *pvUser)
 {
-    std::auto_ptr<TaskOVF> task(static_cast<TaskOVF*>(pvUser));
-    AssertReturn(task.get(), VERR_GENERAL_FAILURE);
+    TaskOVF* task = static_cast<TaskOVF*>(pvUser);
+    AssertReturn(task, VERR_GENERAL_FAILURE);
 
     Appliance *pAppliance = task->pAppliance;
@@ -1234 +1210 @@
         case TaskOVF::Read:
             if (task->locInfo.storageType == VFSType_File)
-                taskrc = pAppliance->i_readFS(task.get());
+                taskrc = pAppliance->i_readFS(task);
             else if (task->locInfo.storageType == VFSType_S3)
 #ifdef VBOX_WITH_S3
-                taskrc = pAppliance->i_readS3(task.get());
+                taskrc = pAppliance->i_readS3(task);
 #else
                 taskrc = VERR_NOT_IMPLEMENTED;
@@ -1245 +1221 @@
         case TaskOVF::Import:
             if (task->locInfo.storageType == VFSType_File)
-                taskrc = pAppliance->i_importFS(task.get());
+                taskrc = pAppliance->i_importFS(task);
             else if (task->locInfo.storageType == VFSType_S3)
 #ifdef VBOX_WITH_S3
-                taskrc = pAppliance->i_importS3(task.get());
+                taskrc = pAppliance->i_importS3(task);
 #else
                 taskrc = VERR_NOT_IMPLEMENTED;
@@ -1256 +1232 @@
         case TaskOVF::Write:
             if (task->locInfo.storageType == VFSType_File)
-                taskrc = pAppliance->i_writeFS(task.get());
+                taskrc = pAppliance->i_writeFS(task);
             else if (task->locInfo.storageType == VFSType_S3)
 #ifdef VBOX_WITH_S3
-                taskrc = pAppliance->i_writeS3(task.get());
+                taskrc = pAppliance->i_writeS3(task);
 #else
                 taskrc = VERR_NOT_IMPLEMENTED;

trunk/src/VBox/Main/src-server/ApplianceImplExport.cpp

@@ -28 +28 @@
 #include "ApplianceImpl.h"
 #include "VirtualBoxImpl.h"
-
 #include "ProgressImpl.h"
 #include "MachineImpl.h"
@@ -754 +753 @@
 
         /* Initialize our worker task */
-        std::auto_ptr<TaskOVF> task(new TaskOVF(this, TaskOVF::Write, aLocInfo, aProgress));
+        TaskOVF* task = NULL;
+        try
+        {
+            task = new TaskOVF(this, TaskOVF::Write, aLocInfo, aProgress);
+        }
+        catch(...)
+        {
+            delete task;
+            throw rc = setError(VBOX_E_OBJECT_NOT_FOUND, 
+                                tr("Could not create TaskOVF object for for writing out the OVF to disk"));
+        }
+
         /* The OVF version to write */
         task->enFormat = aFormat;
 
-        rc = task->startThread();
+        rc = task->createThread();
         if (FAILED(rc)) throw rc;
 
-        /* Don't destruct on success */
-        task.release();
     }
     catch (HRESULT aRC)
@@ -1251 +1259 @@
     pelmSystem->createChild("vssd:VirtualSystemIdentifier")->addContent(strVMName);
     // <vssd:VirtualSystemType>vmx-4</vssd:VirtualSystemType>
-    const char *pcszHardware = "virtualbox-2.2";
+    const char *pcszHardware = "virtualbox";
     if (enFormat == ovf::OVFVersion_0_9)
         // pretend to be vmware compatible then

trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp

@@ -874 +874 @@
 
     /* Initialize our worker task */
-    std::auto_ptr<TaskOVF> task(new TaskOVF(this, TaskOVF::Read, aLocInfo, aProgress));
-
-    rc = task->startThread();
+    TaskOVF* task = NULL;
+    try
+    {
+        task = new TaskOVF(this, TaskOVF::Read, aLocInfo, aProgress);
+    }
+    catch(...)
+    {
+        delete task;
+        throw rc = setError(VBOX_E_OBJECT_NOT_FOUND, 
+                            tr("Could not create TaskOVF object for reading the OVF from disk"));
+    }
+
+    rc = task->createThread();
     if (FAILED(rc)) throw rc;
-
-    /* Don't destruct on success */
-    task.release();
 
     return rc;
@@ -1371 +1378 @@
 
     /* Initialize our worker task */
-    std::auto_ptr<TaskOVF> task(new TaskOVF(this, TaskOVF::Import, locInfo, progress));
-
-    rc = task->startThread();
+    TaskOVF* task = NULL;
+    try
+    {
+        task = new TaskOVF(this, TaskOVF::Import, locInfo, progress);
+    }
+    catch(...)
+    {
+        delete task;
+        throw rc = setError(VBOX_E_OBJECT_NOT_FOUND, 
+                            tr("Could not create TaskOVF object for importing OVF data into VirtualBox"));
+    }
+
+    rc = task->createThread();
     if (FAILED(rc)) throw rc;
-
-    /* Don't destruct on success */
-    task.release();
 
     return rc;