Changeset 71261 in vbox

Timestamp:

Mar 7, 2018 2:55:23 PM (7 years ago)

Author:

vboxsync

Message:

Guest Control: Implemented support for IGuestFsObjInfo::[accessTime,birthTime,changeTime,modificationTime].

Location:

trunk/src/VBox/Main

Files:

• include/GuestCtrlImplPrivate.h (modified) (2 diffs)
• src-client/GuestCtrlPrivate.cpp (modified) (4 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2011-2017 Oracle Corporation
+ * Copyright (C) 2011-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -635 +635 @@
 struct GuestFsObjData
 {
-    /** Helper function to extract the data from
-     *  a certin VBoxService tool's guest stream block. */
+    /** @name Helper functions to extract the data from a certin VBoxService tool's guest stream block.
+     * @{ */
     int FromLs(const GuestProcessStreamBlock &strmBlk);
     int FromMkTemp(const GuestProcessStreamBlock &strmBlk);
     int FromStat(const GuestProcessStreamBlock &strmBlk);
+    /** @}  */
+
+    /** @name Static helper functions to work with time from stream block keys.
+     * @{ */
+    static PRTTIMESPEC TimeSpecFromKey(const GuestProcessStreamBlock &strmBlk, const Utf8Str &strKey, PRTTIMESPEC pTimeSpec);
+    static int64_t UnixEpochNsFromKey(const GuestProcessStreamBlock &strmBlk, const Utf8Str &strKey);
+    /** @}  */
 
     int64_t              mAccessTime;

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2011-2017 Oracle Corporation
+ * Copyright (C) 2011-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -36 +36 @@
 # include <iprt/file.h>
 #endif /* DEBUG */
-
+#include <iprt/time.h>
 
 
@@ -102 +102 @@
 }
 
+/**
+ * Extracts the timespec from a given stream block key.
+ *
+ * @return Pointer to handed-in timespec, or NULL if invalid / not found.
+ * @param  strmBlk              Stream block to extract timespec from.
+ * @param  strKey               Key to get timespec for.
+ * @param  pTimeSpec            Where to store the extracted timespec.
+ */
+/* static */
+PRTTIMESPEC GuestFsObjData::TimeSpecFromKey(const GuestProcessStreamBlock &strmBlk, const Utf8Str &strKey, PRTTIMESPEC pTimeSpec)
+{
+    AssertPtrReturn(pTimeSpec, NULL);
+
+    Utf8Str strTime = strmBlk.GetString(strKey.c_str());
+    if (strTime.isEmpty())
+        return NULL;
+
+    if (!RTTimeSpecFromString(pTimeSpec, strTime.c_str()))
+        return NULL;
+
+    return pTimeSpec;
+}
+
+/**
+ * Extracts the in nanoseconds relative from Unix epoch for a given stream block key.
+ *
+ * @return Nanoseconds relative from Unix epoch, or 0 if invalid / not found.
+ * @param  strmBlk              Stream block to extract nanoseconds from.
+ * @param  strKey               Key to get nanoseconds for.
+ */
+/* static */
+int64_t GuestFsObjData::UnixEpochNsFromKey(const GuestProcessStreamBlock &strmBlk, const Utf8Str &strKey)
+{
+    RTTIMESPEC TimeSpec;
+    if (!GuestFsObjData::TimeSpecFromKey(strmBlk, strKey, &TimeSpec))
+        return 0;
+
+    return TimeSpec.i64NanosecondsRelativeToUnixEpoch;
+}
+
 int GuestFsObjData::FromStat(const GuestProcessStreamBlock &strmBlk)
 {
@@ -125 +165 @@
         else if (strType.equalsIgnoreCase("d"))
             mType = FsObjType_Directory;
-        /** @todo Add more types! */
-        else
+        else /** @todo Add more types! */
             mType = FsObjType_Unknown;
+        /* Dates. */
+        mAccessTime       = GuestFsObjData::UnixEpochNsFromKey(strmBlk, "st_atime");
+        mBirthTime        = GuestFsObjData::UnixEpochNsFromKey(strmBlk, "st_birthtime");
+        mChangeTime       = GuestFsObjData::UnixEpochNsFromKey(strmBlk, "st_ctime");
+        mModificationTime = GuestFsObjData::UnixEpochNsFromKey(strmBlk, "st_mtime");
         /* Object size. */
         rc = strmBlk.GetInt64Ex("st_size", &mObjectSize);