Changeset 77540 in vbox for trunk/src/VBox/ValidationKit/utils/fs/FsPerf.cpp

Timestamp:

Mar 2, 2019 8:48:24 PM (6 years ago)

Author:

vboxsync

Message:

FsPerf: Benchmark RTDirOpen/Close without the RTDirRead part, since the old linux shared folder code suffered in this scenario. bugref:9172

File:

• trunk/src/VBox/ValidationKit/utils/fs/FsPerf.cpp (modified) (9 diffs)

trunk/src/VBox/ValidationKit/utils/fs/FsPerf.cpp

@@ -247 +247 @@
     kCmdOpt_Rename,
     kCmdOpt_NoRename,
+    kCmdOpt_DirOpen,
+    kCmdOpt_NoDirOpen,
     kCmdOpt_DirEnum,
     kCmdOpt_NoDirEnum,
@@ -325 +327 @@
     { "--rename",           kCmdOpt_Rename,         RTGETOPT_REQ_NOTHING },
     { "--no-rename",        kCmdOpt_NoRename,       RTGETOPT_REQ_NOTHING },
+    { "--dir-open",         kCmdOpt_DirOpen,        RTGETOPT_REQ_NOTHING },
+    { "--no-dir-open",      kCmdOpt_NoDirOpen,      RTGETOPT_REQ_NOTHING },
     { "--dir-enum",         kCmdOpt_DirEnum,        RTGETOPT_REQ_NOTHING },
     { "--no-dir-enum",      kCmdOpt_NoDirEnum,      RTGETOPT_REQ_NOTHING },
@@ -391 +395 @@
 static bool         g_fUtimes    = true;
 static bool         g_fRename    = true;
+static bool         g_fDirOpen   = true;
 static bool         g_fDirEnum   = true;
 static bool         g_fMkRmDir   = true;
@@ -1006 +1011 @@
 
 
+DECL_FORCE_INLINE(int) fsPerfOpenClose(const char *pszDir)
+{
+    RTDIR hDir;
+    RTTESTI_CHECK_RC_RET(RTDirOpen(&hDir, pszDir), VINF_SUCCESS, rcCheck);
+    RTTESTI_CHECK_RC(RTDirClose(hDir), VINF_SUCCESS);
+    return VINF_SUCCESS;
+}
+
+
+void vsPerfDirOpen(void)
+{
+    RTTestISub("dir open");
+    RTDIR hDir;
+
+    /*
+     * Non-existing files.
+     */
+    RTTESTI_CHECK_RC(RTDirOpen(&hDir, InEmptyDir(RT_STR_TUPLE("no-such-file"))), VERR_FILE_NOT_FOUND);
+    RTTESTI_CHECK_RC(RTDirOpen(&hDir, InEmptyDir(RT_STR_TUPLE("no-such-dir" RTPATH_SLASH_STR "no-such-file"))), FSPERF_VERR_PATH_NOT_FOUND);
+    RTTESTI_CHECK_RC(RTDirOpen(&hDir, InDir(RT_STR_TUPLE("known-file" RTPATH_SLASH_STR "no-such-file"))), VERR_PATH_NOT_FOUND);
+
+    /*
+     * Check that open + close works.
+     */
+    g_szEmptyDir[g_cchEmptyDir] = '\0';
+    RTTESTI_CHECK_RC_RETV(RTDirOpen(&hDir, g_szEmptyDir), VINF_SUCCESS);
+    RTTESTI_CHECK_RC(RTDirClose(hDir), VINF_SUCCESS);
+
+
+    /*
+     * Profile empty dir and dir with many files.
+     */
+    g_szEmptyDir[g_cchEmptyDir] = '\0';
+    PROFILE_FN(fsPerfOpenClose(g_szEmptyDir), g_nsTestRun, "RTDirOpen/Close empty");
+    if (g_fManyFiles)
+    {
+        InDir(RT_STR_TUPLE("manyfiles"));
+        PROFILE_FN(fsPerfOpenClose(g_szDir), g_nsTestRun, "RTDirOpen/Close manyfiles");
+    }
+}
+
+
 DECL_FORCE_INLINE(int) fsPerfEnumEmpty(void)
 {
@@ -1048 +1095 @@
     RTTestISub("dir enum");
     RTDIR hDir;
-
-    /* Non-existing files. */
-    RTTESTI_CHECK_RC(RTDirOpen(&hDir, InEmptyDir(RT_STR_TUPLE("no-such-file"))), VERR_FILE_NOT_FOUND);
-    RTTESTI_CHECK_RC(RTDirOpen(&hDir, InEmptyDir(RT_STR_TUPLE("no-such-dir" RTPATH_SLASH_STR "no-such-file"))), FSPERF_VERR_PATH_NOT_FOUND);
-    RTTESTI_CHECK_RC(RTDirOpen(&hDir, InDir(RT_STR_TUPLE("known-file" RTPATH_SLASH_STR "no-such-file"))), VERR_PATH_NOT_FOUND);
 
     /*
@@ -2809 +2851 @@
                 g_fUtimes    = true;
                 g_fRename    = true;
+                g_fDirOpen   = true;
                 g_fDirEnum   = true;
                 g_fMkRmDir   = true;
@@ -2833 +2876 @@
                 g_fUtimes    = false;
                 g_fRename    = false;
+                g_fDirOpen   = false;
                 g_fDirEnum   = false;
                 g_fMkRmDir   = false;
@@ -2858 +2902 @@
             CASE_OPT(Utimes);
             CASE_OPT(Rename);
+            CASE_OPT(DirOpen);
             CASE_OPT(DirEnum);
             CASE_OPT(MkRmDir);
@@ -3010 +3055 @@
                 if (g_fRename)
                     fsPerfRename();
+                if (g_fDirOpen)
+                    vsPerfDirOpen();
                 if (g_fDirEnum)
                     vsPerfDirEnum();