From 8df0c184db5962654876b7b51b8e80e93705c58a Mon Sep 17 00:00:00 2001 From: Marcos Pinto Date: Sun, 3 Jun 2007 16:36:06 +0000 Subject: [PATCH] possible lt freeze fix --- libtorrent/src/bt_peer_connection.cpp | 13 +++++++------ setup.py | 6 +++--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/libtorrent/src/bt_peer_connection.cpp b/libtorrent/src/bt_peer_connection.cpp index 0a677bc7a..d0761cbbd 100755 --- a/libtorrent/src/bt_peer_connection.cpp +++ b/libtorrent/src/bt_peer_connection.cpp @@ -1193,7 +1193,12 @@ namespace libtorrent i.begin[c >> 3] |= 1 << (7 - (c & 7)); } assert(i.end - i.begin == (num_pieces + 7) / 8); - + +#ifndef NDEBUG + m_sent_bitfield = true; +#endif + setup_send(); + if (num_lazy_pieces > 0) { for (int i = 0; i < num_lazy_pieces; ++i) @@ -1205,11 +1210,6 @@ namespace libtorrent #endif } } - -#ifndef NDEBUG - m_sent_bitfield = true; -#endif - setup_send(); } #ifndef TORRENT_DISABLE_EXTENSIONS @@ -2258,3 +2258,4 @@ namespace libtorrent } + diff --git a/setup.py b/setup.py index 68bb90e9c..e3127eb70 100644 --- a/setup.py +++ b/setup.py @@ -93,7 +93,7 @@ if not OS == "win": else: boosttype = 'mt' removals = ['-g', '-DNDEBUG', '-O2', '-Wstrict-prototypes'] - additions = ['-DNDEBUG', '-O2'] + additions = ['-DNDEBUG', '-O2', '-DTORRENT_DHT_VERBOSE_LOGGING=', '-DHAVE_INCLUDE_LIBTORRENT_ASIO_SSL_STREAM_HPP=1', '-DSTDC_HEADERS=1','-DTORRENT_VERBOSE_LOGGING='] if python_version == '2.5': cv_opt = sysconfig.get_config_vars()["CFLAGS"] @@ -127,8 +127,8 @@ if boosttype == "nomt": 'boost_thread', 'z', 'pthread', 'ssl'] print 'Libraries nomt' elif boosttype == "mt": - librariestype = ['boost_filesystem-mt', 'boost_date_time-mt', - 'boost_thread-mt', 'z', 'pthread', 'ssl'] + librariestype = ['boost_filesystem', 'boost_date_time', + 'boost_thread', 'z', 'pthread', 'ssl'] print 'Libraries mt' deluge_core = Extension('deluge_core',