wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

fix race condition in stat_cache

This commit is contained in:
Arvid Norberg 2018-06-03 21:00:59 +02:00 committed by Arvid Norberg
parent 794ccf4f79
commit 2408200475
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,4 +1,5 @@
* fix race condition in stat_cache (disk storage)
* improve error handling of failing to change file priority
The API for custom storage implementations was altered
* set the hidden attribute when creating the part file

4
include/libtorrent/stat_cache.hpp
View File

@ -42,6 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
#include "libtorrent/aux_/disable_warnings_pop.hpp"
#include "libtorrent/config.hpp"
#include "libtorrent/thread.hpp"
namespace libtorrent
{
@ -51,7 +52,7 @@ namespace libtorrent
~stat_cache();
void init(int num_files);
enum
{
cache_error = -1,
@ -79,6 +80,7 @@ namespace libtorrent
boost::int64_t file_size;
time_t file_time;
};
mutable mutex m_mutex;
std::vector<stat_cache_t> m_stat_cache;
};
}

8
src/stat_cache.cpp
View File

@ -41,6 +41,7 @@ namespace libtorrent
void stat_cache::set_cache(int i, boost::int64_t size, time_t time)
{
TORRENT_ASSERT(i >= 0);
mutex::scoped_lock l(m_mutex);
if (i >= int(m_stat_cache.size()))
m_stat_cache.resize(i + 1, not_in_cache);
m_stat_cache[i].file_size = size;
@ -50,6 +51,7 @@ namespace libtorrent
void stat_cache::set_dirty(int i)
{
TORRENT_ASSERT(i >= 0);
mutex::scoped_lock l(m_mutex);
if (i >= int(m_stat_cache.size())) return;
m_stat_cache[i].file_size = not_in_cache;
}
@ -57,6 +59,7 @@ namespace libtorrent
void stat_cache::set_noexist(int i)
{
TORRENT_ASSERT(i >= 0);
mutex::scoped_lock l(m_mutex);
if (i >= int(m_stat_cache.size()))
m_stat_cache.resize(i + 1, not_in_cache);
m_stat_cache[i].file_size = no_exist;
@ -65,6 +68,7 @@ namespace libtorrent
void stat_cache::set_error(int i)
{
TORRENT_ASSERT(i >= 0);
mutex::scoped_lock l(m_mutex);
if (i >= int(m_stat_cache.size()))
m_stat_cache.resize(i + 1, not_in_cache);
m_stat_cache[i].file_size = cache_error;
@ -72,12 +76,14 @@ namespace libtorrent
boost::int64_t stat_cache::get_filesize(int i) const
{
mutex::scoped_lock l(m_mutex);
if (i >= int(m_stat_cache.size())) return not_in_cache;
return m_stat_cache[i].file_size;
}
time_t stat_cache::get_filetime(int i) const
{
mutex::scoped_lock l(m_mutex);
if (i >= int(m_stat_cache.size())) return not_in_cache;
if (m_stat_cache[i].file_size < 0) return m_stat_cache[i].file_size;
return m_stat_cache[i].file_time;
@ -85,11 +91,13 @@ namespace libtorrent
void stat_cache::init(int num_files)
{
mutex::scoped_lock l(m_mutex);
m_stat_cache.resize(num_files, not_in_cache);
}
void stat_cache::clear()
{
mutex::scoped_lock l(m_mutex);
std::vector<stat_cache_t>().swap(m_stat_cache);
}