Changeset 497 for branches/client-2.0/src/ndpsmb.c

Timestamp:

Dec 13, 2010, 4:05:51 PM (15 years ago)

Author:

Silvan Scherrer

Message:

samba client: caching

File:

• branches/client-2.0/src/ndpsmb.c (modified) (12 diffs)

branches/client-2.0/src/ndpsmb.c

@@ -224 +224 @@
 
 
-static PLUGINHELPERTABLE2L *ph;
+PLUGINHELPERTABLE2L *ph;
 static int ifL;
 
@@ -397 +397 @@
         pRes->krb5support = 0;
 #endif
+        pRes->pdc = NULL;
 
         t = 0, q = NULL;
@@ -503 +504 @@
                 }
         }
+
+        /* Create a directory cache with expiration time 15 seconds and up to 32 listings cached. */
+        dircache_create(&pRes->pdc, 10, 32);
 
         return rc;
@@ -727 +731 @@
 {
         Resource *pRes = (Resource *)resource;
+        dircache_delete(pRes->pdc);
         MemSet(&pRes->srv, 0, sizeof(pRes->srv));
         free(pRes);
@@ -963 +968 @@
 
                 do {
+                        /* First check if there is information in the directory cache. */
+                        unsigned long ulAge = 0;
+                        if (dircache_find_path(pRes->pdc, szPath, &finfo, &ulAge))
+                        {
+                                if (ulAge <= 15) /* @todo configurable. */
+                                {
+                                        rc = NO_ERROR;
+                                        finfo.easize = -1;
+                                        getfindinfoL(pConn, plist, &finfo, 0, NULL);
+                                        break;
+                                }
+                        }
 
                         rc = pathparser(pRes, pConn, szPath, path);
@@ -1092 +1109 @@
                 strcpy( state.dir_mask, mask);
                 strcpy( state.mask, path);
+                state.fullpath = szPath;
+                /* This plugin always reads a complete directory listing and filters results
+                 * using actual mask (state.dir_mask) in getfindinfoL.
+                 * May be this was a workaround for some server bug.
+                 * If this will be changed, then directory listing cache must be changed too,
+                 * and must remember the mask, which was used to obtain a listing.
+                 * Now the directory cache saves complete directory listings and then uses them to find
+                 * information about single files.
+                 * However, with a directory cache, it is probably faster to get a full listing and
+                 * then use it to obtain info about separate files than to perform a network
+                 * list query operation using actual wild cards for each file. Some application,
+                 * for example OpenOffice, do this.
+                 */
                 p = getlastslash(state.mask);
                 if (p)
@@ -1102 +1132 @@
                         strcpy(state.mask, "\\*");
                 }
+                debuglocal(9,"NdpFindStart: dir [%s], dir_mask [%s], mask [%s], szPath [%s]\n",
+                           state.dir, state.dir_mask, state.mask, state.fullpath);
                 rc = smbwrp_filelist( &pRes->srv, pConn->cli, &state);
                 // we need to handle reconnection also here, because NdpQueryPathInfo 
@@ -1468 +1500 @@
         debuglocal(9,"NdpForceDelete in\n");
 
+        dircache_invalidate(szFile, pRes->pdc, 1);
+
         do {
                 rc = pathparser(pRes, pConn, szFile, path);
@@ -1492 +1526 @@
         debuglocal(9,"NdpCreateDir in\n");
 
+        dircache_invalidate(szDirName, pRes->pdc, 1);
+
         do {
                 rc = pathparser(pRes, pConn, szDirName, path);
@@ -1516 +1552 @@
         debuglocal(9,"NdpDeleteDir in\n");
 
+        dircache_invalidate(szDir, pRes->pdc, 1);
+
         do {
                 rc = pathparser(pRes, pConn, szDir, path);
@@ -1541 +1579 @@
 
         debuglocal(9,"NdpMove in from <%s> to <%s>\n", szSrc, szDst);
+
+        dircache_invalidate(szSrc, pRes->pdc, 1);
+        dircache_invalidate(szDst, pRes->pdc, 1);
 
         do
@@ -1595 +1636 @@
         debuglocal(9,"smbopen in %d\n", pConn->file.fd);
 
+        if (flags & O_CREAT)
+        {
+                dircache_invalidate(szFileName, pRes->pdc, 1);
+        }
         do {
                 if (pConn->file.fd > 0)