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

memory usage optimization in policy::peer

This commit is contained in:
Arvid Norberg 2011-06-01 06:47:57 +00:00
parent 1a03764d5f
commit 0c35fde81c
3 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
include/libtorrent/policy.hpp
View File

@ -153,25 +153,24 @@ namespace libtorrent
// intended struct layout (on 32 bit architectures)
// offset size alignment field
// 0 12 1 prev_amount_upload, prev_amount_download
// 12 4 4 connection
// 16 2 2 last_optimistically_unchoked
// 18 2 2 last_connected
// 20 16 1 addr
// 36 2 2 port
// 38 2 2 upload_rate_limit
// 40 2 2 download_rate_limit
// 42 1 1 hashfails
// 43 1 1 failcount, connectable, optimistically_unchoked, seed
// 44 1 1 fast_reconnects, trust_points
// 45 1 1 source, pe_support, is_v6_addr
// 46 1 1 on_parole, banned, added_to_dht, supports_utp,
// 0 8 4 prev_amount_upload, prev_amount_download
// 8 4 4 connection
// 12 2 2 last_optimistically_unchoked
// 14 2 2 last_connected
// 16 16 1 addr
// 32 2 2 port
// 34 2 2 upload_rate_limit
// 36 2 2 download_rate_limit
// 38 1 1 hashfails
// 39 1 1 failcount, connectable, optimistically_unchoked, seed
// 40 1 1 fast_reconnects, trust_points
// 41 1 1 source, pe_support, is_v6_addr
// 42 1 1 on_parole, banned, added_to_dht, supports_utp,
// supports_holepunch
// 47 1 1 <padding>
// 48
// 43 1 1 <padding>
// 44
struct TORRENT_EXPORT peer
{
// peer();
peer(boost::uint16_t port, bool connectable, int src);
size_type total_download() const;
@ -191,14 +190,12 @@ namespace libtorrent
// total amount of upload and download
// we'll have to add thes figures with the
// statistics from the peer_connection.
// 48 bits can fit 256 Terabytes
#ifdef __SUNPRO_CC
unsigned prev_amount_upload:48;
unsigned prev_amount_download:48;
#else
boost::uint64_t prev_amount_upload:48;
boost::uint64_t prev_amount_download:48;
#endif
// since these values don't need to be stored
// with byte-precision, they specify the number
// of kiB. i.e. shift left 10 bits to compare to
// byte counters.
boost::uint32_t prev_amount_upload;
boost::uint32_t prev_amount_download;
// if the peer is connected now, this
// will refer to a valid peer_connection

6
src/policy.cpp
View File

@ -917,7 +917,7 @@ namespace libtorrent
TORRENT_ASSERT(i);
c.set_peer_info(i);
TORRENT_ASSERT(i->connection == 0);
c.add_stat(i->prev_amount_download, i->prev_amount_upload);
c.add_stat(size_type(i->prev_amount_download) << 10, size_type(i->prev_amount_upload) << 10);
// restore transfer rate limits
int rate_limit;
@ -1651,7 +1651,7 @@ namespace libtorrent
}
else
{
return prev_amount_download;
return size_type(prev_amount_download) << 10;
}
}
@ -1664,7 +1664,7 @@ namespace libtorrent
}
else
{
return prev_amount_upload;
return size_type(prev_amount_upload) << 10;
}
}

7
src/torrent.cpp
View File

@ -3855,8 +3855,8 @@ namespace libtorrent
}
TORRENT_ASSERT(pp->prev_amount_upload == 0);
TORRENT_ASSERT(pp->prev_amount_download == 0);
pp->prev_amount_download += p->statistics().total_payload_download();
pp->prev_amount_upload += p->statistics().total_payload_upload();
pp->prev_amount_download += p->statistics().total_payload_download() >> 10;
pp->prev_amount_upload += p->statistics().total_payload_upload() >> 10;
}
m_policy.connection_closed(*p, m_ses.session_time());
@ -5017,7 +5017,8 @@ namespace libtorrent
if (settings().default_peer_download_rate)
c->set_download_limit(settings().default_peer_download_rate);
c->add_stat(peerinfo->prev_amount_download, peerinfo->prev_amount_upload);
c->add_stat(size_type(peerinfo->prev_amount_download) << 10
, size_type(peerinfo->prev_amount_upload) << 10);
peerinfo->prev_amount_download = 0;
peerinfo->prev_amount_upload = 0;