Changeset 497

Timestamp:

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

Author:

Silvan Scherrer

Message:

samba client: caching

Location:

branches/client-2.0/src

Files:

• Makefile.kmk (modified) (1 diff)
• debug.c (modified) (2 diffs)
• help/ndpsmb.ipf (modified) (3 diffs)
• help/ndpsmb_de.ipf (modified) (3 diffs)
• help/ndpsmb_fr.ipf (modified) (3 diffs)
• help/readme.txt (modified) (1 diff)
• help/readme_de.txt (modified) (1 diff)
• help/readme_fr.txt (modified) (1 diff)
• ndpsmb.c (modified) (12 diffs)
• smbwrp.c (modified) (4 diffs)
• smbwrp.h (modified) (4 diffs)

branches/client-2.0/src/Makefile.kmk

@@ -32 +32 @@
         printf.c \
         util.c \
+        dircache.c \
         smbwrp.c
 

branches/client-2.0/src/debug.c

@@ -51 +51 @@
         struct stat filestat;
 
+        // do we have to log at all
+        if (!debuglvl(level))
+        {
+                return;
+        }
+
         // if the file ndpsmb.dbg is around we write a logfile
         if (!debugfile[0])
@@ -80 +86 @@
         } /* endif */
 
-        if (!debuglvl(level))
-        {
-                return;
-        }
         do
         {

branches/client-2.0/src/help/ndpsmb.ipf

@@ -138 +138 @@
 :li.:link reftype=hd res=001.Version 1.0:elink.
 :li.:link reftype=hd res=002.Version 1.5.0:elink.
+:li.:link reftype=hd res=003.Version 2.0.0:elink.
 :eul
 :h2 res=001.Version 1.0
@@ -258 +259 @@
 :eul.
 :eul.
+:h2 res=003.Version 2.0.0   
+:ul.
+:li.beta1
+:ul.
+:li.added dir caching
+:eul.
+:eul.
 .******************************************************
 :h1.Credit
@@ -267 +275 @@
 :li.Alex Taylor (aka AlexT)
 :li.Nikolay Kolosov (aka nickk)
+:li.Vitali Pelenyov (aka sunlover)
 :li.and all we missed 
 :eul.

branches/client-2.0/src/help/ndpsmb_de.ipf

@@ -141 +141 @@
 :li.:link reftype=hd res=001.Version 1.0:elink.
 :li.:link reftype=hd res=002.Version 1.5.0:elink.
+:li.:link reftype=hd res=003.Version 2.0.0:elink.
 :eul
 :h2 res=001.Version 1.0
@@ -263 +264 @@
 :eul.
 :eul.
+:h2 res=003.Version 2.0.0   
+:ul.
+:li.beta1
+:ul.
+:li.Caching von Verzeichnissen
+:eul.
+:eul.
 .******************************************************
 :h1.Credit
@@ -272 +280 @@
 :li.Alex Taylor (aka AlexT)
 :li.Nikolay Kolosov (aka nickk)
+:li.Vitali Pelenyov (aka sunlover)
 :li.und alle&comma. die wir vergessen haben! 
 :eul.

branches/client-2.0/src/help/ndpsmb_fr.ipf

@@ -206 +206 @@
 :li.:link reftype=hd res=001.Version 1.0:elink.
 :li.:link reftype=hd res=002.Version 1.5.0:elink.
+:li.:link reftype=hd res=003.Version 2.0.0:elink.
 :eul.
 :h2 res=001.Version 1.0
@@ -348 +349 @@
 :eul.
 :eul.
+:h2 res=003.Version 2.0.0
+:ul.
+:li.beta1
+:ul.
+:li.added dir caching
+:eul.
+:eul.
 :p.
 .******************************************************
@@ -360 +368 @@
 :li.Alex Taylor (alias AlexT)
 :li.Nikolay Kolosov (alias nickk)
+:li.Vitali Pelenyov (aka sunlover)
 :li.et tous ceux que nous avons pu oublier
 :eul.

branches/client-2.0/src/help/readme.txt

@@ -254 +254 @@
    - Fix timestamp problem
 
+v2.0.0 beta1
+   - added dir caching

branches/client-2.0/src/help/readme_de.txt

@@ -265 +265 @@
    - Zeitzonenproblem behoben
 
+v2.0.0 beta1
+   - Caching von Verzeichnissen
+

branches/client-2.0/src/help/readme_fr.txt

@@ -326 +326 @@
    - Fix timestamp problem
 
+ v2.0.0 beta1
+   - added dir caching
+
 
 Traduction fran‡aise : Guillaume Gay <guillaume.gay@bigfoot.com>

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)

