Changeset 960 for trunk/client/src/dircache.c

Timestamp:

Aug 16, 2016, 5:41:49 PM (9 years ago)

Author:

Silvan Scherrer

Message:

samba client: add the possibility to have logfiles per share

File:

• trunk/client/src/dircache.c (modified) (36 diffs)

trunk/client/src/dircache.c

@@ -109 +109 @@
         
 
-static int dceCreate (DirectoryCacheEntry **ppdce, DirectoryCache *pdc, const char *path, int cFiles)
+static int dceCreate (DirectoryCacheEntry **ppdce, Resource *pRes, const char *path, int cFiles)
 {
     DirectoryCacheEntry *pdce = (DirectoryCacheEntry *)malloc(sizeof(DirectoryCacheEntry));
@@ -128 +128 @@
     pdce->ulHash = computehash (path);
     pdce->ulLastUpdateTime = 0;
-    pdce->pdc = pdc;
+    pdce->pdc = pRes->pdc;
     pdce->fInvalid = 0;
 
@@ -155 +155 @@
 }
 
-static void dceWriteEntry (DirectoryCacheEntry *pdce, const smbwrp_fileinfo *finfo)
+static void dceWriteEntry (Resource *pRes, DirectoryCacheEntry *pdce, const smbwrp_fileinfo *finfo)
 {
     if (pdce->cInfos >= pdce->cInfosAllocated)
@@ -165 +165 @@
                                                                 cNewAllocated * sizeof (smbwrp_fileinfo));
 
-        debuglocal(9, "dceWriteEntry: [%s] realloc %d -> %d\n", pdce->pszPath, pdce->cInfosAllocated, cNewAllocated);
+        debuglocal(pRes, 9, "dceWriteEntry: [%s] realloc %d -> %d\n", pdce->pszPath, pdce->cInfosAllocated, cNewAllocated);
         if (pNewInfos)
         {
@@ -183 +183 @@
 }
 
-static void dceAdjust (DirectoryCacheEntry *pdce)
+static void dceAdjust (Resource *pRes, DirectoryCacheEntry *pdce)
 {
     /* If the entry has too many preallocated info structures, adjust the memory allocation */
@@ -196 +196 @@
                                                                 cNewAllocated * sizeof (smbwrp_fileinfo));
 
-        debuglocal(9, "dceAdjust: [%s] realloc %d -> %d\n", pdce->pszPath, pdce->cInfosAllocated, cNewAllocated);
+        debuglocal(pRes, 9, "dceAdjust: [%s] realloc %d -> %d\n", pdce->pszPath, pdce->cInfosAllocated, cNewAllocated);
         if (pNewInfos)
         {
@@ -209 +209 @@
 }
 
-static int dcePathEqualsTo (DirectoryCacheEntry *pdce, const char *path)
-{
-    debuglocal(9, "dcePathEqualTo: [%s] [%s]\n", path, pdce->pszPath);
+static int dcePathEqualsTo (Resource *pRes, DirectoryCacheEntry *pdce, const char *path)
+{
+    debuglocal(pRes, 9, "dcePathEqualTo: [%s] [%s]\n", path, pdce->pszPath);
     return ph->fsphStrICmp (path, pdce->pszPath) == 0; 
 }
@@ -225 +225 @@
 }
                 
