Changeset 30504 in vbox for trunk/src/VBox/Additions/solaris/SharedFolders

Timestamp:

Jun 29, 2010 2:06:52 PM (14 years ago)

Author:

vboxsync

Message:

Additions/Solaris/SharedFolders: getattr coalesing improves performance while stat'ing.

Location:

trunk/src/VBox/Additions/solaris/SharedFolders

Files:

• vboxfs_prov.c (modified) (6 diffs)
• vboxfs_prov.h (modified) (1 diff)
• vboxfs_vnode.c (modified) (3 diffs)

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

@@ -408 +408 @@
  * get information about a file (or directory)
  */
+static void
+sfprov_mode_from_fmode(mode_t *mode, RTFMODE fMode)
+{
+        mode_t m = 0;
+
+        if (RTFS_IS_DIRECTORY(fMode))
+                m |= S_IFDIR;
+        else if (RTFS_IS_FILE(fMode))
+                m |= S_IFREG;
+        else if (RTFS_IS_FIFO(fMode))
+                m |= S_IFIFO;
+        else if (RTFS_IS_DEV_CHAR(fMode))
+                m |= S_IFCHR;
+        else if (RTFS_IS_DEV_BLOCK(fMode))
+                m |= S_IFBLK;
+        else if (RTFS_IS_SYMLINK(fMode))
+                m |= S_IFLNK;
+        else if (RTFS_IS_SOCKET(fMode))
+                m |= S_IFSOCK;
+
+        if (fMode & RTFS_UNIX_IRUSR)
+                m |= S_IRUSR;
+        if (fMode & RTFS_UNIX_IWUSR)
+                m |= S_IWUSR;
+        if (fMode & RTFS_UNIX_IXUSR)
+                m |= S_IXUSR;
+        if (fMode & RTFS_UNIX_IRGRP)
+                m |= S_IRGRP;
+        if (fMode & RTFS_UNIX_IWGRP)
+                m |= S_IWGRP;
+        if (fMode & RTFS_UNIX_IXGRP)
+                m |= S_IXGRP;
+        if (fMode & RTFS_UNIX_IROTH)
+                m |= S_IROTH;
+        if (fMode & RTFS_UNIX_IWOTH)
+                m |= S_IWOTH;
+        if (fMode & RTFS_UNIX_IXOTH)
+                m |= S_IXOTH;
+        if (fMode & RTFS_UNIX_ISUID)
+                m |= S_ISUID;
+        if (fMode & RTFS_UNIX_ISGID)
+                m |= S_ISGID;
+        if (fMode & RTFS_UNIX_ISTXT)
+                m |= S_ISVTX;
+        *mode = m;
+}
+
+/*
+ * get information about a file (or directory)
+ */
 int
 sfprov_get_mode(sfp_mount_t *mnt, char *path, mode_t *mode)
@@ -413 +463 @@
         int rc;
         RTFSOBJINFO info;
-        mode_t m = 0;
 
         rc = sfprov_getinfo(mnt, path, &info);
         if (rc)
                 return (rc);
-        if (RTFS_IS_DIRECTORY(info.Attr.fMode))
-                m |= S_IFDIR;
-        else if (RTFS_IS_FILE(info.Attr.fMode))
-                m |= S_IFREG;
-        else if (RTFS_IS_FIFO(info.Attr.fMode))
-                m |= S_IFIFO;
-        else if (RTFS_IS_DEV_CHAR(info.Attr.fMode))
-                m |= S_IFCHR;
-        else if (RTFS_IS_DEV_BLOCK(info.Attr.fMode))
-                m |= S_IFBLK;
-        else if (RTFS_IS_SYMLINK(info.Attr.fMode))
-                m |= S_IFLNK;
-        else if (RTFS_IS_SOCKET(info.Attr.fMode))
-                m |= S_IFSOCK;
-
-        if (info.Attr.fMode & RTFS_UNIX_IRUSR)
-                m |= S_IRUSR;
-        if (info.Attr.fMode & RTFS_UNIX_IWUSR)
-                m |= S_IWUSR;
-        if (info.Attr.fMode & RTFS_UNIX_IXUSR)
-                m |= S_IXUSR;
-        if (info.Attr.fMode & RTFS_UNIX_IRGRP)
-                m |= S_IRGRP;
-        if (info.Attr.fMode & RTFS_UNIX_IWGRP)
-                m |= S_IWGRP;
-        if (info.Attr.fMode & RTFS_UNIX_IXGRP)
-                m |= S_IXGRP;
-        if (info.Attr.fMode & RTFS_UNIX_IROTH)
-                m |= S_IROTH;
-        if (info.Attr.fMode & RTFS_UNIX_IWOTH)
-                m |= S_IWOTH;
-        if (info.Attr.fMode & RTFS_UNIX_IXOTH)
-                m |= S_IXOTH;
-        if (info.Attr.fMode & RTFS_UNIX_ISUID)
-                m |= S_ISUID;
-        if (info.Attr.fMode & RTFS_UNIX_ISGID)
-                m |= S_ISGID;
-        if (info.Attr.fMode & RTFS_UNIX_ISTXT)
-                m |= S_ISVTX;
-        *mode = m;
+        sfprov_mode_from_fmode(mode, info.Attr.fMode);
         return (0);
 }
