Changeset 58005 in vbox

Timestamp:

Oct 2, 2015 10:44:29 AM (9 years ago)

Author:

vboxsync

Message:

pr7179. Part related to Appliance class and TaskOVF tasks like import, export, reading.

Location:

trunk/src/VBox/Main

Files:

• include/ApplianceImpl.h (modified) (1 diff)
• include/ApplianceImplPrivate.h (modified) (5 diffs)
• src-server/ApplianceImpl.cpp (modified) (5 diffs)
• src-server/ApplianceImplExport.cpp (modified) (2 diffs)
• src-server/ApplianceImplImport.cpp (modified) (2 diffs)

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/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)

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;