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

disable invariant_check functions when invariant checks are disabled

This commit is contained in:
Arvid Norberg 2013-02-25 04:13:46 +00:00
parent 775cf5570a
commit a0caa0f4b2
28 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libtorrent/aux_/session_impl.hpp
View File

@ -1007,7 +1007,7 @@ namespace libtorrent
// get to download again after the disk has been // get to download again after the disk has been
// blocked // blocked
connection_map::iterator m_next_disk_peer; connection_map::iterator m_next_disk_peer;
#ifdef TORRENT_DEBUG #if defined TORRENT_DEBUG && !defined TORRENT_DISABLE_INVARIANT_CHECKS
void check_invariant() const; void check_invariant() const;
#endif #endif

2
include/libtorrent/bt_peer_connection.hpp
View File

@ -249,7 +249,7 @@ namespace libtorrent
void on_connected(); void on_connected();
void on_metadata(); void on_metadata();
#ifdef TORRENT_DEBUG #if defined TORRENT_DEBUG && !defined TORRENT_DISABLE_INVARIANT_CHECKS
void check_invariant() const; void check_invariant() const;
ptime m_last_choke; ptime m_last_choke;
#endif #endif

2
include/libtorrent/connection_queue.hpp
View File

@ -84,7 +84,7 @@ public:
} }
#endif #endif
#ifdef TORRENT_DEBUG #if defined TORRENT_DEBUG && !defined TORRENT_DISABLE_INVARIANT_CHECKS
void check_invariant() const; void check_invariant() const;
#endif #endif

2
include/libtorrent/disk_io_thread.hpp
View File

@ -259,7 +259,7 @@ namespace libtorrent
void thread_fun(); void thread_fun();
#ifdef TORRENT_DEBUG #if defined TORRENT_DEBUG && !defined TORRENT_DISABLE_INVARIANT_CHECKS
void check_invariant() const; void check_invariant() const;
#endif #endif

2
include/libtorrent/packet_buffer.hpp
View File

@ -94,7 +94,7 @@ namespace libtorrent
index_type span() const index_type span() const
{ return (m_last - m_first) & 0xffff; } { return (m_last - m_first) & 0xffff; }
#ifdef TORRENT_DEBUG #if defined TORRENT_DEBUG && !defined TORRENT_DISABLE_INVARIANT_CHECKS
void check_invariant() const; void check_invariant() const;
#endif #endif

4
include/libtorrent/peer_connection.hpp
View File

@ -533,8 +533,10 @@ namespace libtorrent
void assign_bandwidth(int channel, int amount); void assign_bandwidth(int channel, int amount);
#ifdef TORRENT_DEBUG #if defined TORRENT_DEBUG && !defined TORRENT_DISABLE_INVARIANT_CHECKS
void check_invariant() const; void check_invariant() const;
#endif
#if defined TORRENT_DEBUG
ptime m_last_choke; ptime m_last_choke;
#endif #endif

4
include/libtorrent/piece_picker.hpp
View File

@ -362,10 +362,12 @@ namespace libtorrent
#ifdef TORRENT_DEBUG #ifdef TORRENT_DEBUG
// used in debug mode // used in debug mode
void verify_priority(int start, int end, int prio) const; void verify_priority(int start, int end, int prio) const;
void check_invariant(const torrent* t = 0) const;
void verify_pick(std::vector<piece_block> const& picked void verify_pick(std::vector<piece_block> const& picked
, bitfield const& bits) const; , bitfield const& bits) const;
#endif #endif
#if defined TORRENT_DEBUG && !defined TORRENT_DISABLE_INVARIANT_CHECKS
void check_invariant(const torrent* t = 0) const;
#endif
#if defined TORRENT_PICKER_LOG #if defined TORRENT_PICKER_LOG
void print_pieces() const; void print_pieces() const;
#endif #endif

2
include/libtorrent/policy.hpp
View File

