Changeset 967

Timestamp:

Aug 19, 2016, 3:13:31 PM (9 years ago)

Author:

Yuri Dario

Message:

Since pdc field is already known to upper layer, avoid storing it in
each cache entry. ticket#274.

Location:

trunk/client/src

Files:

• dircache.c (modified) (9 diffs)
• dircache.h (modified) (1 diff)

trunk/client/src/dircache.c

@@ -88 +88 @@
     pdce->ulHash = computehash (path);
     pdce->ulLastUpdateTime = 0;
-    pdce->pdc = pdc;
     pdce->fInvalid = 0;
 
@@ -267 +266 @@
 }
 
-static void dcRemoveEntry (DirectoryCacheEntry *pdce)
-{
-    DirectoryCache *pdc = pdce->pdc;
-
+static void dcRemoveEntry (DirectoryCache *pdc, DirectoryCacheEntry *pdce)
+{
     if (pdce->pNext)
     {
@@ -295 +292 @@
 }
 
-static void dcInsertEntry (DirectoryCacheEntry *pdce)
-{
-    DirectoryCache *pdc = pdce->pdc;
-
+static void dcInsertEntry (DirectoryCache *pdc, DirectoryCacheEntry *pdce)
+{
     pdce->pNext = pdc->pEntriesHead;
 
@@ -371 +366 @@
                 {
                     debuglocal(pdc->resource, 9, "dcRead: expired\n");
-                    dcRemoveEntry (pdce);
+                    dcRemoveEntry (pdc, pdce);
                     dceDelete (pdce);
                 }
@@ -415 +410 @@
             dceClear (pdce);
             /* Remove the entry from list. It will be added again in dircache_write_end. */
-            dcRemoveEntry (pdce);
+            dcRemoveEntry (pdc, pdce);
         }
 
@@ -440 +435 @@
     while (pdce)
     {
-        dcRemoveEntry (pdce);
+        dcRemoveEntry (pdc, pdce);
         dceDelete (pdce);
         
@@ -604 +599 @@
         /* Remove oldest entry. */
         pdce = pdc->pEntriesTail;
-        dcRemoveEntry (pdce);
+        dcRemoveEntry (pdc, pdce);
         dceDelete (pdce);
         pdce = NULL;
@@ -629 +624 @@
     }
     
-    lockRequest (pdce->pdc->mutex);
+    lockRequest (pdc->mutex);
     
     dceWriteEntry (pdc, pdce, finfo);
     
-    lockRelease (pdce->pdc->mutex);
+    lockRelease (pdc->mutex);
 }
 
@@ -657 +652 @@
     {
         dceAdjust (pdc, pdce);
-        dcInsertEntry (pdce);
+        dcInsertEntry (pdc, pdce);
     }
     

trunk/client/src/dircache.h

@@ -38 +38 @@
     struct DirectoryCacheEntry *pNext;
     struct DirectoryCacheEntry *pPrev;
-
-    struct DirectoryCache *pdc;
 
     smbwrp_fileinfo *aInfos;