-static struct DirectoryCacheEntry *dcFindDirCache (struct DirectoryCache *pdc, const char *path, int fPrefix)
+static struct DirectoryCacheEntry *dcFindDirCache (Resource *pRes, const char *path, int fPrefix)
 {
     unsigned long hash = computehash (path);
 
-    DirectoryCacheEntry *iter = pdc->pEntriesHead;
-
-    debuglocal(9, "findDirCache: [%s]\n", path);
+    DirectoryCacheEntry *iter = pRes->pdc->pEntriesHead;
+
+    debuglocal(pRes, 9, "findDirCache: [%s]\n", path);
 
     while (iter != NULL)
     {
-        debuglocal(9, "findDirCache: entry [%s]\n", iter->pszPath);
+        debuglocal(pRes, 9, "findDirCache: entry [%s]\n", iter->pszPath);
         if (fPrefix)
         {
@@ -246 +246 @@
         {
             if (    iter->ulHash == hash
-                 && dcePathEqualsTo (iter, path)
+                 && dcePathEqualsTo (pRes, iter, path)
                )
             {
@@ -255 +255 @@
     }
 
-    debuglocal(9, "findDirCache: %p\n", iter);
+    debuglocal(pRes, 9, "findDirCache: %p\n", iter);
 
     return iter;
@@ -363 +363 @@
 };
 
-static int dcExistsInCache (DirectoryCache *pdc, const char *path)
+static int dcExistsInCache (Resource *pRes, const char *path)
 {
     int rc = CacheFault;
         
-    if (pdc->fEnabled)
-    {
-        if (dcFindDirCache (pdc, path, 0) != NULL)
+    if (pRes->pdc->fEnabled)
+    {
+        if (dcFindDirCache (pRes, path, 0) != NULL)
         {
             rc = CacheOk;
         }
         
-        debuglocal(9, "ExistsInCache: [%s], %d\n", path, rc);
+        debuglocal(pRes, 9, "ExistsInCache: [%s], %d\n", path, rc);
     }
     
@@ -380 +380 @@
 }
         
-static int dcRead (DirectoryCache *pdc, const char *path,
+static int dcRead (Resource *pRes, const char *path,
                    PFNADDDIRENTRY fn,
                    filelist_state *state,
@@ -387 +387 @@
     int i;
     
+    DirectoryCache *pdc = pRes->pdc;
     int rc = CacheFault;
         
@@ -393 +394 @@
         DirectoryCacheEntry *pdce;
 
-        pdce = dcFindDirCache (pdc, path, 0);
+        pdce = dcFindDirCache (pRes, path, 0);
         
         if (pdce)
         {
-            debuglocal(9, "CacheRead: entry %p found for [%s]\n", pdce, path);
+            debuglocal(pRes, 9, "CacheRead: entry %p found for [%s]\n", pdce, path);
             
             if (fForceCache)
@@ -412 +413 @@
                 if (dceExpired (pdce, pdc->ulExpirationTime))
                 {
-                    debuglocal(9, "CacheRead: expired\n");
+                    debuglocal(pRes, 9, "CacheRead: expired\n");
                     dcRemoveEntry (pdce);
                     dceDelete (pdce);
@@ -433 +434 @@
         }
         
-        debuglocal(9, "CacheRead: [%s], %d\n", path, rc);
+        debuglocal(pRes, 9, "CacheRead: [%s], %d\n", path, rc);
     }
     
@@ -439 +440 @@
 }
 
-static DirectoryCacheEntry *dcWriteBegin (DirectoryCache *pdc, const char *path, int cFiles)
+static DirectoryCacheEntry *dcWriteBegin (Resource *pRes, const char *path, int cFiles)
 {
     DirectoryCacheEntry *pdce = NULL;
 
-    if (pdc->fEnabled)
-    {
-        pdce = dcFindDirCache (pdc, path, 0);
+    if (pRes->pdc->fEnabled)
+    {
+        pdce = dcFindDirCache (pRes, path, 0);
         
         if (!pdce)
         {
             /* Does not exist in the cache yet. */
-            dceCreate (&pdce, pdc, path, cFiles);
+            dceCreate (&pdce, pRes, path, cFiles);
         }
         else
@@ -465 +466 @@
         }
         
-        debuglocal(9, "CacheWriteBegin: %s\n", path);
+        debuglocal(pRes, 9, "CacheWriteBegin: %s\n", path);
     }
     
@@ -472 +473 @@
 
 
-static void dcInvalidate (DirectoryCache *pdc, const char *path, int fPrefix)
+static void dcInvalidate (Resource *pRes, const char *path, int fPrefix)
 {
     DirectoryCacheEntry *pdce;
     
-    debuglocal(9, "CacheInvalidate: [%s]\n", path);
-
-    pdce = dcFindDirCache (pdc, path, fPrefix);
+    debuglocal(pRes, 9, "CacheInvalidate: [%s]\n", path);
+
+    pdce = dcFindDirCache (pRes, path, fPrefix);
 
     while (pdce)
@@ -485 +486 @@
         dceDelete (pdce);
         
-        pdce = dcFindDirCache (pdc, path, fPrefix);
-    }
-}
-
-static int dcFindPath (DirectoryCache *pdc,
+        pdce = dcFindDirCache (pRes, path, fPrefix);
+    }
+}
+
+static int dcFindPath (Resource *pRes, DirectoryCache *pdc,
                        const char *path,
                        const char *parent,
@@ -500 +501 @@
     unsigned long hash = computehash (parent);
 
-    debuglocal(9, "dcFindPath: [%s][%s]\n", parent, name);
+    debuglocal(pRes, 9, "dcFindPath: [%s][%s]\n", parent, name);
 
     while (pdce != NULL)
     {
-        debuglocal(9, "dcFindPath: entry [%s]\n", pdce->pszPath);
+        debuglocal(pRes, 9, "dcFindPath: entry [%s]\n", pdce->pszPath);
 
         if (   pdce->ulHash == hash
-            && dcePathEqualsTo (pdce, parent))
+            && dcePathEqualsTo (pRes, pdce, parent))
         {
             /* This entry should contain the path. */
@@ -517 +518 @@
                     *finfo = pdce->aInfos[i];
                     *pulAge = timesec () - pdce->ulLastUpdateTime;
-                    debuglocal(9, "dircache: FindPath %s found, age %d\n", path, *pulAge);
+                    debuglocal(pRes, 9, "dircache: FindPath %s found, age %d\n", path, *pulAge);
                     return 1;
                 }
@@ -526 +527 @@
     }
 
-    debuglocal(9, "dircache: FindPath %s not found\n", path);
+    debuglocal(pRes, 9, "dircache: FindPath %s not found\n", path);
     return 0;
 }
@@ -561 +562 @@
  */
 
-int dircache_create(DirectoryCache **ppdc, unsigned long ulExpirationTime, int cMaxEntries)
-{
+int dircache_create(Resource *pRes)
+{
+    struct DirectoryCache **ppdc = &pRes->pdc;
+    unsigned long ulExpirationTime = pRes->cachetimeout;
+    int cMaxEntries = pRes->cachedepth;
     int rc;
 
-    debuglocal(9, "dircache_create: %u seconds, %d entries\n", ulExpirationTime, cMaxEntries);
+    debuglocal(pRes, 9, "dircache_create: %u seconds, %d entries\n", ulExpirationTime, cMaxEntries);
 
     rc = dcCreate(ppdc);
@@ -574 +578 @@
     }
 
-    debuglocal(9, "dircache_create: %p, rc = %d\n", *ppdc, rc);
+    debuglocal(pRes, 9, "dircache_create: %p, rc = %d\n", *ppdc, rc);
     return rc;
 }
 
-void dircache_delete(DirectoryCache *pdc)
-{
-    debuglocal(9, "dircache_delete: %p\n", pdc);
+void dircache_delete(Resource *pRes)
+{
+    DirectoryCache *pdc = pRes->pdc;
+    debuglocal(pRes, 9, "dircache_delete: %p\n", pdc);
 
     if (pdc)
@@ -603 +608 @@
     }
 
-    debuglocal(9, "dircache_list_files [%s]\n", path);
+    debuglocal(state->pConn->pRes, 9, "dircache_list_files [%s]\n", path);
 
     if (!pdc)
@@ -612 +617 @@
     lockRequest (pdc->mutex);
 
-    rc = dcRead (pdc, path, fn, state, ptotal_received, 0);
+    rc = dcRead (state->pConn->pRes, path, fn, state, ptotal_received, 0);
 
     lockRelease (pdc->mutex);
@@ -632 +637 @@
     }
 
-    debuglocal(9, "dircache_write_begin pdc %p path [%s]\n", pdc, path);
+    debuglocal(state->pConn->pRes, 9, "dircache_write_begin pdc %p path [%s]\n", pdc, path);
 
     if (!pdc)
@@ -650 +655 @@
     }
     
-    pdce = dcWriteBegin (pdc, path, cFiles);
+    pdce = dcWriteBegin (state->pConn->pRes, path, cFiles);
     
     lockRelease (pdc->mutex);
 
-    debuglocal(9, "dircache_write_begin returning ctx %p\n", pdce);
+    debuglocal(state->pConn->pRes, 9, "dircache_write_begin returning ctx %p\n", pdce);
     return (void *)pdce;
 }
 
-void dircache_write_entry(void *dircachectx, const smbwrp_fileinfo *finfo)
+void dircache_write_entry(Resource *pRes, void *dircachectx, const smbwrp_fileinfo *finfo)
 {
     DirectoryCacheEntry *pdce = (DirectoryCacheEntry *)dircachectx;
 
-    debuglocal(9, "dircache_write_entry %p\n", pdce);
+    debuglocal(pRes, 9, "dircache_write_entry %p\n", pdce);
     
     if (!pdce)
@@ -671 +676 @@
     lockRequest (pdce->pdc->mutex);
     
-    dceWriteEntry (pdce, finfo);
+    dceWriteEntry (pRes, pdce, finfo);
     
     lockRelease (pdce->pdc->mutex);
 }
 
-void dircache_write_end(void *dircachectx)
+void dircache_write_end(Resource *pRes, void *dircachectx)
 {
     DirectoryCacheEntry *pdce = (DirectoryCacheEntry *)dircachectx;
     DirectoryCache *pdc;
 
-    debuglocal(9, "dircache_write_end: pdce %p\n", pdce);
+    debuglocal(pRes, 9, "dircache_write_end: pdce %p\n", pdce);
 
     if (!pdce)
@@ -699 +704 @@
     else
     {
-        dceAdjust (pdce);
+        dceAdjust (pRes, pdce);
         dcInsertEntry (pdce);
     }
@@ -707 +712 @@
 
 void dircache_invalidate(const char *path,
-                         struct DirectoryCache *pdc,
+                         Resource *pRes,
                          int fParent)
 {
-    debuglocal(9, "dircache_invalidate [%s], parent %d\n", path, fParent);
+    struct DirectoryCache *pdc = pRes->pdc;
+    debuglocal(pRes, 9, "dircache_invalidate [%s], parent %d\n", path, fParent);
 
     if (!pdc)
@@ -728 +734 @@
         {
             *lastSlash = 0;
-            dcInvalidate (pdc, p, 0);
+            dcInvalidate (pRes, p, 0);
         }
         else
         {
-            dcInvalidate (pdc, "", 0);
+            dcInvalidate (pRes, "", 0);
         }
     }
     else
     {
-        dcInvalidate (pdc, path, 0);
+        dcInvalidate (pRes, path, 0);
     }
     
@@ -745 +751 @@
 }
 
-int dircache_find_path(struct DirectoryCache *pdc,
+int dircache_find_path(Resource *pRes,
                        const char *path,
                        smbwrp_fileinfo *finfo,
                        unsigned long *pulAge)
 {
+    struct DirectoryCache *pdc = pRes->pdc;
     int cb;
     char *p;
@@ -755 +762 @@
     int fFound = 0;
 
-    debuglocal(9, "dircache_find_path [%s]\n", path);
+    debuglocal(pRes, 9, "dircache_find_path [%s]\n", path);
 
     if (!pdc)
@@ -778 +785 @@
     {
         *lastSlash = 0;
-        fFound = dcFindPath (pdc, path, p, lastSlash + 1, finfo, pulAge);
+        fFound = dcFindPath (pRes, pdc, path, p, lastSlash + 1, finfo, pulAge);
     }
     else
     {
         /* Find in the root directory. p is the name. */
-        fFound = dcFindPath (pdc, path, "", p, finfo, pulAge);
+        fFound = dcFindPath (pRes, pdc, path, "", p, finfo, pulAge);
     }