@ -150,7 +150,7 @@ namespace libtorrent
#if defined TORRENT_DEBUG || TORRENT_RELEASE_ASSERTS #if defined TORRENT_DEBUG || TORRENT_RELEASE_ASSERTS
bool has_connection(const peer_connection* p); bool has_connection(const peer_connection* p);
#endif #endif
#ifdef TORRENT_DEBUG #if defined TORRENT_DEBUG && !defined TORRENT_DISABLE_INVARIANT_CHECKS
void check_invariant() const; void check_invariant() const;
#endif #endif

4
include/libtorrent/storage.hpp
View File

@ -460,11 +460,11 @@ namespace libtorrent
int move_storage_impl(std::string const& save_path); int move_storage_impl(std::string const& save_path);
int allocate_slot_for_piece(int piece_index); int allocate_slot_for_piece(int piece_index);
#ifdef TORRENT_DEBUG #if defined TORRENT_DEBUG && !defined TORRENT_DISABLE_INVARIANT_CHECKS
void check_invariant() const; void check_invariant() const;
#endif
#ifdef TORRENT_STORAGE_DEBUG #ifdef TORRENT_STORAGE_DEBUG
void debug_log() const; void debug_log() const;
#endif
#endif #endif
boost::intrusive_ptr<torrent_info const> m_info; boost::intrusive_ptr<torrent_info const> m_info;
file_storage const& m_files; file_storage const& m_files;

2
include/libtorrent/torrent.hpp
View File

@ -744,7 +744,7 @@ namespace libtorrent
#endif #endif
// DEBUG // DEBUG
#ifdef TORRENT_DEBUG #if defined TORRENT_DEBUG && !defined TORRENT_DISABLE_INVARIANT_CHECKS
void check_invariant() const; void check_invariant() const;
#endif #endif

2
include/libtorrent/torrent_handle.hpp
View File

@ -424,7 +424,7 @@ namespace libtorrent
: m_torrent(t) : m_torrent(t)
{} {}
#ifdef TORRENT_DEBUG #if defined TORRENT_DEBUG && !defined TORRENT_DISABLE_INVARIANT_CHECKS
void check_invariant() const; void check_invariant() const;
#endif #endif

2
include/libtorrent/web_connection_base.hpp
View File

@ -129,7 +129,7 @@ namespace libtorrent
void write_allow_fast(int) {} void write_allow_fast(int) {}
void write_suggest(int piece) {} void write_suggest(int piece) {}
#ifdef TORRENT_DEBUG #if defined TORRENT_DEBUG && !defined TORRENT_DISABLE_INVARIANT_CHECKS
void check_invariant() const; void check_invariant() const;
#endif #endif

2
src/bandwidth_manager.cpp
View File

