Changeset 77979 in vbox for trunk/src/VBox/ValidationKit/utils

Timestamp:

Apr 1, 2019 1:21:04 PM (6 years ago)

Author:

vboxsync

Message:

FsPerf: Bigger path buffers. bugref:9172

File:

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

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

@@ -88 +88 @@
 *   Defined Constants And Macros                                                                                                 *
 *********************************************************************************************************************************/
+/** Used for cutting the the -d parameter value short and avoid a number of buffer overflow checks.  */
+#define FSPERF_MAX_NEEDED_PATH  224
+/** The max path used by this code.
+ * It greatly exceeds the RTPATH_MAX so we can push the limits on windows.  */
+#define FSPERF_MAX_PATH         (_32K)
+
 /** @def FSPERF_TEST_SENDFILE
  * Whether to enable the sendfile() tests. */
@@ -498 +504 @@
 
 /** The test directory (absolute).  This will always have a trailing slash. */
-static char         g_szDir[RTPATH_MAX];
+static char         g_szDir[FSPERF_MAX_PATH];
 /** The test directory (absolute), 2nd copy for use with InDir2().  */
-static char         g_szDir2[RTPATH_MAX];
+static char         g_szDir2[FSPERF_MAX_PATH];
 /** The empty test directory (absolute). This will always have a trailing slash. */
-static char         g_szEmptyDir[RTPATH_MAX];
+static char         g_szEmptyDir[FSPERF_MAX_PATH];
 /** The deep test directory (absolute). This will always have a trailing slash. */
-static char         g_szDeepDir[RTPATH_MAX];
+static char         g_szDeepDir[FSPERF_MAX_PATH + _1K];
 
 
@@ -741 +747 @@
     RTListForEach(&g_ManyTreeHead, pCur, FSPERFNAMEENTRY, Entry)
     {
-        char szPath[RTPATH_MAX];
+        char szPath[FSPERF_MAX_PATH];
         memcpy(szPath, pCur->szName, pCur->cchName);
         for (uint32_t i = 0; i < g_cManyTreeFilesPerDir; i++)
@@ -936 +942 @@
 
     /* Manytree: */
-    char szPath[RTPATH_MAX];
+    char szPath[FSPERF_MAX_PATH];
     PROFILE_MANYTREE_FN(szPath, fsPerfOpenExistingOnceReadonly(szPath), 1, g_nsTestRun, "RTFileOpen/Close/manytree/readonly");
 }
@@ -1046 +1052 @@
 
     /* Manytree: */
-    char szPath[RTPATH_MAX];
+    char szPath[FSPERF_MAX_PATH];
     PROFILE_MANYTREE_FN(szPath, RTPathQueryInfoEx(szPath, &ObjInfo, RTFSOBJATTRADD_NOTHING, RTPATH_F_ON_LINK),
                         1, g_nsTestRun, "RTPathQueryInfoEx/manytree/NOTHING");
@@ -1087 +1093 @@
 
     /* Manytree: */
-    char szPath[RTPATH_MAX];
+    char szPath[FSPERF_MAX_PATH];
     PROFILE_MANYTREE_FN(szPath, RTPathSetMode(szPath, iIteration & 1 ? fOddMode : fEvenMode), 1, g_nsTestRun,
                         "RTPathSetMode/manytree");
@@ -1151 +1157 @@
 
     /* Manytree: */
-    char szPath[RTPATH_MAX];
+    char szPath[FSPERF_MAX_PATH];
     PROFILE_MANYTREE_FN(szPath, RTPathSetTimesEx(szPath, iIteration & 1 ? &Time1 : &Time2, iIteration & 1 ? &Time2 : &Time1,
                                                  NULL, NULL, RTPATH_F_ON_LINK),
@@ -1160 +1166 @@
 DECL_FORCE_INLINE(int) fsPerfRenameMany(const char *pszFile, uint32_t iIteration)
 {
-    char szRenamed[RTPATH_MAX];
+    char szRenamed[FSPERF_MAX_PATH];
     strcat(strcpy(szRenamed, pszFile), "-renamed");
     if (!(iIteration & 1))
@@ -1171 +1177 @@
 {
     RTTestISub("rename");
-    char szPath[RTPATH_MAX];
+    char szPath[FSPERF_MAX_PATH];
 
 /** @todo rename directories too!   */
@@ -1589 +1595 @@
          */
         {
-            char szPath[RTPATH_MAX];
+            char szPath[FSPERF_MAX_PATH];
             uint64_t const nsStart = RTTimeNanoTS();
             DO_MANYTREE_FN(szPath, RTTESTI_CHECK_RC_RETV(RTFileDelete(szPath), VINF_SUCCESS));
@@ -3776 +3782 @@
         /* Create a new file, 256 KB in size, and fill it with random bytes.
            Try uncached access if we can to force the page-in to do actual reads. */
-        char szFile2[RTPATH_MAX + 32];
+        char szFile2[FSPERF_MAX_PATH + 32];
         memcpy(szFile2, g_szDir, g_cchDir);
         RTStrPrintf(&szFile2[g_cchDir], sizeof(szFile2) - g_cchDir, "mmap-%u.noh", i);
@@ -4284 +4290 @@
 static void Usage(PRTSTREAM pStrm)
 {
-    char szExec[RTPATH_MAX];
+    char szExec[FSPERF_MAX_PATH];
     RTStrmPrintf(pStrm, "usage: %s <-d <testdir>> [options]\n",
                  RTPathFilename(RTProcGetExecutablePath(szExec, sizeof(szExec))));
@@ -4369 +4375 @@
      * Default values.
      */
-    rc = RTPathGetCurrent(g_szDir, sizeof(g_szDir) / 2);
+    rc = RTPathGetCurrent(g_szDir, sizeof(g_szDir) - FSPERF_MAX_NEEDED_PATH);
     if (RT_SUCCESS(rc))
-        rc = RTPathAppend(g_szDir, sizeof(g_szDir) / 2, "fstestdir-");
+        rc = RTPathAppend(g_szDir, sizeof(g_szDir) - FSPERF_MAX_NEEDED_PATH, "fstestdir-");
     if (RT_SUCCESS(rc))
     {
@@ -4391 +4397 @@
         {
             case 'd':
-                rc = RTPathAbs(ValueUnion.psz, g_szDir, sizeof(g_szDir) / 2);
+                rc = RTPathAbs(ValueUnion.psz, g_szDir, sizeof(g_szDir) - FSPERF_MAX_NEEDED_PATH);
                 if (RT_SUCCESS(rc))
                 {