Ticket #8094: file_preallocation_for_windows.patch

src/engine/ftpcontrolsocket.cpp

@@ -2633 +2633 @@
 
                 if (pData->resume)
                 {
-                    if (!pFile->Open(pData->localFile, wxFile::write_append))
+                    // Open the file in read_write mode since we don't want to truncate the file
+                    // nor to always write at the end of the file due to possible preallocation
+                    if (!pFile->Open(pData->localFile, wxFile::read_write))
                     {
                         delete pFile;
                         LogMessage(MessageType::Error, _("Failed to open \"%s\" for appending/writing"), pData->localFile);
@@ -2692 +2694 @@
                     pData->resumeOffset = 0;
 
                 InitTransferStatus(pData->remoteFileSize, startOffset, false);
+
+#ifdef __WXMSW__
+                // Try to preallocate the file on Windows 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->Tell();
+                    if (pFile->SeekEnd(sizeToPreallocate) == pData->remoteFileSize)
+                    {
+                        if (!SetEndOfFile((HANDLE)_get_osfhandle(pFile->fd())))
+                            LogMessage(MessageType::Debug_Warning, _T("Impossible to preallocate the file"));
+                    }
+                    pFile->Seek(oldPos);
+                }
+#endif
             }
             else
             {

src/engine/iothread.cpp

@@ -41 +41 @@
 
 CIOThread::~CIOThread()
 {
-    delete m_pFile;
+    if (m_pFile)
+    {
+#ifdef __WXMSW__
+        // 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)
+            SetEndOfFile((HANDLE)_get_osfhandle(m_pFile->fd()));
+#endif
+        delete m_pFile;
+    }
 
     for (unsigned int i = 0; i < BUFFERCOUNT; i++)
         delete [] m_buffers[i];
@@ -52 +61 @@
 bool CIOThread::Create(wxFile* pFile, bool read, bool binary)
 {
     wxASSERT(pFile);
-    delete m_pFile;
+
+    if (m_pFile)
+    {
+#ifdef __WXMSW__
+        // 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)
+            SetEndOfFile((HANDLE)_get_osfhandle(m_pFile->fd()));
+#endif
+        delete m_pFile;
+    }
+
     m_pFile = pFile;
     m_read = read;
     m_binary = binary;