@ -120,7 +120,7 @@ namespace libtorrent
return 0; return 0;
} }
#ifdef TORRENT_DEBUG #if defined TORRENT_DEBUG && !defined TORRENT_DISABLE_INVARIANT_CHECKS
void bandwidth_manager::check_invariant() const void bandwidth_manager::check_invariant() const
{ {
int queued = 0; int queued = 0;

2
src/bt_peer_connection.cpp
View File

@ -3337,7 +3337,7 @@ namespace libtorrent
} }
} }
#ifdef TORRENT_DEBUG #if defined TORRENT_DEBUG && !defined TORRENT_DISABLE_INVARIANT_CHECKS
void bt_peer_connection::check_invariant() const void bt_peer_connection::check_invariant() const
{ {
boost::shared_ptr<torrent> t = associated_torrent().lock(); boost::shared_ptr<torrent> t = associated_torrent().lock();

3
src/connection_queue.cpp
View File

@ -169,8 +169,7 @@ namespace libtorrent
int connection_queue::limit() const int connection_queue::limit() const
{ return m_half_open_limit; } { return m_half_open_limit; }
#ifdef TORRENT_DEBUG #if defined TORRENT_DEBUG && !defined TORRENT_DISABLE_INVARIANT_CHECKS
void connection_queue::check_invariant() const void connection_queue::check_invariant() const
{ {
int num_connecting = 0; int num_connecting = 0;

2
src/disk_io_thread.cpp
View File

@ -916,7 +916,7 @@ namespace libtorrent
return ret; return ret;
} }
#ifdef TORRENT_DEBUG #if defined TORRENT_DEBUG && !defined TORRENT_DISABLE_INVARIANT_CHECKS
void disk_io_thread::check_invariant() const void disk_io_thread::check_invariant() const
{ {
int cached_write_blocks = 0; int cached_write_blocks = 0;

2
src/packet_buffer.cpp
View File

@ -48,7 +48,7 @@ namespace libtorrent {
, m_last(0) , m_last(0)
{} {}
#ifdef TORRENT_DEBUG #if defined TORRENT_DEBUG && !defined TORRENT_DISABLE_INVARIANT_CHECKS
void packet_buffer::check_invariant() const void packet_buffer::check_invariant() const
{ {
int count = 0; int count = 0;

2
src/peer_connection.cpp
View File

@ -5573,7 +5573,7 @@ namespace libtorrent
setup_send(); setup_send();
} }
#ifdef TORRENT_DEBUG #if defined TORRENT_DEBUG && !defined TORRENT_DISABLE_INVARIANT_CHECKS
struct peer_count_t struct peer_count_t
{ {
peer_count_t(): num_peers(0), num_peers_with_timeouts(0), num_peers_with_nowant(0), num_not_requested(0) {} peer_count_t(): num_peers(0), num_peers_with_timeouts(0), num_peers_with_nowant(0), num_not_requested(0) {}

6
src/piece_picker.cpp
View File

@ -79,7 +79,7 @@ namespace libtorrent
#ifdef TORRENT_PICKER_LOG #ifdef TORRENT_PICKER_LOG
std::cerr << "new piece_picker" << std::endl; std::cerr << "new piece_picker" << std::endl;
#endif #endif
#ifdef TORRENT_DEBUG #if defined TORRENT_DEBUG && !defined TORRENT_DISABLE_INVARIANT_CHECKS
check_invariant(); check_invariant();
#endif #endif
} }
@ -273,8 +273,10 @@ namespace libtorrent
} }
std::cerr << std::endl; std::cerr << std::endl;
} }
#endif #endif // TORRENT_PIECE_PICKER
#endif // TORRENT_DEBUG
#if defined TORRENT_DEBUG && !defined TORRENT_DISABLE_INVARIANT_CHECKS
void piece_picker::check_invariant(const torrent* t) const void piece_picker::check_invariant(const torrent* t) const
{ {
#ifndef TORRENT_DEBUG_REFCOUNTS #ifndef TORRENT_DEBUG_REFCOUNTS

2
src/policy.cpp
View File

@ -1713,7 +1713,7 @@ namespace libtorrent
} }
#endif #endif
#ifdef TORRENT_DEBUG #if defined TORRENT_DEBUG && !defined TORRENT_DISABLE_INVARIANT_CHECKS
void policy::check_invariant() const void policy::check_invariant() const
{ {
TORRENT_ASSERT(m_num_connect_candidates >= 0); TORRENT_ASSERT(m_num_connect_candidates >= 0);

2
src/session_impl.cpp
View File

@ -6229,7 +6229,7 @@ retry:
#endif #endif
} }
#ifdef TORRENT_DEBUG #if defined TORRENT_DEBUG && !defined TORRENT_DISABLE_INVARIANT_CHECKS
void session_impl::check_invariant() const void session_impl::check_invariant() const
{ {
TORRENT_ASSERT(is_network_thread()); TORRENT_ASSERT(is_network_thread());

2
src/storage.cpp
View File

@ -2894,7 +2894,7 @@ ret:
return m_slot_to_piece[slot]; return m_slot_to_piece[slot];
} }
#ifdef TORRENT_DEBUG #if defined TORRENT_DEBUG && !defined TORRENT_DISABLE_INVARIANT_CHECKS
void piece_manager::check_invariant() const void piece_manager::check_invariant() const
{ {
TORRENT_ASSERT(m_current_slot <= m_files.num_pieces()); TORRENT_ASSERT(m_current_slot <= m_files.num_pieces());

2
src/torrent.cpp
View File

@ -6598,7 +6598,7 @@ namespace libtorrent
return m_ses.settings(); return m_ses.settings();
} }
#ifdef TORRENT_DEBUG #if defined TORRENT_DEBUG && !defined TORRENT_DISABLE_INVARIANT_CHECKS
void torrent::check_invariant() const void torrent::check_invariant() const
{ {
for (std::deque<time_critical_piece>::const_iterator i = m_time_critical_pieces.begin() for (std::deque<time_critical_piece>::const_iterator i = m_time_critical_pieces.begin()

3
src/torrent_handle.cpp
View File

@ -267,8 +267,7 @@ namespace libtorrent
} }
#endif #endif
#ifdef TORRENT_DEBUG #if defined TORRENT_DEBUG && !defined TORRENT_DISABLE_INVARIANT_CHECKS
void torrent_handle::check_invariant() const void torrent_handle::check_invariant() const
{} {}

2
src/torrent_info.cpp
View File

@ -1341,7 +1341,7 @@ namespace libtorrent
// ------- end deprecation ------- // ------- end deprecation -------
#endif #endif
#ifdef TORRENT_DEBUG #if defined TORRENT_DEBUG && !defined TORRENT_DISABLE_INVARIANT_CHECKS
void torrent_info::check_invariant() const void torrent_info::check_invariant() const
{ {
for (file_storage::iterator i = m_files.begin() for (file_storage::iterator i = m_files.begin()

6
src/utp_stream.cpp
View File

@ -326,7 +326,7 @@ struct utp_socket_impl
void check_receive_buffers() const; void check_receive_buffers() const;
#ifdef TORRENT_DEBUG #if defined TORRENT_DEBUG && !defined TORRENT_DISABLE_INVARIANT_CHECKS
void check_invariant() const; void check_invariant() const;
#endif #endif
@ -1479,8 +1479,6 @@ void utp_socket_impl::write_payload(boost::uint8_t* ptr, int size)
if (size == 0) return; if (size == 0) return;
ptime now = time_now_hires();
int buffers_to_clear = 0; int buffers_to_clear = 0;
while (size > 0) while (size > 0)
{ {
@ -3309,7 +3307,7 @@ void utp_socket_impl::check_receive_buffers() const
TORRENT_ASSERT(int(size) == m_receive_buffer_size); TORRENT_ASSERT(int(size) == m_receive_buffer_size);
} }
#ifdef TORRENT_DEBUG #if defined TORRENT_DEBUG && !defined TORRENT_DISABLE_INVARIANT_CHECKS
void utp_socket_impl::check_invariant() const void utp_socket_impl::check_invariant() const
{ {
for (int i = m_outbuf.cursor(); for (int i = m_outbuf.cursor();

2
src/web_connection_base.cpp
View File

@ -188,7 +188,7 @@ namespace libtorrent
} }
#ifdef TORRENT_DEBUG #if defined TORRENT_DEBUG && !defined TORRENT_DISABLE_INVARIANT_CHECKS
void web_connection_base::check_invariant() const void web_connection_base::check_invariant() const
{ {
/* /*

4
test/test_piece_picker.cpp
View File

@ -157,7 +157,7 @@ boost::shared_ptr<piece_picker> setup_picker(
TEST_CHECK(avail == availability_vec[i]); TEST_CHECK(avail == availability_vec[i]);
} }
#ifdef TORRENT_DEBUG #if defined TORRENT_DEBUG && !defined TORRENT_DISABLE_INVARIANT_CHECKS
p->check_invariant(); p->check_invariant();
#endif #endif
return p; return p;
@ -166,7 +166,7 @@ boost::shared_ptr<piece_picker> setup_picker(
bool verify_pick(boost::shared_ptr<piece_picker> p bool verify_pick(boost::shared_ptr<piece_picker> p
, std::vector<piece_block> const& picked, bool allow_multi_blocks = false) , std::vector<piece_block> const& picked, bool allow_multi_blocks = false)
{ {
#ifdef TORRENT_DEBUG #if defined TORRENT_DEBUG && !defined TORRENT_DISABLE_INVARIANT_CHECKS
p->check_invariant(); p->check_invariant();
#endif #endif
if (!allow_multi_blocks) if (!allow_multi_blocks)