@@ -474 +484 @@
 }
 
+static void
+sfprov_ftime_from_timespec(timestruc_t *time, RTTIMESPEC *ts)
+{
+        uint64_t nanosec = RTTimeSpecGetNano(ts);
+        time->tv_sec = nanosec / UINT64_C(1000000000);
+        time->tv_nsec = nanosec % UINT64_C(1000000000);
+}
+
 int
 sfprov_get_atime(sfp_mount_t *mnt, char *path, timestruc_t *time)
@@ -479 +497 @@
         int rc;
         RTFSOBJINFO info;
-        uint64_t nanosec;
 
         rc = sfprov_getinfo(mnt, path, &info);
         if (rc)
                 return (rc);
-        nanosec = RTTimeSpecGetNano(&info.AccessTime);
-        time->tv_sec = nanosec / 1000000000;
-        time->tv_nsec = nanosec % 1000000000;
+        sfprov_ftime_from_timespec(time, &info.AccessTime);
         return (0);
 }
@@ -495 +510 @@
         int rc;
         RTFSOBJINFO info;
-        uint64_t nanosec;
 
         rc = sfprov_getinfo(mnt, path, &info);
         if (rc)
                 return (rc);
-        nanosec = RTTimeSpecGetNano(&info.ModificationTime);
-        time->tv_sec = nanosec / 1000000000;
-        time->tv_nsec = nanosec % 1000000000;
+        sfprov_ftime_from_timespec(time, &info.ModificationTime);
         return (0);
 }
@@ -511 +523 @@
         int rc;
         RTFSOBJINFO info;
-        uint64_t nanosec;
 
         rc = sfprov_getinfo(mnt, path, &info);
         if (rc)
                 return (rc);
-        nanosec = RTTimeSpecGetNano(&info.ChangeTime);
-        time->tv_sec = nanosec / 1000000000;
-        time->tv_nsec = nanosec % 1000000000;
+        sfprov_ftime_from_timespec(time, &info.ChangeTime);
+        return (0);
+}
+
+int
+sfprov_get_attr(
+        sfp_mount_t *mnt,
+        char *path,
+        mode_t *mode,
+        uint64_t *size,
+        timestruc_t *atime,
+        timestruc_t *mtime,
+        timestruc_t *ctime)
+{
+        int rc;
+        RTFSOBJINFO info;
+
+        rc = sfprov_getinfo(mnt, path, &info);
+        if (rc)
+                return (rc);
+
+        if (mode)
+                sfprov_mode_from_fmode(mode, info.Attr.fMode);
+        if (size != NULL)
+                *size = info.cbObject;
+        if (atime != NULL)
+                sfprov_ftime_from_timespec(atime, &info.AccessTime);
+        if (mtime != NULL)
+                sfprov_ftime_from_timespec(mtime, &info.ModificationTime);
+        if (ctime != NULL)
+                sfprov_ftime_from_timespec(ctime, &info.ChangeTime);
+
         return (0);
 }

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

@@ -94 +94 @@
 extern int sfprov_get_mtime(sfp_mount_t *, char *, timestruc_t *);
 extern int sfprov_get_ctime(sfp_mount_t *, char *, timestruc_t *);
+extern int sfprov_get_attr(sfp_mount_t *, char *, mode_t *, uint64_t *,
+   timestruc_t *, timestruc_t *, timestruc_t *);
 extern int sfprov_set_attr(sfp_mount_t *, char *, uint_t, mode_t,
    timestruc_t, timestruc_t, timestruc_t);

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

@@ -726 +726 @@
         sffs_data_t     *sffs = node->sf_sffs;
         mode_t          mode;
-        timestruc_t     time;
         uint64_t        x;
         int             error;
@@ -740 +739 @@
         vap->va_seq = 0;
 
-        error = sfprov_get_mode(node->sf_sffs->sf_handle, node->sf_path, &mode);
+        error = sfprov_get_attr(node->sf_sffs->sf_handle, node->sf_path, &mode,
+            &x, &vap->va_atime, &vap->va_mtime, &vap->va_ctime);
         if (error == ENOENT)
                 sfnode_make_stale(node);
@@ -761 +761 @@
                 vap->va_type = VSOCK;
 
-        error = sfprov_get_size(node->sf_sffs->sf_handle, node->sf_path, &x);
-        if (error == ENOENT)
-                sfnode_make_stale(node);
-        if (error != 0)
-                goto done;
         vap->va_size = x;
         vap->va_blksize = 512;
         vap->va_nblocks = (x + 511) / 512;
-
-        error =
-            sfprov_get_atime(node->sf_sffs->sf_handle, node->sf_path, &time);
-        if (error == ENOENT)
-                sfnode_make_stale(node);
-        if (error != 0)
-                goto done;
-        vap->va_atime = time;
-
-        error =
-            sfprov_get_mtime(node->sf_sffs->sf_handle, node->sf_path, &time);
-        if (error == ENOENT)
-                sfnode_make_stale(node);
-        if (error != 0)
-                goto done;
-        vap->va_mtime = time;
-
-        error =
-            sfprov_get_ctime(node->sf_sffs->sf_handle, node->sf_path, &time);
-        if (error == ENOENT)
-                sfnode_make_stale(node);
-        if (error != 0)
-                goto done;
-        vap->va_ctime = time;
 
 done: