Ticket #8094: file_preallocation_v3.patch

src/engine/file.cpp

@@ -79 +79 @@
     return ret;
 }
 
+bool CFile::Truncate()
+{
+    return !!SetEndOfFile(hFile_);
+}
+
 ssize_t CFile::Read(void *buf, size_t count)
 {
     ssize_t ret = -1;
@@ -171 +176 @@
     return ret;
 }
 
+bool CFile::Truncate()
+{
+    bool ret = false;
+
+    auto length = lseek(fd_, 0, SEEK_CUR);
+    if (length != static_cast<off_t>(-1)) {
+        do {
+            ret = !ftruncate(fd_, length);
+        } while (!ret && (errno == EAGAIN || errno == EINTR));
+    }
+
+    return ret;
+}
+
 ssize_t CFile::Read(void *buf, size_t count)
 {
     ssize_t ret;

src/engine/file.h

@@ -48 +48 @@
     // On failure, the new position in the file is undefined.
     wxFileOffset Seek(wxFileOffset offset, seekMode m);
 
+    // Truncate the file to the current position of the file pointer.
+    bool Truncate();
+
     // Returns number of bytes read or -1 on error
     ssize_t Read(void *buf, size_t count);
 

src/engine/ftpcontrolsocket.cpp

@@ -2601 +2601 @@
                     pData->resumeOffset = 0;
 
                 InitTransferStatus(pData->remoteFileSize, startOffset, false);
+
+                if (m_pEngine->GetOptions().GetOptionVal(OPTION_PREALLOCATE_SPACE))
+                {
+                    // Try to preallocate the file in order to reduce fragmentation
+                    wxFileOffset sizeToPreallocate = pData->remoteFileSize - startOffset;
+                    if (sizeToPreallocate > 0)
+                    {
+                        LogMessage(MessageType::Debug_Info, _T("Preallocating %") wxFileOffsetFmtSpec _T("d bytes for the file \"%s\""), sizeToPreallocate, pData->localFile);
+                        wxFileOffset oldPos = pFile->Seek(0, CFile::current);
+                        if (pFile->Seek(sizeToPreallocate, CFile::end) == pData->remoteFileSize)
+                        {
+                            if (!pFile->Truncate())
+                                LogMessage(MessageType::Debug_Warning, _T("Impossible to preallocate the file"));
+                        }
+                        pFile->Seek(oldPos, CFile::begin);
+                    }
+                }
             }
             else {
                 if (!pFile->Open(pData->localFile, CFile::read)) {

src/engine/iothread.cpp

@@ -29 +29 @@
 
 CIOThread::~CIOThread()
 {
-    delete m_pFile;
+    if (m_pFile)
+    {
+        // The file might have been preallocated and the transfer stopped before being completed
+        // so always truncate the file to the actually written size before closing it.
+        if (!m_read)
+            m_pFile->Truncate();
 
+        delete m_pFile;
+    }
+
     for (unsigned int i = 0; i < BUFFERCOUNT; i++)
         delete [] m_buffers[i];
 
@@ -40 +48 @@
 bool CIOThread::Create(CFile* pFile, bool read, bool binary)
 {
     wxASSERT(pFile);
-    delete m_pFile;
+
+    if (m_pFile)
+    {
+        // The file might have been preallocated and the transfer stopped before being completed
+        // so always truncate the file to the actually written size before closing it.
+        if (!m_read)
+            m_pFile->Truncate();
+
+        delete m_pFile;
+    }
+
     m_pFile = pFile;
     m_read = read;
     m_binary = binary;

src/include/optionsbase.h

@@ -41 +41 @@
     OPTION_SPEEDLIMIT_OUTBOUND,
     OPTION_SPEEDLIMIT_BURSTTOLERANCE,
 
+    OPTION_PREALLOCATE_SPACE,
+
     OPTION_VIEW_HIDDEN_FILES,
 
     OPTION_PRESERVE_TIMESTAMPS,

src/interface/Options.cpp

@@ -77 +77 @@
     { "Speedlimit inbound", number, _T("100"), normal },
     { "Speedlimit outbound", number, _T("20"), normal },
     { "Speedlimit burst tolerance", number, _T("0"), normal },
+    { "Preallocate space", number, _T("1"), normal },
     { "View hidden files", number, _T("0"), normal },
     { "Preserve timestamps", number, _T("0"), normal },
     { "Socket recv buffer size (v2)", number, _T("4194304"), normal }, // Make it large enough by default

src/interface/resources/xrc/settings.xrc

@@ -946 +946 @@
                   </content>
                 </object>
               </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                </object>
-              </object>
               <cols>2</cols>
               <vgap>5</vgap>
               <hgap>5</hgap>
@@ -1007 +1003 @@
         </object>
         <flag>wxGROW</flag>
       </object>
+      <object class="sizeritem">
+        <object class="wxStaticBoxSizer">
+          <label>Preallocation</label>
+          <orient>wxVERTICAL</orient>
+          <object class="sizeritem">
+            <object class="wxCheckBox" name="ID_ENABLE_PREALLOCATION">
+              <label>&amp;Preallocate space before downloading</label>
+            </object>
+            <flag>wxLEFT|wxRIGHT|wxTOP</flag>
+            <border>4</border>
+          </object>
+        </object>
+        <flag>wxGROW</flag>
+      </object>
+      <object class="sizeritem">
+        <object class="wxStaticText">
+        </object>
+      </object>
     </object>
   </object>
   <object class="wxPanel" name="ID_SETTINGS_FILETYPE">

src/interface/settings/optionspage_transfer.cpp

@@ -70 +70 @@
 #endif
     XRCCTRL(*this, "ID_REPLACED", wxStaticText)->SetLabel(filtered);
 
+    bool enable_preallocation = m_pOptions->GetOptionVal(OPTION_PREALLOCATE_SPACE) != 0;
+    SetCheck(XRCID("ID_ENABLE_PREALLOCATION"), enable_preallocation, failure);
+
     return !failure;
 }
 
@@ -87 +90 @@
     SetOptionFromText(XRCID("ID_REPLACE"), OPTION_INVALID_CHAR_REPLACE);
     SetOptionFromCheck(XRCID("ID_ENABLE_REPLACE"), OPTION_INVALID_CHAR_REPLACE_ENABLE);
 
+    SetOptionFromCheck(XRCID("ID_ENABLE_PREALLOCATION"), OPTION_PREALLOCATE_SPACE);
+
     return true;
 }