vbox的更動 30496 路徑 trunk/src/VBox/Additions/solaris

時間撮記:

2010-6-29 下午12:47:13 (14 年 以前)

作者:

vboxsync

訊息:

Additions/Solaris/SharedFolders: readdir coalesing. Read chunks rather than one entry at a time.

檔案:

• trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.c (修改) (3 筆差異)

trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.c

@@ -793 +793 @@
         int mask_size;
         sfp_file_t *fp;
-        static char infobuff[2 * MAXNAMELEN];   /* not on stack!! */
-        SHFLDIRINFO *info = (SHFLDIRINFO *)&infobuff;
+        uint32_t infobuff_alloc = 16384;
+        SHFLDIRINFO *infobuff = NULL, *info;
         uint32_t numbytes;
-        uint32_t justone;
+        uint32_t nents;
+        uint32_t size;
         uint32_t cnt;
         sffs_dirents_t *cur_buf;
@@ -836 +837 @@
 
         /*
-         * Now loop using vboxCallDirInfo to get one file name at a time
+         * Now loop using vboxCallDirInfo
          */
+        infobuff = kmem_alloc(infobuff_alloc, KM_SLEEP);
+        if (infobuff == NULL) {
+                error = (ENOSPC);
+                goto done;
+        }
+
         cnt = 0;
         for (;;) {
-                justone = 1;
-                numbytes = sizeof (infobuff);
+                numbytes = infobuff_alloc;
                 error = vboxCallDirInfo(&vbox_client, &fp->map, fp->handle,
-                    mask_str, SHFL_LIST_RETURN_ONE, 0, &numbytes, info,
-                    &justone);
-                if (error == VERR_NO_MORE_FILES) {
+                    mask_str, 0, 0, &numbytes, infobuff, &nents);
+                switch (error) {
+
+                case VINF_SUCCESS:
+                        /* fallthrough */
+                case VERR_NO_MORE_FILES:
                         break;
+
+                case VERR_NO_TRANSLATION:
+                        /* XXX ??? */
+                        break;
+
+                default:
+                        error = RTErrConvertToErrno(error);
+                        goto done;
                 }
-                else if (error == VERR_NO_TRANSLATION) {
-                        continue;       /* ?? just skip this one */
+
+                /*
+                 * Create the dirent_t's for each name
+                 */
+                for (info = infobuff; (char *) info < (char *) infobuff + numbytes; nents--) {
+                        /* expand buffer if we need more space */
+                        reclen = DIRENT64_RECLEN(strlen(info->name.String.utf8));
+                        if (SFFS_DIRENTS_OFF + cur_buf->sf_len + reclen > SFFS_DIRENTS_SIZE) {
+                                cur_buf->sf_next = kmem_alloc(SFFS_DIRENTS_SIZE, KM_SLEEP);
+                                if (cur_buf->sf_next == NULL) {
+                                        error = ENOSPC;
+                                        goto done;
+                                }
+                                cur_buf = cur_buf->sf_next;
+                                cur_buf->sf_next = NULL;
+                                cur_buf->sf_len = 0;
+                        }
+
+                        /* create the dirent with the name, offset, and len */
+                        dirent = (dirent64_t *)
+                            (((char *) &cur_buf->sf_entries[0]) + cur_buf->sf_len);
+                        strcpy(&dirent->d_name[0], info->name.String.utf8);
+                        dirent->d_reclen = reclen;
+                        dirent->d_off = cnt;
+
+                        cur_buf->sf_len += reclen;
+                        ++cnt;
+
+                        size = offsetof (SHFLDIRINFO, name.String) + info->name.u16Size;
+                        info = (SHFLDIRINFO *) ((uintptr_t) info + size);
                 }
-                else if (error != VINF_SUCCESS || justone != 1) {
-                        error = EINVAL;
-                        goto done;
-                }
-
-                /*
-                 * Put this name in the buffer, expand if we run out of room.
-                 */
-                reclen = DIRENT64_RECLEN(strlen(info->name.String.utf8));
-                if (SFFS_DIRENTS_OFF + cur_buf->sf_len + reclen > SFFS_DIRENTS_SIZE) {
-                        cur_buf->sf_next = kmem_alloc(SFFS_DIRENTS_SIZE, KM_SLEEP);
-                        if (cur_buf->sf_next == NULL) {
-                                error = ENOSPC;
-                                goto done;
-                        }
-                        cur_buf = cur_buf->sf_next;
-                        cur_buf->sf_next = NULL;
-                        cur_buf->sf_len = 0;
-                }
-
-                dirent = (dirent64_t *)
-                    (((char *) &cur_buf->sf_entries[0]) + cur_buf->sf_len);
-                strcpy(&dirent->d_name[0], info->name.String.utf8);
-                dirent->d_reclen = reclen;
-                dirent->d_off = cnt;
-
-                cur_buf->sf_len += reclen;
-                ++cnt;
+                ASSERT(nents == 0);
+                ASSERT((char *) info == (char *) infobuff + numbytes);
+
+                if (error == VERR_NO_MORE_FILES)
+                        break;
         }
         error = 0;
@@ -890 +912 @@
                 }
         }
+        if (infobuff != NULL)
+                kmem_free(infobuff, infobuff_alloc);
         if (mask_str != NULL)
                 kmem_free(mask_str, mask_size);