Changeset 38437 in vbox

Timestamp:

Aug 12, 2011 3:05:41 PM (13 years ago)

Author:

vboxsync

Message:

GuestCtrl: Update.

Location:

trunk

Files:

• include/VBox/com/string.h (modified) (2 diffs)
• src/VBox/Additions/common/VBoxService/VBoxServiceControlExecThread.cpp (modified) (2 diffs)
• src/VBox/Additions/common/VBoxService/VBoxServicePipeBuf.cpp (modified) (2 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (4 diffs)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (2 diffs)
• src/VBox/Main/include/GuestCtrlImplPrivate.h (modified) (3 diffs)
• src/VBox/Main/include/GuestImpl.h (modified) (1 diff)
• src/VBox/Main/src-client/GuestCtrlIO.cpp (modified) (3 diffs)
• src/VBox/Main/src-client/GuestCtrlImpl.cpp (modified) (4 diffs)
• src/VBox/Main/src-client/GuestCtrlImplDir.cpp (modified) (6 diffs)
• src/VBox/Main/src-client/GuestCtrlImplFile.cpp (modified) (4 diffs)
• src/VBox/Main/testcase/tstGuestCtrlParseBuffer.cpp (modified) (1 diff)

trunk/include/VBox/com/string.h

@@ -505 +505 @@
     }
 
+    bool operator<(const RTCString &that) const { return RTCString::operator<(that); }
+
     RTMEMEF_NEW_AND_DELETE_OPERATORS();
 
@@ -563 +565 @@
      */
     static const Utf8Str Empty;
-
 protected:
 

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlExecThread.cpp

