jiigen666/libtorrent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged set_settings race condition fix into trunk

Browse Source
This commit is contained in:
Arvid Norberg
2012-04-06 03:02:50 +00:00
parent d7a3e823b5
commit 9024209d51
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/disk_io_thread.cpp
View File

@@ -1751,20 +1751,22 @@ namespace libtorrent
m_log << log_time() << " update_settings " << std::endl;
#endif
TORRENT_ASSERT(j.buffer);
session_settings const& s = *((session_settings*)j.buffer);
TORRENT_ASSERT(s.cache_size >= 0);
TORRENT_ASSERT(s.cache_expiry > 0);
session_settings const* s = ((session_settings*)j.buffer);
TORRENT_ASSERT(s->cache_size >= 0);
TORRENT_ASSERT(s->cache_expiry > 0);
#if defined TORRENT_WINDOWS
if (m_settings.low_prio_disk != s.low_prio_disk)
if (m_settings.low_prio_disk != s->low_prio_disk)
{
m_file_pool.set_low_prio_io(s.low_prio_disk);
m_file_pool.set_low_prio_io(s->low_prio_disk);
// we need to close all files, since the prio
// only takes affect when files are opened
m_file_pool.release(0);
}
#endif
m_settings = s;
m_settings = *s;
delete s;
m_file_pool.resize(m_settings.file_pool_size);
#if defined __APPLE__ && defined __MACH__ && MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
setiopolicy_np(IOPOL_TYPE_DISK, IOPOL_SCOPE_THREAD