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

Timestamp:

Jan 3, 2011, 5:29:44 PM (15 years ago)

Author:

Silvan Scherrer

Message:

samba client 2.1: read fixes, more caching

File:

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

trunk/client/src/ndpsmb.c

@@ -804 +804 @@
 
         *pconn = (HCONNECTION)pConn;
-        debuglocal(9,"NdpCreateConnection %d\n", rc);
+        debuglocal(9,"NdpCreateConnection [%p] %d\n", pConn, rc);
         return rc;
 }
@@ -816 +816 @@
         int rc;
 
-        debuglocal(9,"NdpFreeConnection in\n");
+        debuglocal(9,"NdpFreeConnection in [%p]\n", pConn);
         if (pConn->file.fd >= 0)
         {
@@ -858 +858 @@
         int retry = 0;
 
-                debuglocal(9,"NdpQueryPathInfo in <%s>, retry = %d\n", szPath, retry);
+                debuglocal(9,"NdpQueryPathInfo in [%p] <%s>, retry = %d\n", pConn, szPath, retry);
         
                 // is wildcard is specified, we suppose parent dir exist, so exit immediately
@@ -975 +975 @@
         char * p;
 
-        debug_printf("NdpFindStart in\n");
+        debug_printf("NdpFindStart in [%p]\n", pConn);
 
                 strncpy(dir, szPath, sizeof(dir) - 1);
@@ -1086 +1086 @@
         smbwrp_fileinfo finfo;
 
-        debug_printf("NdpSetPathInfo in FIXME\n");
+        debug_printf("NdpSetPathInfo in [%p]\n", pConn);
+
+        // delete the dir chache
+        dircache_invalidate(szPathName, pRes->pdc, 1);
 
         do {
@@ -1196 +1199 @@
         path = finfo->fname;
 
-        debuglocal(9,"NdpEAQuery in <%s> %08x %d\n", path, pGEAList, pGEAList ? pGEAList->cbList : 0);
+        debuglocal(9,"NdpEAQuery in [%p] <%s> %08x %d\n", pConn, path, pGEAList, pGEAList ? pGEAList->cbList : 0);
 
         do {
@@ -1242 +1245 @@
         smbwrp_fileinfo *finfo;
 
-        debuglocal(9,"NdpEASet in\n");
+        debuglocal(9,"NdpEASet in [%p]\n", pConn);
 
         if (!pfi || !pfi->pszName || !pFEAList || pFEAList->cbList <= sizeof(long))
@@ -1322 +1325 @@
         }
 
-        debuglocal(9,"NdpEASize in <%s> \n", path);
+        debuglocal(9,"NdpEASize in [%p] <%s> \n", pConn, path);
 
         do {
@@ -1362 +1365 @@
         char path[CCHMAXPATH+1] = {0};
         
-        debuglocal(9,"NdpSetCurrentDir in\n");
+        debuglocal(9,"NdpSetCurrentDir in [%p]\n", pConn);
 
         do {
@@ -1398 +1401 @@
         char path[CCHMAXPATH+1] = {0};
 
-        debuglocal(9,"NdpForceDelete in\n");
+        debuglocal(9,"NdpForceDelete in [%p]\n", pConn);
 
         dircache_invalidate(szFile, pRes->pdc, 1);
@@ -1424 +1427 @@
         char path[CCHMAXPATH+1] = {0};
 
-        debuglocal(9,"NdpCreateDir in\n");
+        debuglocal(9,"NdpCreateDir in [%p]\n", pConn);
 
         dircache_invalidate(szDirName, pRes->pdc, 1);
@@ -1450 +1453 @@
         char path[CCHMAXPATH+1] = {0};
 
-        debuglocal(9,"NdpDeleteDir in\n");
+        debuglocal(9,"NdpDeleteDir in [%p]\n", pConn);
 
         dircache_invalidate(szDir, pRes->pdc, 1);
@@ -1478 +1481 @@
         char * p = szDst;
 
-        debuglocal(9,"NdpMove in from <%s> to <%s>\n", szSrc, szDst);
+        debuglocal(9,"NdpMove in [%p] from <%s> to <%s>\n", pConn, szSrc, szDst);
 
         dircache_invalidate(szSrc, pRes->pdc, 1);
@@ -1534 +1537 @@
         char path[CCHMAXPATH+1] = {0};
 
-        debuglocal(9,"smbopen in %d\n", pConn->file.fd);
+        debuglocal(9,"smbopen in [%p] %d\n", pConn, pConn->file.fd);
 
         if (flags & O_CREAT)
@@ -1615 +1618 @@
         char path[CCHMAXPATH+1] = {0};
 
-        debuglocal(9,"NdpSetFileAttribute in\n");
+        debuglocal(9,"NdpSetFileAttribute in [%p]\n", pConn);
         do {
                 rc = pathparser(pRes, pConn, szFileName, path);
@@ -1663 +1666 @@
         smbwrp_fileinfo finfo;
 
-        debug_printf("NdpFileQueryInfo in\n");
+        debug_printf("NdpFileQueryInfo in [%p]\n", pConn);
         do {
                 if (pConn->file.fd < 0 || !*pConn->file.fname)
@@ -1701 +1704 @@
         }
 
-        debuglocal(9,"NdpFileEAQuery in <%s>/%d pGEAList=%08x\n", pConn->file.fname, pConn->file.fd, pGEAList);
+        debuglocal(9,"NdpFileEAQuery in [%p] <%s>/%d pGEAList=%08x\n", pConn, pConn->file.fname, pConn->file.fd, pGEAList);
         do {
                 if (pConn->file.fd < 0)
@@ -1748 +1751 @@
         unsigned long action;
 
-        debuglocal(9,"NdpFileEASet in\n");
+        debuglocal(9,"NdpFileEASet in [%p]\n", pConn);
 
         if (!pFEAList || pFEAList->cbList <= sizeof(long))
@@ -1806 +1809 @@
         }
 
-        debuglocal(9,"NdpFileEASize in <%s>/%d \n", pConn->file.fname, pConn->file.fd);
+        debuglocal(9,"NdpFileEASize in [%p] <%s>/%d \n", pConn, pConn->file.fname, pConn->file.fd);
         do {
                 if (pConn->file.fd < 0)
@@ -1849 +1852 @@
         unsigned long action, attrFile;
 
-        debug_printf("NdpFileSetInfo in\n");
+        debug_printf("NdpFileSetInfo in [%p]\n", pConn);
         do {
                 if (pConn->file.fd < 0 || !*pConn->file.fname)
@@ -1874 +1877 @@
         unsigned long action;
 
-        debuglocal(9,"NdpFileSetFilePtrl in\n");
+        debuglocal(9,"NdpFileSetFilePtrL in [%p]\n", pConn);
 
         do {
@@ -1909 +1912 @@
         unsigned long action;
 
-        debuglocal(9,"NdpFileClose in %d <%s>\n", pConn->file.fd, pConn->file.fd < 0 ? "!null!" : pConn->file.fname);
+        debuglocal(9,"NdpFileClose in [%p] %d <%s>\n", pConn, pConn->file.fd, pConn->file.fd < 0 ? "!null!" : pConn->file.fname);
+
+        // delete the dir chache
+        dircache_invalidate(pConn->file.fullname, pRes->pdc, 1);
 
         do {
@@ -1948 +1954 @@
         unsigned long action;
 
-        debuglocal(9,"NdpFileNewSizeL in\n");
+        debuglocal(9,"NdpFileNewSizeL in [%p]\n", pConn);
 
         do {
@@ -1965 +1971 @@
 }
 
+#define NDPSMB_READ_MAX_SIZE (65536 - 4096)
+
 int APIENTRY NdpFileRead (HCONNECTION conn, NDFILEHANDLE handle, void *pBuffer, ULONG ulRead, ULONG *pulActual)
 {
@@ -1973 +1981 @@
         unsigned long onedone;
         unsigned long action;
-
-        debuglocal(9,"NdpFileRead in\n");
+        ULONG ulReadCompleted = 0;
+
+        debuglocal(9,"NdpFileRead in [%p]\n", pConn);
 
         do {
@@ -1982 +1991 @@
                         break;
                 }
-                rc = smbwrp_read(pConn->cli, &pConn->file, pBuffer, ulRead, pulActual);
+                while (ulReadCompleted < ulRead)
+                {
+                        ULONG ulActual;
+                        ULONG ulToRead = ulRead - ulReadCompleted;
+                        debuglocal(9,"NdpFileRead completed %d, to read %d\n", ulReadCompleted, ulToRead);
+                        if (ulToRead > NDPSMB_READ_MAX_SIZE)
+                        {
+                                ulToRead = NDPSMB_READ_MAX_SIZE;
+                        }
+                        rc = smbwrp_read(pConn->cli, &pConn->file, (char *)pBuffer + ulReadCompleted, ulToRead, &ulActual);
+                        if (ulActual == 0 || rc != NO_ERROR)
+                        {
+                                break;
+                        }
+                        ulReadCompleted += ulActual;
+                }
                 //*pulActual = ulRead;
                 //DosSleep(0);
 
         } while (0);
+
+        if (ulReadCompleted > 0)
+        {
+                rc = NO_ERROR; /* Still were able to read some data. */
+        }
+
+        if (rc == NO_ERROR)
+        {
+                *pulActual = ulReadCompleted;
+        }
+
         debuglocal(9,"NdpFileRead <%s> %lu %lu %d\n", pConn->file.fd < 0 ? "!null!" : pConn->file.fname, ulRead, *pulActual, rc);
 
@@ -2001 +2036 @@
         unsigned long action;
 
-        debuglocal(9,"NdpFileWrite in\n");
+        debuglocal(9,"NdpFileWrite in [%p]\n", pConn);
 
         do {