Changeset 59455 in vbox for trunk/include/VBox

Timestamp:

Jan 25, 2016 12:23:10 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

105208

Message:

Storage/VD: Remove the custom code in each backend which allocates all blocks in a fixed size image by writing zeros to it. Preparations to make use of more optimized methods to allocate large files on recent hosts (fallocate() and friends)

Location:

trunk/include/VBox

Files:

• vd-ifs-internal.h (modified) (2 diffs)
• vd-ifs.h (modified) (1 diff)

trunk/include/VBox/vd-ifs-internal.h

@@ -205 +205 @@
      * @param   pStorage        The storage handle.
      * @param   cbSize          The new size of the image.
+     *
+     * @note Depending on the host the underlying storage (backing file, etc.)
+     *       might not have all required storage allocated (sparse file) which
+     *       can delay writes or fail with a not enough free space error if there
+     *       is not enough space on the storage medium when writing to the range for
+     *       the first time.
+     *       Use VDINTERFACEIOINT::pfnSetAllocationSize to make sure the storage is
+     *       really alloacted.
      */
     DECLR3CALLBACKMEMBER(int, pfnSetSize, (void *pvUser, PVDIOSTORAGE pStorage,
                                            uint64_t cbSize));
+
+    /**
+     * Sets the size of the opened storage backend making sure the given size
+     * is really allocated.
+     *
+     * @return VBox status code.
+     * @param   pvUser          The opaque data passed on container creation.
+     * @param   pStorage        The storage handle.
+     * @param   cbSize          The new size of the image.
+     * @param   fFlags          Flags for controlling the allocation strategy.
+     *                          Reserved for future use, MBZ.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnSetAllocationSize, (void *pvUser, PVDIOSTORAGE pStorage,
+                                                     uint64_t cbSize, uint32_t fFlags,
+                                                     PFNVDPROGRESS pfnProgress,
+                                                     void *pvUser, unsigned uPercentStart,
+                                                     unsigned uPercentSpan));
 
     /**
@@ -485 +510 @@
 }
 
+DECLINLINE(int) vdIfIoIntFileSetAllocationSize(PVDINTERFACEIOINT pIfIoInt, PVDIOSTORAGE pStorage,
+                                               uint64_t cbSize, uint32_t fFlags,
+                                               PFNVDPROGRESS pfnProgress,
+                                               void *pvUser, unsigned uPercentStart,
+                                               unsigned uPercentSpan)
+{
+    return pIfIoInt->pfnSetAllocationSize(pIfIoInt->Core.pvUser, pStorage, cbSize, fFlags,
+                                          pfnProgress, pvUser, uPercentStart, uPercentSpan);
+}
+
 DECLINLINE(int) vdIfIoIntFileWriteSync(PVDINTERFACEIOINT pIfIoInt, PVDIOSTORAGE pStorage,
                                        uint64_t uOffset, const void *pvBuffer, size_t cbBuffer)

trunk/include/VBox/vd-ifs.h

@@ -432 +432 @@
      * @param   pStorage        The opaque storage handle to close.
      * @param   cbSize          The new size of the image.
+     *
+     * @note Depending on the host the underlying storage (backing file, etc.)
+     *       might not have all required storage allocated (sparse file) which
+     *       can delay writes or fail with a not enough free space error if there
+     *       is not enough space on the storage medium when writing to the range for
+     *       the first time.
+     *       Use VDINTERFACEIO::pfnSetAllocationSize to make sure the storage is
+     *       really alloacted.
      */
     DECLR3CALLBACKMEMBER(int, pfnSetSize, (void *pvUser, void *pStorage, uint64_t cbSize));
+
+    /**
+     * Sets the size of the opened storage backend making sure the given size
+     * is really allocated.
+     *
+     * @return VBox status code.
+     * @retval VERR_NOT_SUPPORTED if the implementer of the interface doesn't support
+     *         this method.
+     * @param  pvUser          The opaque data passed on container creation.
+     * @param  pStorage        The storage handle.
+     * @param  cbSize          The new size of the image.
+     * @param  fFlags          Flags for controlling the allocation strategy.
+     *                         Reserved for future use, MBZ.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnSetAllocationSize, (void *pvUser, void *pStorage,
+                                                     uint64_t cbSize, uint32_t fFlags));
 
     /**