Changeset 976 for trunk/client/src/smbwrp.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/smbwrp.c (modified) (4 diffs)

trunk/client/src/smbwrp.c

@@ -730 +730 @@
            strncat(fullname, finfo->fname, sizeof(fullname) - strlen(fullname) -1);
            strncpy(st->finfo.fname, fullname, sizeof(st->finfo.fname));
-           addFindInfoL(st->pConn, st->plist, &st->finfo, st->ulAttribute, st->dir_mask);
+           addFindInfoL(st->pConn->pRes, st->plist, &st->finfo, st->ulAttribute, st->dir_mask);
         }
         return;
@@ -804 +804 @@
         uint16_t info_level;
         void *dircachectx = NULL;
-        smbwrp_fileinfo wrpfinfo;
         Resource *pRes = state->pConn->pRes;
 
         // Try to get the listing from cache.
-        if (dircache_list_files(pRes->pdc, fn, state->plist,
-                                state->mask, (char*) state->fullpath, &num_finfo))
+        debuglocal(pRes, 9, "list_files: check cache %s\n", state->fullpath);
+        if (dircache_list_files(pRes->pdc, addFindInfoCachedL, state->plist,
+                                state->dir_mask, (char*) state->fullpath, &num_finfo)) {
+           debuglocal(pRes, 9, "list_files: %s, got %d from cache\n",
+                        state->fullpath, num_finfo);
            return(num_finfo); // Got from cache
+        }
 
         if (cli_has_async_calls(cli)) {
@@ -841 +844 @@
            goto fail;
 
-        dircachectx = dircache_write_begin(pRes->pdc, state->mask,
+        dircachectx = dircache_write_begin(pRes->pdc, state->dir_mask,
                                            (char*) state->fullpath, num_finfo);
 
@@ -847 +850 @@
 
         for (i=0; i<num_finfo; i++) {
+           // dinamically allocate finfo data structure, cache can keep only pointers
+           smbwrp_fileinfo* wrpfinfo = (smbwrp_fileinfo*)malloc( sizeof(smbwrp_fileinfo));
            //as samba and this client have different finfo, we need to convert
-           memset(&wrpfinfo, 0, sizeof(wrpfinfo));
-           wrpfinfo.size = finfo[i].size;
-           wrpfinfo.attr = finfo[i].mode;
-           wrpfinfo.ctime = convert_timespec_to_time_t(finfo[i].ctime_ts);
-           wrpfinfo.mtime = convert_timespec_to_time_t(finfo[i].mtime_ts);
-           wrpfinfo.atime = convert_timespec_to_time_t(finfo[i].atime_ts);
-           wrpfinfo.easize = finfo[i].easize;
-           strncpy(wrpfinfo.fname, finfo[i].name, sizeof(wrpfinfo.fname) -1);
-           fn(cli->dfs_mountpoint, &wrpfinfo, mask, state);
-           // Also add the entry to the cache.
-           dircache_write_entry(pRes->pdc, dircachectx, &wrpfinfo);
+           memset(wrpfinfo, 0, sizeof(smbwrp_fileinfo));
+           wrpfinfo->size = finfo[i].size;
+           wrpfinfo->attr = finfo[i].mode;
+           wrpfinfo->ctime = convert_timespec_to_time_t(finfo[i].ctime_ts);
+           wrpfinfo->mtime = convert_timespec_to_time_t(finfo[i].mtime_ts);
+           wrpfinfo->atime = convert_timespec_to_time_t(finfo[i].atime_ts);
+           wrpfinfo->easize = finfo[i].easize;
+           strncpy(wrpfinfo->fname, finfo[i].name, sizeof(wrpfinfo->fname) -1);
+           // add to netdrive plist
+           debuglocal(pRes, 9,"list_files: dircachectx %x, %s->%p\n",
+                      dircachectx, wrpfinfo->fname, wrpfinfo);
+           addFindInfoCachedL(state->plist, wrpfinfo);
+           // Also add the entry to the cache, this pointer will be released
+           // when cache will be deleted
+           dircache_write_entry(pRes->pdc, dircachectx, wrpfinfo->fname, wrpfinfo);
         }