c576bd4f88
Fix pre-allocation in CDownloadQueue::CopyFileList (upstream git commit f8f0eca00153b508831fce03c385fb2fb1c8ae66) Don't log a critical line on startup if statistics.dat is missing (upstream git commit 2de1d5fa97de56625459362cc6ccfd94dbf1c044) Less writing of known files list during hashing (every 3000MB instead of 300): files have become larger and hashing faster. (upstream git commit f9b504a11ba7fabde6c7a63184edeeeb15ec7f66)
25 lines
916 B
Plaintext
25 lines
916 B
Plaintext
$OpenBSD: patch-src_DownloadQueue_cpp,v 1.3 2013/11/25 11:55:13 dcoppa Exp $
|
|
|
|
commit f8f0eca00153b508831fce03c385fb2fb1c8ae66
|
|
Author: upstream svn <svn@amule.org>
|
|
Date: Sun Oct 13 20:26:01 2013 +0000
|
|
|
|
Fix pre-allocation in CDownloadQueue::CopyFileList
|
|
|
|
--- src/DownloadQueue.cpp.orig Mon Jun 13 10:50:25 2011
|
|
+++ src/DownloadQueue.cpp Mon Nov 25 11:50:03 2013
|
|
@@ -185,8 +185,11 @@ uint16 CDownloadQueue::GetFileCount() const
|
|
void CDownloadQueue::CopyFileList(std::vector<CPartFile*>& out_list, bool includeCompleted) const
|
|
{
|
|
wxMutexLocker lock(m_mutex);
|
|
-
|
|
- out_list.reserve(m_filelist.size() + includeCompleted ? m_completedDownloads.size() : 0);
|
|
+ uint32 reserve = m_filelist.size();
|
|
+ if (includeCompleted) {
|
|
+ reserve += m_completedDownloads.size();
|
|
+ }
|
|
+ out_list.reserve(reserve);
|
|
for (FileQueue::const_iterator it = m_filelist.begin(); it != m_filelist.end(); ++it) {
|
|
out_list.push_back(*it);
|
|
}
|