jiigen666/libtorrent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improved struct layout debug logging and optimized some structs

Browse Source
This commit is contained in:
Arvid Norberg
2011-09-21 09:27:07 +00:00
parent 61ceacca9b
commit 7a50255865
10 changed files with 199 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/session_impl.cpp
View File

@@ -82,9 +82,6 @@ POSSIBILITY OF SUCH DAMAGE.
#include "libtorrent/extensions.hpp"
#include "libtorrent/random.hpp"
#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
#endif
#ifndef TORRENT_WINDOWS
#include <sys/resource.h>
#endif
@@ -93,6 +90,7 @@ POSSIBILITY OF SUCH DAMAGE.
// for logging stat layout
#include "libtorrent/stat.hpp"
#include "libtorrent/struct_debug.hpp"
// for logging the size of DHT structures
#ifndef TORRENT_DISABLE_DHT
@@ -670,35 +668,43 @@ namespace aux {
, LIBTORRENT_REVISION);
(*m_logger) << tmp;
logger& l = *m_logger;
#define PRINT_SIZEOF(x) snprintf(tmp, sizeof(tmp), "sizeof(" #x ") = %d\n", int(sizeof(x))); (*m_logger) << tmp;
#define PRINT_OFFSETOF(x, y) snprintf(tmp, sizeof(tmp), " offsetof(" #x "," #y "): %d\n", int(offsetof(x, y))); \
(*m_logger) << tmp;
PRINT_SIZEOF(internal_file_entry)
int temp = 0;
int prev_size = 0;
PRINT_SIZEOF(announce_entry)
PRINT_OFFSETOF(announce_entry, url)
PRINT_OFFSETOF(announce_entry, trackerid)
PRINT_OFFSETOF(announce_entry, message)
PRINT_OFFSETOF(announce_entry, last_error)
PRINT_OFFSETOF(announce_entry, next_announce)
PRINT_OFFSETOF(announce_entry, min_announce)
PRINT_OFFSETOF(announce_entry, tier)
PRINT_OFFSETOF(announce_entry, fail_limit)
PRINT_OFFSETOF_END(announce_entry)
PRINT_SIZEOF(torrent_info)
PRINT_OFFSETOF(torrent_info, m_refs)
PRINT_OFFSETOF(torrent_info, m_merkle_first_leaf)
PRINT_OFFSETOF(torrent_info, m_files)
PRINT_OFFSETOF(torrent_info, m_orig_files)
PRINT_OFFSETOF(torrent_info, m_urls)
PRINT_OFFSETOF(torrent_info, m_web_seeds)
PRINT_OFFSETOF(torrent_info, m_nodes)
PRINT_OFFSETOF(torrent_info, m_merkle_tree)
PRINT_OFFSETOF(torrent_info, m_info_section)
PRINT_OFFSETOF(torrent_info, m_piece_hashes)
PRINT_OFFSETOF(torrent_info, m_info_dict)
PRINT_OFFSETOF(torrent_info, m_creation_date)
PRINT_OFFSETOF(torrent_info, m_comment)
PRINT_OFFSETOF(torrent_info, m_created_by)
#ifdef TORRENT_USE_OPENSSL
PRINT_OFFSETOF(torrent_info, m_ssl_root_cert)
PRINT_OFFSETOF(torrent_info, m_aes_key)
#endif
PRINT_OFFSETOF(torrent_info, m_info_dict)
PRINT_OFFSETOF(torrent_info, m_creation_date)
PRINT_OFFSETOF(torrent_info, m_info_hash)
PRINT_OFFSETOF_END(torrent_info)
PRINT_SIZEOF(union_endpoint)
PRINT_SIZEOF(request_callback)
@@ -708,6 +714,23 @@ namespace aux {
(*m_logger) << "sizeof(utp_socket_impl): " << socket_impl_size() << "\n";
PRINT_SIZEOF(file_entry)
PRINT_SIZEOF(internal_file_entry)
PRINT_OFFSETOF(internal_file_entry, name)
PRINT_OFFSETOF(internal_file_entry, path_index)
PRINT_OFFSETOF_END(internal_file_entry)
PRINT_SIZEOF(file_storage)
PRINT_OFFSETOF(file_storage, m_files)
PRINT_OFFSETOF(file_storage, m_file_hashes)
PRINT_OFFSETOF(file_storage, m_symlinks)
PRINT_OFFSETOF(file_storage, m_mtime)
PRINT_OFFSETOF(file_storage, m_file_base)
PRINT_OFFSETOF(file_storage, m_paths)
PRINT_OFFSETOF(file_storage, m_name)
PRINT_OFFSETOF(file_storage, m_total_size)
PRINT_OFFSETOF(file_storage, m_num_pieces)
PRINT_OFFSETOF(file_storage, m_piece_length)
PRINT_OFFSETOF_END(file_storage)
// PRINT_SIZEOF(stat_channel)
// PRINT_OFFSETOF(stat_channel, m_counter)
@@ -731,11 +754,22 @@ namespace aux {
#endif
PRINT_SIZEOF(policy::peer)
PRINT_OFFSETOF(policy::peer, prev_amount_upload)
PRINT_OFFSETOF(policy::peer, prev_amount_download)
PRINT_OFFSETOF(policy::peer, connection)
#ifndef TORRENT_DISABLE_GEO_IP
#ifdef TORRENT_DEBUG
PRINT_OFFSETOF(policy::peer, inet_as_num)
#endif
PRINT_OFFSETOF(policy::peer, inet_as)
#endif
PRINT_OFFSETOF(policy::peer, last_optimistically_unchoked)
PRINT_OFFSETOF(policy::peer, last_connected)
PRINT_OFFSETOF(policy::peer, port)
PRINT_OFFSETOF(policy::peer, upload_rate_limit)
PRINT_OFFSETOF(policy::peer, download_rate_limit)
PRINT_OFFSETOF(policy::peer, hashfails)
PRINT_OFFSETOF_END(policy::peer)
PRINT_SIZEOF(policy::ipv4_peer)
#if TORRENT_USE_IPV6
@@ -744,13 +778,16 @@ namespace aux {
PRINT_SIZEOF(udp_socket)
PRINT_OFFSETOF(udp_socket, m_callback)
PRINT_OFFSETOF(udp_socket, m_callback2)
PRINT_OFFSETOF(udp_socket, m_ipv4_sock)
PRINT_OFFSETOF(udp_socket, m_v4_ep)
PRINT_OFFSETOF(udp_socket, m_v4_buf)
PRINT_OFFSETOF(udp_socket, m_reallocate_buffer4)
#if TORRENT_USE_IPV6
PRINT_OFFSETOF(udp_socket, m_ipv6_sock)
PRINT_OFFSETOF(udp_socket, m_v6_ep)
PRINT_OFFSETOF(udp_socket, m_v6_buf)
PRINT_OFFSETOF(udp_socket, m_reallocate_buffer6)
#endif
PRINT_OFFSETOF(udp_socket, m_bind_port)
PRINT_OFFSETOF(udp_socket, m_v4_outstanding)
@@ -770,19 +807,34 @@ namespace aux {
PRINT_OFFSETOF(udp_socket, m_abort)
PRINT_OFFSETOF(udp_socket, m_proxy_addr)
PRINT_OFFSETOF(udp_socket, m_queue)
PRINT_OFFSETOF(udp_socket, m_outstanding_ops)
#ifdef TORRENT_DEBUG
PRINT_OFFSETOF(udp_socket, m_started)
PRINT_OFFSETOF(udp_socket, m_magic)
PRINT_OFFSETOF(udp_socket, m_outstanding_when_aborted)
#endif
PRINT_OFFSETOF_END(udp_socket)
PRINT_SIZEOF(tracker_connection)
PRINT_SIZEOF(http_tracker_connection)
PRINT_SIZEOF(udp_tracker_connection)
PRINT_OFFSETOF(udp_tracker_connection, m_refs)
PRINT_OFFSETOF(udp_tracker_connection, m_start_time)
PRINT_OFFSETOF(udp_tracker_connection, m_read_time)
PRINT_OFFSETOF(udp_tracker_connection, m_timeout)
PRINT_OFFSETOF(udp_tracker_connection, m_completion_timeout)
PRINT_OFFSETOF(udp_tracker_connection, m_read_timeout)
PRINT_OFFSETOF(udp_tracker_connection, m_mutex)
PRINT_OFFSETOF(udp_tracker_connection, timeout_handler::m_abort)
PRINT_OFFSETOF(udp_tracker_connection, m_requester)
#ifndef _MSC_VER
PRINT_OFFSETOF(udp_tracker_connection, m_man)
#endif
PRINT_OFFSETOF(udp_tracker_connection, m_req)
PRINT_OFFSETOF(udp_tracker_connection, m_abort)
PRINT_OFFSETOF(udp_tracker_connection, m_hostname)
PRINT_OFFSETOF(udp_tracker_connection, m_target)
@@ -794,12 +846,14 @@ namespace aux {
PRINT_OFFSETOF(udp_tracker_connection, m_attempts)
PRINT_OFFSETOF(udp_tracker_connection, m_state)
PRINT_OFFSETOF(udp_tracker_connection, m_proxy)
PRINT_OFFSETOF_END(udp_tracker_connection)
#ifndef TORRENT_DISABLE_DHT
PRINT_SIZEOF(dht::find_data_observer)
PRINT_SIZEOF(dht::announce_observer)
PRINT_SIZEOF(dht::null_observer)
#endif
#undef PRINT_OFFSETOF_END
#undef PRINT_OFFSETOF
#undef PRINT_SIZEOF

15
src/torrent.cpp
View File

@@ -88,6 +88,10 @@ POSSIBILITY OF SUCH DAMAGE.
//#include <boost/asio/ssl/verify_context.hpp>
#endif
#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
#include "libtorrent/struct_debug.hpp"
#endif
#if TORRENT_USE_IOSTREAM
#include <iostream>
#endif
@@ -208,14 +212,15 @@ namespace libtorrent
#if defined TORRENT_VERBOSE_LOGGING || defined TORRENT_LOGGING || defined TORRENT_ERROR_LOGGING
#define PRINT_SIZEOF(x) l << "sizeof(" #x "): " << sizeof(x) << "\n";
#define PRINT_OFFSETOF(x, y) l << " " << (offsetof(x, y) - temp) << " offsetof(" #x "," #y "): " << offsetof(x, y) << "\n"; temp = offsetof(x, y);
void torrent::print_size(logger& l)
{
char tmp[300];
int temp = 0;
int prev_size = 0;
PRINT_SIZEOF(torrent)
PRINT_OFFSETOF(torrent, m_tracker_address)
PRINT_OFFSETOF(torrent, m_manager)
PRINT_OFFSETOF(torrent, m_policy)
PRINT_OFFSETOF(torrent, m_total_uploaded)
PRINT_OFFSETOF(torrent, m_total_downloaded)
@@ -239,6 +244,10 @@ namespace libtorrent
PRINT_OFFSETOF(torrent, m_password)
PRINT_OFFSETOF(torrent, m_net_interfaces)
PRINT_OFFSETOF(torrent, m_save_path)
PRINT_OFFSETOF(torrent, m_url)
PRINT_OFFSETOF(torrent, m_uuid)
PRINT_OFFSETOF(torrent, m_source_feed_url)
PRINT_OFFSETOF(torrent, m_torrent_file_buf)
PRINT_OFFSETOF(torrent, m_verified)
PRINT_OFFSETOF(torrent, m_error)
PRINT_OFFSETOF(torrent, m_error_file)

36
src/torrent_info.cpp
View File

@@ -458,7 +458,8 @@ namespace libtorrent
}
torrent_info::torrent_info(torrent_info const& t, int flags)
: m_files(t.m_files)
: m_merkle_first_leaf(t.m_merkle_first_leaf)
, m_files(t.m_files)
, m_orig_files(t.m_orig_files)
, m_urls(t.m_urls)
, m_web_seeds(t.m_web_seeds)
@@ -473,7 +474,6 @@ namespace libtorrent
#endif
, m_creation_date(t.m_creation_date)
, m_info_hash(t.m_info_hash)
, m_merkle_first_leaf(t.m_merkle_first_leaf)
, m_info_section_size(t.m_info_section_size)
, m_multifile(t.m_multifile)
, m_private(t.m_private)
@@ -518,9 +518,9 @@ namespace libtorrent
#ifndef TORRENT_NO_DEPRECATE
// standard constructor that parses a torrent file
torrent_info::torrent_info(entry const& torrent_file)
: m_piece_hashes(0)
: m_merkle_first_leaf(0)
, m_piece_hashes(0)
, m_creation_date(0)
, m_merkle_first_leaf(0)
, m_info_section_size(0)
, m_multifile(false)
, m_private(false)
@@ -551,9 +551,9 @@ namespace libtorrent
#ifndef BOOST_NO_EXCEPTIONS
torrent_info::torrent_info(lazy_entry const& torrent_file, int flags)
: m_piece_hashes(0)
: m_merkle_first_leaf(0)
, m_piece_hashes(0)
, m_creation_date(0)
, m_merkle_first_leaf(0)
, m_info_section_size(0)
, m_multifile(false)
, m_private(false)
@@ -567,9 +567,9 @@ namespace libtorrent
}
torrent_info::torrent_info(char const* buffer, int size, int flags)
: m_piece_hashes(0)
: m_merkle_first_leaf(0)
, m_piece_hashes(0)
, m_creation_date(0)
, m_merkle_first_leaf(0)
, m_info_section_size(0)
, m_multifile(false)
, m_private(false)
@@ -611,9 +611,9 @@ namespace libtorrent
#if TORRENT_USE_WSTRING
torrent_info::torrent_info(std::wstring const& filename, int flags)
: m_piece_hashes(0)
: m_merkle_first_leaf(0)
, m_piece_hashes(0)
, m_creation_date(0)
, m_merkle_first_leaf(0)
, m_info_section_size(0)
, m_multifile(false)
, m_private(false)
@@ -652,9 +652,9 @@ namespace libtorrent
}
torrent_info::torrent_info(char const* buffer, int size, error_code& ec, int flags)
: m_piece_hashes(0)
: m_merkle_first_leaf(0)
, m_piece_hashes(0)
, m_creation_date(0)
, m_merkle_first_leaf(0)
, m_info_section_size(0)
, m_multifile(false)
, m_private(false)
@@ -669,9 +669,9 @@ namespace libtorrent
}
torrent_info::torrent_info(std::string const& filename, error_code& ec, int flags)
: m_piece_hashes(0)
: m_merkle_first_leaf(0)
, m_piece_hashes(0)
, m_creation_date(0)
, m_merkle_first_leaf(0)
, m_info_section_size(0)
, m_multifile(false)
, m_private(false)
@@ -691,9 +691,9 @@ namespace libtorrent
#if TORRENT_USE_WSTRING
torrent_info::torrent_info(std::wstring const& filename, error_code& ec, int flags)
: m_piece_hashes(0)
: m_merkle_first_leaf(0)
, m_piece_hashes(0)
, m_creation_date(0)
, m_merkle_first_leaf(0)
, m_info_section_size(0)
, m_multifile(false)
, m_private(false)
@@ -719,10 +719,10 @@ namespace libtorrent
// just the necessary to use it with piece manager
// used for torrents with no metadata
torrent_info::torrent_info(sha1_hash const& info_hash, int flags)
: m_piece_hashes(0)
: m_merkle_first_leaf(0)
, m_piece_hashes(0)
, m_creation_date(time(0))
, m_info_hash(info_hash)
, m_merkle_first_leaf(0)
, m_info_section_size(0)
, m_multifile(false)
, m_private(false)

2
src/udp_tracker_connection.cpp
View File

@@ -71,7 +71,7 @@ namespace libtorrent
, aux::session_impl& ses
, proxy_settings const& proxy)
: tracker_connection(man, req, ios, c)
, m_man(man)
// , m_man(man)
, m_abort(false)
, m_transaction_id(0)
, m_ses(ses)