Changeset 2967 in kBuild

Timestamp:

Sep 26, 2016 6:14:13 PM (8 years ago)

Author:

bird

Message:

kFsCache: Implemented object names changing to a longer ones.

Location:

trunk/src/lib

Files:

• msc_buffered_printf.c (modified) (6 diffs)
• nt/kFsCache.c (modified) (8 diffs)
• nt/kFsCache.h (modified) (3 diffs)

trunk/src/lib/msc_buffered_printf.c

@@ -47 +47 @@
 #pragma warning(disable: 4273) /* inconsistent dll linkage*/
 
+#ifndef KWORKER
+# define DLL_IMPORT __declspec(dllexport)
+#else
+# define DLL_IMPORT
+#endif
+
 extern size_t maybe_con_fwrite(void const *pvBuf, size_t cbUnit, size_t cUnits, FILE *pFile);
 
@@ -57 +63 @@
  * @param   ...                 Format arguments.
  */
-__declspec(dllexport)
+DLL_IMPORT
 int __cdecl printf(const char *pszFormat, ...)
 {
@@ -76 +82 @@
  * @param   va                  Format arguments.
  */
-__declspec(dllexport)
+DLL_IMPORT
 int __cdecl vprintf(const char *pszFormat, va_list va)
 {
@@ -114 +120 @@
  * @param   va                  Format arguments.
  */
-__declspec(dllexport)
+DLL_IMPORT
 int __cdecl fprintf(FILE *pFile, const char *pszFormat, ...)
 {
@@ -160 +166 @@
  * @param   pszString           The string to write. (newline is appended)
  */
-__declspec(dllexport)
+DLL_IMPORT
 int __cdecl puts(const char *pszString)
 {
@@ -235 +241 @@
  * @param   pFile               The output file.
  */
-__declspec(dllexport)
+DLL_IMPORT
 int __cdecl fputs(const char *pszString, FILE *pFile)
 {

trunk/src/lib/nt/kFsCache.c

@@ -597 +597 @@
         pObj->uNameHash     = 0;
         pObj->pNextNameHash = NULL;
+        pObj->pNameAlloc    = NULL;
         pObj->pUserDataHead = NULL;
 
@@ -804 +805 @@
 }
 
+
+/**
+ * Does the growing of names.
+ *
+ * @returns pCur
+ * @param   pCache          The cache.
+ * @param   pCur            The object.
+ * @param   pchName         The name (not necessarily terminated).
+ * @param   cchName         Name length.
+ * @param   pwcName         The UTF-16 name (not necessarily terminated).
+ * @param   cwcName         The length of the UTF-16 name in wchar_t's.
+ * @param   pchShortName    The short name.
+ * @param   cchShortName    The length of the short name.  This is 0 if no short
+ *                          name.
+ * @param   pwcShortName    The short UTF-16 name.
+ * @param   cwcShortName    The length of the short UTF-16 name.  This is 0 if
+ *                          no short name.
+ */
+static PKFSOBJ kFsCacheRefreshGrowNames(PKFSCACHE pCache, PKFSOBJ pCur,
+                                        const char *pchName, KU32 cchName,
+                                        wchar_t const *pwcName, KU32 cwcName
+#ifdef KFSCACHE_CFG_SHORT_NAMES
+                                        , const char *pchShortName, KU32 cchShortName,
+                                        wchar_t const *pwcShortName, KU32 cwcShortName
+#endif
+                                        )
+{
+    PKFSOBJNAMEALLOC    pNameAlloc;
+    char               *pch;
+    KU32                cbNeeded;
+
+    pCache->cNameGrowths++;
+
+    /*
+     * Figure out our requirements.
+     */
+    cbNeeded = sizeof(KU32) + cchName + 1;
+#ifdef KFSCACHE_CFG_UTF16
+    cbNeeded += (cwcName + 1) * sizeof(wchar_t);
+#endif
+#ifdef KFSCACHE_CFG_SHORT_NAMES
+    cbNeeded += cchShortName + !!cchShortName;
+# ifdef KFSCACHE_CFG_UTF16
+    cbNeeded += (cwcShortName + !!cwcShortName) * sizeof(wchar_t);
+# endif
+#endif
+    cbNeeded = K_ALIGN_Z(cbNeeded, 8); /* Memory will likely be 8 or 16 byte aligned, so we might just claim it. */
+
+    /*
+     * Allocate memory.
+     */
+    pNameAlloc = pCur->pNameAlloc;
+    if (!pNameAlloc)
+    {
+        pNameAlloc = (PKFSOBJNAMEALLOC)kHlpAlloc(cbNeeded);
+        if (!pNameAlloc)
+            return pCur;
+        pCache->cbObjects += cbNeeded;
+        pCur->pNameAlloc = pNameAlloc;
+        pNameAlloc->cb = cbNeeded;
+    }
+    else if (pNameAlloc->cb < cbNeeded)
+    {
+        pNameAlloc = (PKFSOBJNAMEALLOC)kHlpRealloc(pNameAlloc, cbNeeded);
+        if (!pNameAlloc)
+            return pCur;
+        pCache->cbObjects += cbNeeded - pNameAlloc->cb;
+        pCur->pNameAlloc = pNameAlloc;
+        pNameAlloc->cb = cbNeeded;
+    }
+
+    /*
+     * Copy out the new names, starting with the wide char ones to avoid misaligning them.
+     */
+    pch = &pNameAlloc->abSpace[0];
+
+#ifdef KFSCACHE_CFG_UTF16
+    pCur->pwszName = (wchar_t *)pch;
+    pCur->cwcName  = cwcName;
+    pch = kHlpMemPCopy(pch, pwcName, cwcName * sizeof(wchar_t));
+    *pch++ = '\0';
+    *pch++ = '\0';
+
+# ifdef KFSCACHE_CFG_SHORT_NAMES
+    if (cwcShortName == 0)
+    {
+        pCur->pwszShortName = pCur->pwszName;
+        pCur->cwcShortName  = pCur->cwcName;
+    }
+    else
+    {
+        pCur->pwszShortName = (wchar_t *)pch;
+        pCur->cwcShortName  = cwcShortName;
+        pch = kHlpMemPCopy(pch, pwcShortName, cwcShortName * sizeof(wchar_t));
+        *pch++ = '\0';
+        *pch++ = '\0';
+    }
+# endif
+#endif
+
+    pCur->pszName = pch;
+    pCur->cchName = cchName;
+    pch = kHlpMemPCopy(pch, pchName, cchShortName);
+    *pch++ = '\0';
+
+#ifdef KFSCACHE_CFG_SHORT_NAMES
+    if (cchShortName == 0)
+    {
+        pCur->pszShortName = pCur->pszName;
+        pCur->cchShortName = pCur->cchName;
+    }
+    else
+    {
+        pCur->pszShortName = pch;
+        pCur->cchShortName = cchShortName;
+        pch = kHlpMemPCopy(pch, pchShortName, cchShortName);
+        *pch++ = '\0';
+    }
+#endif
+
+    return pCur;
+}
+
+
 /**
  * Worker for kFsCacheDirFindOldChild that refreshes the file ID value on an
  * object found by name.
  *
- * @returns Pointer to the existing object if found, NULL if not.
+ * @returns pCur.
  * @param   pDirRePop       Repopulation data.
  * @param   pCur            The object to check the names of.
@@ -828 +953 @@
  * has been found the file ID.
  *
- * @returns Pointer to the existing object if found, NULL if not.
+ * @returns pCur.
  * @param   pDirRePop       Repopulation data.
  * @param   pCur            The object to check the names of.
@@ -842 +967 @@
                                               )
 {
+    char szName[KFSCACHE_CFG_MAX_ANSI_NAME];
+    int  cchName;
+
+    pDirRePop->pCache->cNameChanges++;
+
     /*
      * Convert the names to ANSI first, that way we know all the lengths.
      */
-    char szName[KFSCACHE_CFG_MAX_ANSI_NAME];
-    int  cchName = WideCharToMultiByte(CP_ACP, 0, pwcName, cwcName, szName, sizeof(szName) - 1, NULL, NULL);
+    cchName = WideCharToMultiByte(CP_ACP, 0, pwcName, cwcName, szName, sizeof(szName) - 1, NULL, NULL);
     if (cchName >= 0)
     {
@@ -916 +1045 @@
                 }
             }
-        }
-    }
-
-
-    fprintf(stderr,
-            "kFsCacheDirRefreshOldChildName - not implemented!\n"
-            "  Old name:  %#x '%ls'\n"
-            "  New name:  %#x '%*.*ls'\n"
-            "  Old short: %#x '%ls'\n"
-            "  New short: %#x '%*.*ls'\n",
-            pCur->cwcName, pCur->pwszName,
-            cwcName, cwcName, cwcName, pwcName,
-            pCur->cwcShortName, pCur->pwszShortName,
-            cwcShortName, cwcShortName, cwcShortName, pwcShortName);
-    __debugbreak();
-    /** @todo implement this.  It's not entirely straight forward, especially if
-     *        the name increases!  Also, it's something that may happend during
-     *        individual object refresh and we might want to share code... */
-
+
+            return kFsCacheRefreshGrowNames(pDirRePop->pCache, pCur, szName, cchName, pwcName, cwcName,
+#ifdef KFSCACHE_CFG_SHORT_NAMES
+                                            szShortName, cchShortName, pwcShortName, cwcShortName
+#endif
+                                            );
+        }
+    }
+
+    fprintf(stderr, "kFsCacheDirRefreshOldChildName: WideCharToMultiByte error\n");
     return pCur;
 }
