premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

fix mutex issue introduced in recent patch

This commit is contained in:
Arvid Norberg 2014-01-06 07:59:47 +00:00
parent f6971ad056
commit f1e8d09126
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/file_pool.cpp
View File

@ -268,7 +268,6 @@ namespace libtorrent
void file_pool::remove_oldest() void file_pool::remove_oldest()
{ {
mutex::scoped_lock l(m_mutex);
TORRENT_ASSERT(m_in_use == 1337); TORRENT_ASSERT(m_in_use == 1337);
file_set::iterator i = std::min_element(m_files.begin(), m_files.end() file_set::iterator i = std::min_element(m_files.begin(), m_files.end()
@ -303,7 +302,6 @@ namespace libtorrent
// storage. If 0 is passed, all files are closed // storage. If 0 is passed, all files are closed
void file_pool::release(void* st) void file_pool::release(void* st)
{ {
mutex::scoped_lock l(m_mutex);
TORRENT_ASSERT(m_in_use == 1337); TORRENT_ASSERT(m_in_use == 1337);
if (st == 0) if (st == 0)
{ {
@ -325,9 +323,9 @@ namespace libtorrent
{ {
TORRENT_ASSERT(size > 0); TORRENT_ASSERT(size > 0);
mutex::scoped_lock l(m_mutex);
TORRENT_ASSERT(m_in_use == 1337); TORRENT_ASSERT(m_in_use == 1337);
if (size == m_size) return; if (size == m_size) return;
mutex::scoped_lock l(m_mutex);
m_size = size; m_size = size;
if (int(m_files.size()) <= m_size) return; if (int(m_files.size()) <= m_size) return;