branches/client-2.0/src/smbwrp.c

@@ -1081 +1081 @@
         finfo->ctime = def_finfo.ctime_ts.tv_sec;
         strncpy(finfo->fname, def_finfo.name, sizeof(finfo->fname) - 1);
-        debuglocal(9,"fname %s (serverzone %d, level %d)\n",finfo->fname, cli->serverzone, level);
         
         switch (level) {
@@ -1240 +1239 @@
                 pstrcpy(mask,Mask);
 
+        /* Try to get the listing from cache. */
+        if (dircache_list_files(fn, state, &total_received))
+        {
+                /* Got from cache. */
+                return(total_received);
+        }
+
         while (ff_eos == 0) {
                 loop_count++;
@@ -1425 +1431 @@
                 total_received = -1;
         } else {
+                void *dircachectx = dircache_write_begin(state, total_received);
+
                 /* no connection problem.  let user function add each entry */
                 for (p=dirlist,i=0;i<total_received;i++) {
@@ -1430 +1438 @@
                                                      &finfo,NULL,NULL,NULL);
                         fn( mnt,&finfo, Mask, state );
+
+                        /* Also add the entry to the cache. */
+                        dircache_write_entry(dircachectx, &finfo);
                 }
+
+                dircache_write_end(dircachectx);
         }
 

branches/client-2.0/src/smbwrp.h

@@ -125 +125 @@
 #endif
 
+struct DirectoryCache;
+
 typedef struct _Resource
 {
@@ -133 +135 @@
         int easupport;
         int krb5support;
+        struct DirectoryCache *pdc;
 } Resource;
 
@@ -157 +160 @@
         void *plist;
         unsigned long ulAttribute;
+        const char *fullpath;
 } filelist_state;
 
@@ -186 +190 @@
 int _System smbwrp_dskattr(cli_state * cli, FSALLOCATE *pfsa);
 
+/* Directory cache helpers. */
+int dircache_create(struct DirectoryCache **ppdc, unsigned long ulExpirationTime, int cMaxEntries);
+void dircache_delete(struct DirectoryCache *pdc);
+
+typedef void FNADDDIRENTRY(const char*, smbwrp_fileinfo *, const char *, void *);
+typedef FNADDDIRENTRY *PFNADDDIRENTRY;
+
+/* Note: dircache_list_files or dircache_write_begin construct the directory path
+ *       using information in the filelist_state structure.
+ */
+int dircache_list_files(PFNADDDIRENTRY fn,
+                        filelist_state *state,
+                        int *ptotal_received);
+
+void *dircache_write_begin(filelist_state *state,
+                           int cFiles);
+void dircache_write_entry(void *dircachectx, const smbwrp_fileinfo *finfo);
+void dircache_write_end(void *dircachectx);
+
+void dircache_invalidate(const char *path,
+                         struct DirectoryCache *pdc,
+                         int fParent);
+
+int dircache_find_path(struct DirectoryCache *pdc,
+                       const char *path,
+                       smbwrp_fileinfo *finfo,
+                       unsigned long *pulAge);
+
+/* Prototype the debug log helper. */
+void debuglocal(int level, const char * fmt, ...);
+
 #endif /* _SMBWRP_H */