@@ -941 +1061 @@
 /**
  * Worker for kFsCacheDirFindOldChild that checks the names after an old object
- * has been found the file ID.
- *
- * @returns Pointer to the existing object if found, NULL if not.
+ * has been found by the file ID.
+ *
+ * @returns pCur.
  * @param   pDirRePop       Repopulation data.
  * @param   pCur            The object to check the names of.
@@ -3767 +3887 @@
     pCache->cObjects--;
 
+    if (pObj->pNameAlloc)
+    {
+        pCache->cbObjects -= pObj->pNameAlloc->cb;
+        kHlpFree(pObj->pNameAlloc);
+    }
+
     kHlpFree(pObj);
     return 0;
@@ -4437 +4563 @@
             pCache->cChildHashEntriesTotal  = pCache->RootDir.fHashTabMask + 1;
             pCache->cChildHashCollisions    = 0;
+            pCache->cNameChanges            = 0;
+            pCache->cNameGrowths            = 0;
             pCache->cAnsiPaths              = 0;
             pCache->cAnsiPathCollisions     = 0;

trunk/src/lib/nt/kFsCache.h

@@ -130 +130 @@
 
 /**
+ * Storage for name strings for the unlikely event that they should grow in
+ * length after the KFSOBJ was created.
+ */
+typedef struct KFSOBJNAMEALLOC
+{
+    /** Size of the allocation. */
+    KU32        cb;
+    /** The space for names. */
+    char        abSpace[1];
+} KFSOBJNAMEALLOC;
+/** Name growth allocation. */
+typedef KFSOBJNAMEALLOC *PKFSOBJNAMEALLOC;
+
+
+/**
  * Base cache node.
  */
@@ -201 +216 @@
 # endif
 #endif
+
+    /** Allocation for handling name length increases. */
+    PKFSOBJNAMEALLOC    pNameAlloc;
 
     /** Pointer to the first user data item */
@@ -411 +429 @@
     /** Number of children inserted into the hash tables. */
     KSIZE               cChildHashed;
-    /** Number of collisions in the child hash tables */
+    /** Number of collisions in the child hash tables. */
     KSIZE               cChildHashCollisions;
+    /** Number times a object name changed. */
+    KSIZE               cNameChanges;
+    /** Number times a object name grew and needed KFSOBJNAMEALLOC.
+     *  (Subset of cNameChanges) */
+    KSIZE               cNameGrowths;
 
     /** The root directory. */