Changeset 976 for trunk/client/src/ndpsmb.c

Timestamp:

Aug 26, 2016, 7:04:49 PM (9 years ago)

Author:

Yuri Dario

Message:

Store samba data in dynamic allocated memory for new caching code. Added
deallocator code. ticket#274.

File:

• trunk/client/src/ndpsmb.c (modified) (10 diffs)

trunk/client/src/ndpsmb.c

@@ -236 +236 @@
 // and add the result to Netdrive internal list
 //
-int addFindInfoL(Connection * pConn, void * plist, smbwrp_fileinfo * finfo, ULONG ulAttribute, char * mask)
-{
+int addFindInfoL(Resource * pRes, void * plist, smbwrp_fileinfo * finfo, ULONG ulAttribute, char * mask)
+{
+        debuglocal(pRes, 9, "addFindInfoL finfo %p, fname %s\n", finfo, finfo->fname);
         FILESTATUS3L stat = {0};
         char * name = ph->fsphStrRChr(finfo->fname, '\\');
@@ -245 +246 @@
            name = finfo->fname;
 
-        if (!*name)
-           name = pConn->pRes->srv.share_name;
+        if (!*name && pRes != NULL)
+           name = pRes->srv.share_name;
 
         if (mask && (!ph->fsphAttrMatch(ulAttribute, finfo->attr & 0x37) || !ph->fsphWildMatch(mask, name, ND_IGNORE_CASE)))
@@ -255 +256 @@
         stat.attrFile = (finfo->attr & 0x37);
 
-        fsphUnixTimeToDosDate(pConn->pRes, finfo->mtime, &stat.fdateLastWrite, &stat.ftimeLastWrite);
-        fsphUnixTimeToDosDate(pConn->pRes, finfo->ctime, &stat.fdateCreation, &stat.ftimeCreation);
-        fsphUnixTimeToDosDate(pConn->pRes, finfo->atime, &stat.fdateLastAccess, &stat.ftimeLastAccess);
-        debuglocal(pConn->pRes, 9, "fname %s\n", finfo->fname);
-        debuglocal(pConn->pRes, 9, "mtime %d %s", finfo->mtime, ctime( (time_t*)&finfo->mtime));
-        debuglocal(pConn->pRes, 9, "ftimeLastAccess %02d:%02d:%02d\n", stat.ftimeLastWrite.hours, stat.ftimeLastWrite.minutes, stat.ftimeLastWrite.twosecs*2);
+        fsphUnixTimeToDosDate(pRes, finfo->mtime, &stat.fdateLastWrite, &stat.ftimeLastWrite);
+        fsphUnixTimeToDosDate(pRes, finfo->ctime, &stat.fdateCreation, &stat.ftimeCreation);
+        fsphUnixTimeToDosDate(pRes, finfo->atime, &stat.fdateLastAccess, &stat.ftimeLastAccess);
+        debuglocal(pRes, 9, "fname %s\n", finfo->fname);
+        debuglocal(pRes, 9, "mtime %d %s", finfo->mtime, ctime( (time_t*)&finfo->mtime));
+        debuglocal(pRes, 9, "ftimeLastAccess %02d:%02d:%02d\n", stat.ftimeLastWrite.hours, stat.ftimeLastWrite.minutes, stat.ftimeLastWrite.twosecs*2);
 
         ph->fsphAddFile32L(plist, &stat, name, strlen(name), finfo, sizeof(*finfo), 0);
         return 1;
+}
+
+//
+// maps smbwrp_fileinfo data fields into a native OS/2 file informations
+// and add the result to Netdrive internal list
+//
+void addFindInfoCachedL(void *plist, void* custom)
+{
+   smbwrp_fileinfo* finfo = (smbwrp_fileinfo*)custom;
+   debuglocal(NULL, 9, "addFindInfoCachedL finfo %p, fname %s\n", finfo, finfo->fname);
+
+   // convert STATUS fields
+   FILESTATUS3L stat = {0};
+   stat.cbFile = finfo->size;
+   stat.cbFileAlloc = stat.cbFile;
+   stat.attrFile = (finfo->attr & 0x37);
+
+   // convert timestamps
+   fsphUnixTimeToDosDate(NULL, finfo->mtime, &stat.fdateLastWrite, &stat.ftimeLastWrite);
+   fsphUnixTimeToDosDate(NULL, finfo->ctime, &stat.fdateCreation, &stat.ftimeCreation);
+   fsphUnixTimeToDosDate(NULL, finfo->atime, &stat.fdateLastAccess, &stat.ftimeLastAccess);
+
+   // add to netdrive plist
+   ph->fsphAddFile32L(plist, &stat, finfo->fname, strlen(finfo->fname),
+                      finfo, sizeof(smbwrp_fileinfo), 0);
 }
 
@@ -320 +346 @@
          *d++ = 0;
          return;
+}
+
+/* callback for caching code used to free resources allocated when
+ * calling dircache_write_entry() in smbwrp.c
+ */
+static void cacheFreeEntry( void*custom)
+{
+   smbwrp_fileinfo* finfo = (smbwrp_fileinfo*)custom;
+   debuglocal(NULL, 9, "cacheFreeEntry finfo %p -> %s\n", finfo, finfo->fname);
+   // release memory
+   free( finfo);
 }
 
@@ -478 +515 @@
         */
         dircache_create(&pRes->pdc, (void*) pRes,
-                        pRes->cachetimeout, pRes->cachedepth);
+                        pRes->cachetimeout, pRes->cachedepth, cacheFreeEntry);
 
         return rc;
@@ -940 +977 @@
            // First check if there is information in the directory cache.
            unsigned long ulAge = 0;
-           if (dircache_find_path(pRes->pdc, szPath, &finfo, &ulAge))
+           void* _finfo;
+           if (dircache_find_path(pRes->pdc, szPath, &_finfo, &ulAge))
            {
               if (ulAge <= 15) /* @todo configurable. */
               {
                  rc = NO_ERROR;
-                 finfo.easize = -1;
-                 addFindInfoL(pConn, plist, &finfo, 0, NULL);
+                 ((smbwrp_fileinfo*)_finfo)->easize = -1;
+                 addFindInfoCachedL(plist, _finfo);
                  break;
               }
@@ -1005 +1043 @@
            {
               finfo.easize = -1;
-              addFindInfoL(pConn, plist, &finfo, 0, NULL);
+              addFindInfoL(pRes, plist, &finfo, 0, NULL);
            }
            else if (rc == ERROR_FILE_NOT_FOUND)
@@ -1050 +1088 @@
         Connection *pConn = (Connection *)conn;
         Resource *pRes = pConn->pRes;
-        int rc = NO_ERROR, count = 0;
+        int rc = NO_ERROR;
         unsigned long action;
         char *mask = "*";
         char dir[CCHMAXPATH+1] = {0};
         char path[CCHMAXPATH+1] = {0};
-        smbwrp_fileinfo * data;
         NDPATHELEMENT *pel = ph->fsphNameElem(0);
         filelist_state state;
@@ -1137 +1174 @@
         }
 
-        debuglocal(pRes, 9, "NdpFindStart <%s> (%s) cnt %d %d\n", szPath, path, count, rc);
+        debuglocal(pRes, 9, "NdpFindStart <%s> (%s) rc %d\n", szPath, path, rc);
 
         LEAVE();
@@ -1816 +1853 @@
            {
               finfo.easize = -1;
-              addFindInfoL(pConn, plist, &finfo, 0, NULL);
+              addFindInfoL(pRes, plist, &finfo, 0, NULL);
            }
         } while (0);