@@ -373 +373 @@
             {
 #ifdef DEBUG_andy
-                VBoxServiceVerbose(4, "ControlExec: [PID %u]: Waiting for pipe buffer %u\n",
-                                   uPID, pPipeBuf->uPipeId);
+                VBoxServiceVerbose(4, "ControlExec: [PID %u]: Waiting for pipe buffer %u (%ums)\n",
+                                   uPID, pPipeBuf->uPipeId, uTimeout);
 #endif
                 rc = VBoxServicePipeBufWaitForEvent(pPipeBuf, uTimeout);
@@ -385 +385 @@
                 {
                     if (fEnabled && !cbRead)
-                        AssertMsgFailed(("Waited for pipe buffer %u, but nothing read!\n",
-                                         pPipeBuf->uPipeId));
+                        AssertMsgFailed(("[PID %u]: Waited (%ums) for pipe buffer %u (%u bytes left) , but nothing read!\n",
+                                         uPID, uTimeout, pPipeBuf->uPipeId, pPipeBuf->cbSize - pPipeBuf->cbOffset));
                     if (pcbRead)
                         *pcbRead = cbRead;

trunk/src/VBox/Additions/common/VBoxService/VBoxServicePipeBuf.cpp

@@ -111 +111 @@
             pBuf->cbOffset += cbToRead;
 
+#ifdef DEBUG_andy
+            VBoxServiceVerbose(4, "Pipe [%u %u 0x%p %s] read pcbToRead=%u, cbSize=%u, cbAlloc=%u, cbOff=%u\n",
+                               pBuf->uPID, pBuf->uPipeId, pBuf, pBuf->fEnabled ? "EN" : "DIS", cbToRead, pBuf->cbSize, pBuf->cbAllocated, pBuf->cbOffset);
+#endif
             if (pBuf->hEventSem != NIL_RTSEMEVENT)
             {
@@ -117 +121 @@
             }
 
-#ifdef DEBUG_andy
-            VBoxServiceVerbose(4, "Pipe [%u %u 0x%p %s] read pcbToRead=%u, cbSize=%u, cbAlloc=%u, cbOff=%u\n",
-                               pBuf->uPID, pBuf->uPipeId, pBuf, pBuf->fEnabled ? "EN" : "DIS", cbToRead, pBuf->cbSize, pBuf->cbAllocated, pBuf->cbOffset);
-#endif
             *pcbToRead = cbToRead;
         }

trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp

@@ -940 +940 @@
     {
         BOOL fDirExists = FALSE;
-#if 0
-        HRESULT hr = pContext->pGuest->DirectoryExists(Bstr(pszDir).raw(),
-                                                       Bstr(pContext->pszUsername).raw(),
-                                                       Bstr(pContext->pszPassword).raw(), &fDirExists);
+        /** @todo Replace with DirectoryExists as soon as API is in place. */
+        HRESULT hr = pContext->pGuest->FileExists(Bstr(pszDir).raw(),
+                                                  Bstr(pContext->pszUsername).raw(),
+                                                  Bstr(pContext->pszPassword).raw(), &fDirExists);
         if (FAILED(hr))
             rc = ctrlPrintError(pContext->pGuest, COM_IIDOF(IGuest));
         else
-#endif
             *fExists = fDirExists ? true : false;
     }
@@ -1557 +1556 @@
             const char *pszSource = vecSources[s].mSource.c_str();
             const char *pszFilter = vecSources[s].mFilter.c_str();
+            if (!strlen(pszFilter))
+                pszFilter = NULL; /* If empty filter then there's no filter :-) */
 
             char *pszSourceRoot;
@@ -1570 +1571 @@
 
             /** @todo Files with filter?? */
+            bool fIsFile = false;
             bool fExists;
-            vrc = ctrlCopyFileExistsOnSource(pContext, pszSource, &fExists);
+            Utf8Str Utf8CurSource(pszSource);
+            if (   Utf8CurSource.endsWith("/")
+                || Utf8CurSource.endsWith("\\"))
+            {
+                if (pszFilter) /* Directory with filter. */
+                    vrc = ctrlCopyDirExistsOnSource(pContext, pszSourceRoot, &fExists);
+                else /* Regular directory without filter. */
+                    vrc = ctrlCopyDirExistsOnSource(pContext, pszSource, &fExists);
+            }
+            else
+            {
+                vrc = ctrlCopyFileExistsOnSource(pContext, pszSource, &fExists);
+                if (   RT_SUCCESS(vrc)
+                    && fExists)
+                    fIsFile = true;
+            }
+
             if (RT_SUCCESS(vrc))
             {
-                if (fExists)
+                if (fIsFile)
                 {
                     /* Single file. */
@@ -1594 +1612 @@
                 else
                 {
-                    if (!pContext->fHostToGuest)
-                    {
-                        RTMsgError("Copying of guest directories to the host is not supported yet!\n");
-                        vrc = VERR_NOT_IMPLEMENTED;
-                    }
-                    else
-                    {
-                        if (   (RT_SUCCESS(ctrlCopyDirExistsOnSource(pContext, pszSource, &fExists))
-                                && fExists)
-                            || (   RT_SUCCESS(ctrlCopyDirExistsOnSource(pContext, pszSourceRoot, &fExists))
-                                && fExists
-                                && pszFilter)
-                           )
-                        {
-                            /* Directory (with filter?). */
-                            vrc = ctrlCopyDirToTarget(pContext, pszSource, pszFilter,
-                                                      Utf8Dest.c_str(), fFlags, NULL /* Subdir */);
-                        }
-                    }
+                    /* Directory (with filter?). */
+                    vrc = ctrlCopyDirToTarget(pContext, pszSource, pszFilter,
+                                              Utf8Dest.c_str(), fFlags, NULL /* Subdir */);
                 }
             }

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -9061 +9061 @@
         Reads the next directory entry of an opened guest directory.
 
+        <result name="E_ABORT">
+          When the end of the directory has been reached.
+        </result>
+
         <result name="VBOX_E_IPRT_ERROR">
           Error while opening / reading directory.
@@ -9081 +9085 @@
       <desc>
         Checks if the specified file name exists and is a regular file.
+
+        If the file name ends with a slash or backslash, the function assumes
+        it's a directory and will check if the specified directory exists and
+        is a regular directory.
 
         <result name="VBOX_E_IPRT_ERROR">

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

@@ -37 +37 @@
 
 /** Structure representing the "value" side of a "key=value" pair. */
-typedef struct VBOXGUESTCTRL_STREAMPAIR
+class VBOXGUESTCTRL_STREAMVALUE
 {
-    VBOXGUESTCTRL_STREAMPAIR(const char *pszValue)
+public:
+
+    VBOXGUESTCTRL_STREAMVALUE() { }
+    VBOXGUESTCTRL_STREAMVALUE(const char *pszValue)
         : mValue(pszValue) {}
 
+    VBOXGUESTCTRL_STREAMVALUE(const VBOXGUESTCTRL_STREAMVALUE& aThat)
+           : mValue(aThat.mValue) {}
+
     Utf8Str mValue;
-} VBOXGUESTCTRL_STREAMPAIR, *PVBOXGUESTCTRL_STREAM_PAIR;
+};
 
 /** Map containing "key=value" pairs of a guest process stream. */
-typedef std::map< Utf8Str, VBOXGUESTCTRL_STREAMPAIR > GuestCtrlStreamPairs;
-typedef std::map< Utf8Str, VBOXGUESTCTRL_STREAMPAIR >::iterator GuestCtrlStreamPairsIter;
-typedef std::map< Utf8Str, VBOXGUESTCTRL_STREAMPAIR >::const_iterator GuestCtrlStreamPairsIterConst;
+typedef std::pair< Utf8Str, VBOXGUESTCTRL_STREAMVALUE > GuestCtrlStreamPair;
+typedef std::map < Utf8Str, VBOXGUESTCTRL_STREAMVALUE > GuestCtrlStreamPairMap;
+typedef std::map < Utf8Str, VBOXGUESTCTRL_STREAMVALUE >::iterator GuestCtrlStreamPairMapIter;
+typedef std::map < Utf8Str, VBOXGUESTCTRL_STREAMVALUE >::const_iterator GuestCtrlStreamPairMapIterConst;
 
 /**
@@ -85 +92 @@
 protected:
 
-    GuestCtrlStreamPairs m_mapPairs;
+    GuestCtrlStreamPairMap m_mapPairs;
 };
 
 /** Vector containing multiple allocated stream pair objects. */
-typedef std::vector< GuestProcessStreamBlock* > GuestCtrlStreamObjects;
-typedef std::vector< GuestProcessStreamBlock* >::iterator GuestCtrlStreamObjectsIter;
-typedef std::vector< GuestProcessStreamBlock* >::const_iterator GuestCtrlStreamObjectsIterConst;
+typedef std::vector< GuestProcessStreamBlock > GuestCtrlStreamObjects;
+typedef std::vector< GuestProcessStreamBlock >::iterator GuestCtrlStreamObjectsIter;
+typedef std::vector< GuestProcessStreamBlock >::const_iterator GuestCtrlStreamObjectsIterConst;
 
 /**
@@ -132 +139 @@
 };
 
-struct GuestTask
+class GuestTask
 {
+
+public:
+
     enum TaskType
     {

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

@@ -159 +159 @@
                                    ULONG aTimeoutMS, ULONG *aPID, IProgress **aProgress, int *pRC);
     HRESULT executeProcessResult(const char *pszCommand, const char *pszUser, ULONG ulTimeout, PCALLBACKDATAEXECSTATUS pExecStatus, ULONG *puPID);
-    HRESULT executeStreamQueryFsObjInfo(IN_BSTR aObjName,GuestProcessStreamBlock *pStreamBlock, PRTFSOBJINFO pObjInfo, RTFSOBJATTRADD enmAddAttribs);
+    HRESULT executeStreamQueryFsObjInfo(IN_BSTR aObjName,GuestProcessStreamBlock &streamBlock, PRTFSOBJINFO pObjInfo, RTFSOBJATTRADD enmAddAttribs);
     int     executeStreamDrain(ULONG aPID, GuestProcessStream &stream);
     void    executeStreamFree(GuestCtrlStreamObjects &streamObjects);

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

@@ -121 +121 @@
     try
     {
-        GuestCtrlStreamPairsIterConst itPairs = m_mapPairs.find(Utf8Str(pszKey));
+        GuestCtrlStreamPairMapIterConst itPairs = m_mapPairs.find(Utf8Str(pszKey));
         if (itPairs != m_mapPairs.end())
             return itPairs->second.mValue.c_str();
@@ -186 +186 @@
         if (!m_mapPairs.empty())
         {
-            GuestCtrlStreamPairsIter it = m_mapPairs.find(Utf8Key);
+            GuestCtrlStreamPairMapIter it = m_mapPairs.find(Utf8Key);
             if (it != m_mapPairs.end())
                  m_mapPairs.erase(it);
@@ -193 +193 @@
         if (pszValue)
         {
-            m_mapPairs.insert(
-                std::pair<Utf8Str, VBOXGUESTCTRL_STREAMPAIR>(Utf8Key, VBOXGUESTCTRL_STREAMPAIR(pszValue)));
+            VBOXGUESTCTRL_STREAMVALUE val(pszValue);
+            m_mapPairs[Utf8Key] = val;
         }
     }

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

@@ -1247 +1247 @@
  */
 HRESULT Guest::executeStreamQueryFsObjInfo(IN_BSTR aObjName,
-                                           GuestProcessStreamBlock *pStreamBlock,
+                                           GuestProcessStreamBlock &streamBlock,
                                            PRTFSOBJINFO pObjInfo,
                                            RTFSOBJATTRADD enmAddAttribs)
 {
-    AssertPtrReturn(pStreamBlock, E_INVALIDARG);
-
     HRESULT rc = S_OK;
     Utf8Str Utf8ObjName(aObjName);
 
     int64_t iVal;
-    int vrc = pStreamBlock->GetInt64Ex("st_size", &iVal);
+    int vrc = streamBlock.GetInt64Ex("st_size", &iVal);
     if (RT_SUCCESS(vrc))
         pObjInfo->cbObject = iVal;
@@ -1310 +1308 @@
 void Guest::executeStreamFree(GuestCtrlStreamObjects &streamObjects)
 {
-    for (GuestCtrlStreamObjectsIter it = streamObjects.begin();
+    /*for (GuestCtrlStreamObjectsIter it = streamObjects.begin();
          it != streamObjects.end(); it++)
     {
         executeStreamFreeBlock(*it);
-    }
+    }*/
     streamObjects.clear();
 }
@@ -1345 +1343 @@
     int rc = executeStreamDrain(aPID, stream);
     if (RT_SUCCESS(rc))
-        rc = stream.ParseBlock(streamBlock);
+    {
+        do
+        {
+            rc = stream.ParseBlock(streamBlock);
+            if (streamBlock.GetCount())
+                break; /* We got a block, bail out! */
+        } while (RT_SUCCESS(rc));
+
+        /* In case this was the last block, VERR_NO_DATA is returned.
+         * Overwrite this to get a proper return value for the last block. */
+        if(    streamBlock.GetCount()
+            && rc == VERR_NO_DATA)
+        {
+            rc = VINF_SUCCESS;
+        }
+    }
 
     return rc;
@@ -1370 +1383 @@
             /* Try to parse the stream output we gathered until now. If we still need more
              * data the parsing routine will tell us and we just do another poll round. */
-            GuestProcessStreamBlock *pCurBlock = (GuestProcessStreamBlock*)
-                                            RTMemAlloc(sizeof(GuestProcessStreamBlock));
-            if (!pCurBlock)
-            {
-                hr = setError(VBOX_E_IPRT_ERROR,
-                              tr("No memory for allocating stream block"));
-                break;
-            }
-            int vrc = guestStream.ParseBlock(*pCurBlock);
+            GuestProcessStreamBlock curBlock;
+            int vrc = guestStream.ParseBlock(curBlock);
             if (RT_SUCCESS(vrc))
             {
-                if (pCurBlock->GetCount())
+                if (curBlock.GetCount())
                 {
-                    streamObjects.push_back(pCurBlock);
+                    streamObjects.push_back(curBlock);
                 }
                 else
-                {
-                    GuestProcessStream::FreeBlock(pCurBlock);
                     break; /* No more data. */
-                }
             }
             else /* Everything else would be an error! */

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

@@ -233 +233 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    RTFSOBJINFO objInfo;
     int rc;
     HRESULT hr = directoryQueryInfoInternal(aDirectory,
                                             aUsername, aPassword,
-                                            &objInfo, RTFSOBJATTRADD_NOTHING, &rc);
+                                            NULL /* No RTFSOBJINFO needed */,
+                                            RTFSOBJATTRADD_NOTHING, &rc);
     if (SUCCEEDED(hr))
     {
@@ -283 +283 @@
 /**
  * Returns the next directory entry of an open guest directory.
- * Returns VERR_NO_MORE_FILES if no more entries available.
+ * Returns VERR_NO_DATA if no more entries available or VERR_NOT_FOUND
+ * if directory handle is invalid.
  *
  * @return  IPRT status code.
@@ -486 +487 @@
                 int rc = VINF_SUCCESS;
 
-                GuestProcessStreamBlock *pBlock = streamObjs[0];
-                AssertPtr(pBlock);
-                const char *pszFsType = pBlock->GetString("ftype");
+                Assert(streamObjs.size());
+                const char *pszFsType = streamObjs[0].GetString("ftype");
                 if (!pszFsType) /* Attribute missing? */
                      rc = VERR_NOT_FOUND;
@@ -495 +495 @@
                 {
                      rc = VERR_FILE_NOT_FOUND;
+                     /* This is not critical for Main, so don't set hr --
+                      * we will take care of rc then. */
                 }
                 if (   RT_SUCCESS(rc)
                     && aObjInfo) /* Do we want object details? */
                 {
-                    hr = executeStreamQueryFsObjInfo(aDirectory, pBlock,
+                    hr = executeStreamQueryFsObjInfo(aDirectory, streamObjs[0],
                                                      aObjInfo, enmAddAttribs);
                 }
@@ -541 +543 @@
             ComAssertComRC(hr);
 
+            Assert(streamBlock.GetCount());
             hr = pDirEntry->init(this, streamBlock);
             if (SUCCEEDED(hr))
@@ -548 +551 @@
             else
                 hr = setError(VBOX_E_IPRT_ERROR,
-                              Guest::tr("Unable to init guest directory entry"));
-        }
-        else if (rc == VERR_NO_MORE_FILES)
-        {
-            /* No more directory entries to read. */
+                              Guest::tr("Failed to init guest directory entry"));
+        }
+        else if (rc == VERR_NO_DATA)
+        {
+            /* No more directory entries to read. That's fine. */
             hr = E_ABORT; /** @todo Find/define a better rc! */
         }

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

@@ -46 +46 @@
         return setError(E_INVALIDARG, tr("No user name specified"));
 
+    /* If filename ends with a slash or backslash we assume it's a directory and
+     * call the appropriate function instead the regular one just for files. */
+    Utf8Str Utf8File(aFile);
+    if (   Utf8File.endsWith("/")
+        || Utf8File.endsWith("\\"))
+    {
+        return directoryExistsInternal(aFile, aUsername, aPassword, aExists);
+    }
     return fileExistsInternal(aFile,
                               aUsername, aPassword, aExists);
@@ -61 +69 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    RTFSOBJINFO objInfo;
     int rc;
     HRESULT hr = fileQueryInfoInternal(aFile,
                                        aUsername, aPassword,
-                                       &objInfo, RTFSOBJATTRADD_NOTHING, &rc);
+                                       NULL /* No RTFSOBJINFO needed */,
+                                       RTFSOBJATTRADD_NOTHING, &rc);
     if (SUCCEEDED(hr))
     {
@@ -139 +147 @@
             {
                 int rc = VINF_SUCCESS;
-
-                GuestProcessStreamBlock *pBlock = streamObjs[0];
-                AssertPtr(pBlock);
-                const char *pszFsType = pBlock->GetString("ftype");
+                const char *pszFsType = streamObjs[0].GetString("ftype");
                 if (!pszFsType) /* Attribute missing? */
                      rc = VERR_NOT_FOUND;
@@ -149 +154 @@
                 {
                      rc = VERR_FILE_NOT_FOUND;
+                     /* This is not critical for Main, so don't set hr --
+                      * we will take care of rc then. */
                 }
                 if (   RT_SUCCESS(rc)
                     && aObjInfo) /* Do we want object details? */
                 {
-                    hr = executeStreamQueryFsObjInfo(aFile, pBlock,
+                    hr = executeStreamQueryFsObjInfo(aFile, streamObjs[0],
                                                      aObjInfo, enmAddAttribs);
                 }

trunk/src/VBox/Main/testcase/tstGuestCtrlParseBuffer.cpp

@@ -90 +90 @@
     /* Good stuff, but with a second block -- should be *not* taken into account since
      * we're only interested in parsing/handling the first object. */
-    { "t9=t9\0t91=t91\0\0t92=t92\0\0",  sizeof("t9=t9\0t91=t91\0\0t92=t92\0\0"),           0,  sizeof("t9=t9\0t91=t91\0") - 1,            2, VINF_SUCCESS }
+    { "t9=t9\0t91=t91\0\0t92=t92\0\0",  sizeof("t9=t9\0t91=t91\0\0t92=t92\0\0"),           0,  sizeof("t9=t9\0t91=t91\0") - 1,            2, VINF_SUCCESS },
+    /* Some "real world" examples. */
+    { "hdr_id=vbt_stat\0hdr_ver=1\0name=foo.txt\0\0",
+                                        sizeof("hdr_id=vbt_stat\0hdr_ver=1\0name=foo.txt\0\0"),
+                                                                                           0,  sizeof("hdr_id=vbt_stat\0hdr_ver=1\0name=foo.txt\0\0") - 1,
+                                                                                                                                          3, VINF_SUCCESS }
 };