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

fixed assert when built with disk stats

This commit is contained in:
Arvid Norberg 2009-08-05 19:02:51 +00:00
parent 5e2254df97
commit 7933132cd9
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libtorrent/disk_io_thread.hpp
View File

@ -172,7 +172,7 @@ namespace libtorrent
~disk_buffer_pool(); ~disk_buffer_pool();
#endif #endif
#ifdef TORRENT_DEBUG #if defined TORRENT_DEBUG || defined TORRENT_DISK_STATS
bool is_disk_buffer(char* buffer bool is_disk_buffer(char* buffer
, boost::mutex::scoped_lock& l) const; , boost::mutex::scoped_lock& l) const;
bool is_disk_buffer(char* buffer) const; bool is_disk_buffer(char* buffer) const;

3
include/libtorrent/peer_connection.hpp
View File

@ -481,7 +481,8 @@ namespace libtorrent
void append_send_buffer(char* buffer, int size, Destructor const& destructor) void append_send_buffer(char* buffer, int size, Destructor const& destructor)
{ {
#if TORRENT_DISK_STATS #if TORRENT_DISK_STATS
m_ses.m_disk_thread.rename_buffer(buffer, "queued send buffer"); if (m_ses.m_disk_thread.is_disk_buffer(buffer))
m_ses.m_disk_thread.rename_buffer(buffer, "queued send buffer");
#endif #endif
m_send_buffer.append_buffer(buffer, size, size, destructor); m_send_buffer.append_buffer(buffer, size, size, destructor);
#ifdef TORRENT_STATS #ifdef TORRENT_STATS

2
src/disk_io_thread.cpp
View File

@ -78,7 +78,7 @@ namespace libtorrent
} }
#endif #endif
#ifdef TORRENT_DEBUG #if defined TORRENT_DEBUG || defined TORRENT_DISK_STATS
bool disk_buffer_pool::is_disk_buffer(char* buffer bool disk_buffer_pool::is_disk_buffer(char* buffer
,boost::mutex::scoped_lock& l) const ,boost::mutex::scoped_lock& l) const
{ {