codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixing up libtorrent and tagging 0.5.6.2

This commit is contained in:
Marcos Pinto 2007-10-31 07:49:48 +00:00
parent 5ad442341f
commit 3ab044409f
17 changed files with 69 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,6 +1,8 @@
Deluge 0.5.6.2 (31 October 2007)
* Set default piece size to 256-KiB in TorrentCreator plugin and add 2048KiB
as a size option.
* Fix a bug in Debian package that caused the UI to completely freeze when a
torrent finished
* Find and fix another shutdown bug that mostly Gutsy users were incountering
* Fix a couple of WebUI bugs, including the "index" page erroring out

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

@ -375,6 +375,12 @@ namespace libtorrent
// buffers from.
boost::pool<> m_send_buffers;
// this is where all active sockets are stored.
// the selector can sleep while there's no activity on
// them
io_service m_io_service;
asio::strand m_strand;
// the file pool that all storages in this session's
// torrents uses. It sets a limit on the number of
// open files by this session.
@ -389,12 +395,6 @@ namespace libtorrent
// object.
disk_io_thread m_disk_thread;
// this is where all active sockets are stored.
// the selector can sleep while there's no activity on
// them
io_service m_io_service;
asio::strand m_strand;
// this is a list of half-open tcp connections
// (only outgoing connections)
// this has to be one of the last
@ -646,7 +646,7 @@ namespace libtorrent
void debug_log(const std::string& line)
{
(*m_ses.m_logger) << time_now_string() << " " << line << "\n";
(*m_ses.m_logger) << line << "\n";
}
session_impl& m_ses;
};

1
libtorrent/include/libtorrent/connection_queue.hpp
View File

@ -56,7 +56,6 @@ public:
void done(int ticket);
void limit(int limit);
int limit() const;
void close();
#ifndef NDEBUG

2
libtorrent/include/libtorrent/http_tracker_connection.hpp
View File

@ -130,8 +130,6 @@ namespace libtorrent
, proxy_settings const& ps
, std::string const& password = "");
void close();
private:
boost::intrusive_ptr<http_tracker_connection> self()

2
libtorrent/include/libtorrent/tracker_manager.hpp
View File

@ -202,7 +202,7 @@ namespace libtorrent
void fail(int code, char const* msg);
void fail_timeout();
virtual void close();
void close();
address const& bind_interface() const { return m_bind_interface; }
protected:

2
libtorrent/include/libtorrent/udp_tracker_connection.hpp
View File

@ -74,8 +74,6 @@ namespace libtorrent
, boost::weak_ptr<request_callback> c
, session_settings const& stn);
void close();
private:
enum action_t

5
libtorrent/src/connection_queue.cpp
View File

@ -86,11 +86,6 @@ namespace libtorrent
try_connect();
}
void connection_queue::close()
{
m_timer.cancel();
}
void connection_queue::limit(int limit)
{ m_half_open_limit = limit; }

17
libtorrent/src/http_tracker_connection.cpp
View File

@ -489,9 +489,7 @@ namespace libtorrent
, boost::lexical_cast<std::string>(m_port));
m_name_lookup.async_resolve(q, m_strand.wrap(
boost::bind(&http_tracker_connection::name_lookup, self(), _1, _2)));
set_timeout(req.event == tracker_request::stopped
? m_settings.stop_tracker_timeout
: m_settings.tracker_completion_timeout
set_timeout(m_settings.tracker_completion_timeout
, m_settings.tracker_receive_timeout);
}
@ -505,17 +503,6 @@ namespace libtorrent
fail_timeout();
}
void http_tracker_connection::close()
{
asio::error_code ec;
m_socket.close(ec);
m_name_lookup.cancel();
if (m_connection_ticket > -1) m_cc.done(m_connection_ticket);
m_connection_ticket = -1;
m_timed_out = true;
tracker_connection::close();
}
void http_tracker_connection::name_lookup(asio::error_code const& error
, tcp::resolver::iterator i) try
{
@ -772,6 +759,7 @@ namespace libtorrent
if (m_parser.status_code() != 200)
{
fail(m_parser.status_code(), m_parser.message().c_str());
close();
return;
}
@ -833,7 +821,6 @@ namespace libtorrent
TORRENT_ASSERT(false);
}
#endif
close();
}
peer_entry http_tracker_connection::extract_peer_info(const entry& info)

51
libtorrent/src/session_impl.cpp
View File

