儲存庫 vbox 的更動 50197

時間撮記:

2014-1-23 下午06:28:14 (11 年 以前)

作者:

vboxsync

訊息:

Appliance::TaskOVF::startThread: Corrected the return type and selected a better thread name.

位置:

trunk/src/VBox/Main

檔案:

• include/ApplianceImplPrivate.h (修改) (1 筆差異)
• src-server/ApplianceImpl.cpp (修改) (2 筆差異)

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

@@ -128 +128 @@
     static int updateProgress(unsigned uPercent, void *pvUser);
 
-    int startThread();
+    HRESULT startThread();
 
     Appliance *pAppliance;

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

@@ -1088 +1088 @@
 
 /**
+ * Starts the worker thread for the task.
  *
- * @return
- */
-int Appliance::TaskOVF::startThread()
-{
+ * @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,
-                             "Appliance::Task");
-
-    if (RT_FAILURE(vrc))
-        return Appliance::i_setErrorStatic(E_FAIL,
-                                         Utf8StrFmt("Could not create OVF task thread (%Rrc)\n", vrc));
-
-    return S_OK;
+                             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));
 }
 
@@ -1122 +1129 @@
 
     LogFlowFuncEnter();
-    LogFlowFunc(("Appliance %p\n", pAppliance));
+    LogFlowFunc(("Appliance %p taskType=%d\n", pAppliance, task->taskType));
 
     HRESULT taskrc = S_OK;