@ -547,8 +547,8 @@ namespace detail
, fingerprint const& cl_fprint
, char const* listen_interface)
: m_send_buffers(send_buffer_size)
, m_files(40)
, m_strand(m_io_service)
, m_files(40)
, m_half_open(m_io_service)
, m_download_channel(m_io_service, peer_connection::download_channel)
, m_upload_channel(m_io_service, peer_connection::upload_channel)
@ -675,17 +675,6 @@ namespace detail
if (m_dht) m_dht->stop();
#endif
m_timer.cancel();
// close the listen sockets
for (std::list<listen_socket_t>::iterator i = m_listen_sockets.begin()
, end(m_listen_sockets.end()); i != end; ++i)
{
i->sock->close();
}
#if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING)
(*m_logger) << time_now_string() << " aborting all torrents\n";
#endif
// abort all torrents
for (torrent_map::iterator i = m_torrents.begin()
, end(m_torrents.end()); i != end; ++i)
@ -693,25 +682,7 @@ namespace detail
i->second->abort();
}
#if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING)
(*m_logger) << time_now_string() << " aborting all connections\n";
#endif
// abort all connections
for (connection_map::iterator i = m_connections.begin()
, end(m_connections.end()); i != end; ++i)
{
i->second->disconnect();
}
#if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING)
(*m_logger) << time_now_string() << " aborting all tracker requests\n";
#endif
m_tracker_manager.abort_all_requests();
#if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING)
(*m_logger) << time_now_string() << " shutting down connection queue\n";
#endif
m_half_open.close();
m_io_service.stop();
mutex::scoped_lock l2(m_checker_impl.m_mutex);
// abort the checker thread
@ -1514,12 +1485,20 @@ namespace detail
while (!m_abort);
deadline_timer tracker_timer(m_io_service);
// this will remove the port mappings
if (m_natpmp.get())
m_natpmp->close();
if (m_upnp.get())
m_upnp->close();
#if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING)
(*m_logger) << time_now_string() << " locking mutex\n";
#endif
session_impl::mutex_t::scoped_lock l(m_mutex);
#if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING)
(*m_logger) << time_now_string() << " aborting all tracker requests\n";
#endif
m_tracker_manager.abort_all_requests();
#if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING)
(*m_logger) << time_now_string() << " sending stopped to all torrent's trackers\n";
@ -2122,8 +2101,8 @@ namespace detail
entry session_impl::dht_state() const
{
TORRENT_ASSERT(m_dht);
mutex_t::scoped_lock l(m_mutex);
if (!m_dht) return entry();
return m_dht->state();
}
@ -2159,10 +2138,16 @@ namespace detail
session_impl::~session_impl()
{
abort();
#if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING)
(*m_logger) << time_now_string() << "\n\n *** shutting down session *** \n\n";
#endif
abort();
// lock the main thread and abort it
mutex_t::scoped_lock l(m_mutex);
m_abort = true;
m_io_service.stop();
l.unlock();
#if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING)
(*m_logger) << time_now_string() << " waiting for main thread\n";

2
libtorrent/src/torrent.cpp
View File

@ -3055,7 +3055,7 @@ namespace libtorrent
#if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING)
void torrent::debug_log(const std::string& line)
{
(*m_ses.m_logger) << time_now_string() << " " << line << "\n";
(*m_ses.m_logger) << line << "\n";
}
#endif

9
libtorrent/src/tracker_manager.cpp
View File

@ -302,12 +302,12 @@ namespace libtorrent
{
m_completion_timeout = completion_timeout;
m_read_timeout = read_timeout;
m_start_time = m_read_time = time_now();
m_start_time = time_now();
m_read_time = time_now();
m_timeout.expires_at((std::min)(
m_read_time + seconds(m_read_timeout)
, m_start_time + seconds((std::min)(m_completion_timeout
, m_read_timeout))));
, m_start_time + seconds(m_completion_timeout)));
m_timeout.async_wait(m_strand.wrap(bind(
&timeout_handler::timeout_callback, self(), _1)));
}
@ -343,8 +343,7 @@ namespace libtorrent
m_timeout.expires_at((std::min)(
m_read_time + seconds(m_read_timeout)
, m_start_time + seconds((std::min)(m_completion_timeout
, m_read_timeout))));
, m_start_time + seconds(m_completion_timeout)));
m_timeout.async_wait(m_strand.wrap(
bind(&timeout_handler::timeout_callback, self(), _1)));
}

18
libtorrent/src/udp_tracker_connection.cpp
View File

@ -96,9 +96,7 @@ namespace libtorrent
m_name_lookup.async_resolve(q
, m_strand.wrap(boost::bind(
&udp_tracker_connection::name_lookup, self(), _1, _2)));
set_timeout(req.event == tracker_request::stopped
? m_settings.stop_tracker_timeout
: m_settings.tracker_completion_timeout
set_timeout(m_settings.tracker_completion_timeout
, m_settings.tracker_receive_timeout);
}
@ -158,20 +156,11 @@ namespace libtorrent
void udp_tracker_connection::on_timeout()
{
asio::error_code ec;
m_socket.close(ec);
m_socket.close();
m_name_lookup.cancel();
fail_timeout();
}
void udp_tracker_connection::close()
{
asio::error_code ec;
m_socket.close(ec);
m_name_lookup.cancel();
tracker_connection::close();
}
void udp_tracker_connection::send_udp_connect()
{
#if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING)
@ -479,7 +468,6 @@ namespace libtorrent
, complete, incomplete);
m_man.remove_request(this);
close();
return;
}
catch (std::exception& e)
@ -555,7 +543,6 @@ namespace libtorrent
if (!cb)
{
m_man.remove_request(this);
close();
return;
}
@ -564,7 +551,6 @@ namespace libtorrent
, complete, incomplete);
m_man.remove_request(this);
close();
}
catch (std::exception& e)
{

2
setup.py
View File

@ -28,7 +28,7 @@
NAME = "deluge"
FULLNAME = "Deluge BitTorrent Client"
VERSION = "0.5.6.15"
VERSION = "0.5.6.25"
AUTHOR = "Zach Tibbitts, Alon Zakai, Marcos Pinto, Andrew Resch, Alex Dedul"
EMAIL = "zach@collegegeek.org, kripkensteiner@gmail.com, marcospinto@dipconsultants.com, alonzakai@gmail.com, rotmer@gmail.com"
DESCRIPTION = "A bittorrent client written in PyGTK"

2
src/common.py
View File

@ -32,7 +32,7 @@ import os
import xdg.BaseDirectory
PROGRAM_NAME = "Deluge"
PROGRAM_VERSION = "0.5.6.15"
PROGRAM_VERSION = "0.5.6.25"
CLIENT_CODE = "DE"
CLIENT_VERSION = "".join(PROGRAM_VERSION.split('.'))+"0"*(4 - len(PROGRAM_VERSION.split('.')))