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

reduced the number of floating point operations to better support systems with no FPU

Browse Source
This commit is contained in:
Arvid Norberg 2009-07-19 04:59:27 +00:00
parent 18b911768c
commit ae3be201c4
21 changed files with 217 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,3 +1,5 @@
* reduced the number of floating point operations (to better support
systems without FPU)
* added new alert when individual files complete * added new alert when individual files complete
* added support for storing symbolic links in .torrent files * added support for storing symbolic links in .torrent files
* added support for uTorrent interpretation of multi-tracker torrents * added support for uTorrent interpretation of multi-tracker torrents

3
bindings/python/src/torrent_status.cpp
View File

@ -25,6 +25,7 @@ void bind_torrent_status()
.def_readonly("state", &torrent_status::state) .def_readonly("state", &torrent_status::state)
.def_readonly("paused", &torrent_status::paused) .def_readonly("paused", &torrent_status::paused)
.def_readonly("progress", &torrent_status::progress) .def_readonly("progress", &torrent_status::progress)
.def_readonly("progress_ppm", &torrent_status::progress_ppm)
.add_property( .add_property(
"next_announce" "next_announce"
, make_getter( , make_getter(
@ -59,6 +60,8 @@ void bind_torrent_status()
.def_readonly("total_done", &torrent_status::total_done) .def_readonly("total_done", &torrent_status::total_done)
.def_readonly("total_wanted_done", &torrent_status::total_wanted_done) .def_readonly("total_wanted_done", &torrent_status::total_wanted_done)
.def_readonly("total_wanted", &torrent_status::total_wanted) .def_readonly("total_wanted", &torrent_status::total_wanted)
.def_readonly("distributed_full_copies", &torrent_status::distributed_full_copies)
.def_readonly("distributed_fraction", &torrent_status::distributed_fraction)
.def_readonly("distributed_copies", &torrent_status::distributed_copies) .def_readonly("distributed_copies", &torrent_status::distributed_copies)
.def_readonly("block_size", &torrent_status::block_size) .def_readonly("block_size", &torrent_status::block_size)
.def_readonly("num_uploads", &torrent_status::num_uploads) .def_readonly("num_uploads", &torrent_status::num_uploads)

83
docs/manual.rst
View File

@ -652,28 +652,28 @@ struct has the following members::
{ {
bool has_incoming_connections; bool has_incoming_connections;
float upload_rate; int upload_rate;
float download_rate; int download_rate;
size_type total_download; size_type total_download;
size_type total_upload; size_type total_upload;
float payload_upload_rate; int payload_upload_rate;
float payload_download_rate; int payload_download_rate;
size_type total_payload_download; size_type total_payload_download;
size_type total_payload_upload; size_type total_payload_upload;
float ip_overhead_upload_rate; int ip_overhead_upload_rate;
float ip_overhead_download_rate; int ip_overhead_download_rate;
size_type total_ip_overhead_download; size_type total_ip_overhead_download;
size_type total_ip_overhead_upload; size_type total_ip_overhead_upload;
float dht_upload_rate; int dht_upload_rate;
float dht_download_rate; int dht_download_rate;
size_type total_dht_download; size_type total_dht_download;
size_type total_dht_upload; size_type total_dht_upload;
float tracker_upload_rate; int tracker_upload_rate;
float tracker_download_rate; int tracker_download_rate;
size_type total_tracker_download; size_type total_tracker_download;
size_type total_tracker_upload; size_type total_tracker_upload;
@ -2767,6 +2767,7 @@ It contains the following fields::
state_t state; state_t state;
bool paused; bool paused;
float progress; float progress;
int progress_ppm;
std::string error; std::string error;
boost::posix_time::time_duration next_announce; boost::posix_time::time_duration next_announce;
@ -2783,11 +2784,11 @@ It contains the following fields::
size_type total_failed_bytes; size_type total_failed_bytes;
size_type total_redundant_bytes; size_type total_redundant_bytes;
float download_rate; int download_rate;
float upload_rate; int upload_rate;
float download_payload_rate; int download_payload_rate;
float upload_payload_rate; int upload_payload_rate;
int num_peers; int num_peers;
@ -2807,6 +2808,10 @@ It contains the following fields::
size_type total_wanted; size_type total_wanted;
int num_seeds; int num_seeds;
int distributed_full_copies;
int distributed_fraction;
float distributed_copies; float distributed_copies;
int block_size; int block_size;
@ -2841,8 +2846,13 @@ It contains the following fields::
}; };
``progress`` is a value in the range [0, 1], that represents the progress of the ``progress`` is a value in the range [0, 1], that represents the progress of the
torrent's current task. It may be checking files or downloading. The torrent's torrent's current task. It may be checking files or downloading.
current task is in the ``state`` member, it will be one of the following:
``progress_ppm`` reflects the same value as ``progress``, but instead in a range
[0, 1000000] (ppm = parts per million). When floating point operations are disabled,
this is the only alternative to the floating point value in ``progress``.
The torrent's current task is in the ``state`` member, it will be one of the following:
+--------------------------+----------------------------------------------------------+ +--------------------------+----------------------------------------------------------+
|``checking_resume_data`` |The torrent is currently checking the fastresume data and | |``checking_resume_data`` |The torrent is currently checking the fastresume data and |
@ -2969,17 +2979,27 @@ excluding pieces that have been filtered.
``num_seeds`` is the number of peers that are seeding that this client is ``num_seeds`` is the number of peers that are seeding that this client is
currently connected to. currently connected to.
``distributed_copies`` is the number of distributed copies of the torrent. ``distributed_full_copies`` is the number of distributed copies of the torrent.
Note that one copy may be spread out among many peers. The integer part Note that one copy may be spread out among many peers. It tells how many copies
tells how many copies there are currently of the rarest piece(s) among the there are currently of the rarest piece(s) among the peers this client is
peers this client is connected to. The fractional part tells the share of connected to.
pieces that have more copies than the rarest piece(s). For example: 2.5 would
mean that the rarest pieces have only 2 copies among the peers this torrent is ``distributed_fraction`` tells the share of pieces that have more copies than
connected to, and that 50% of all the pieces have more than two copies. the rarest piece(s). Divide this number by 1000 to get the fraction.
For example, if ``distributed_full_copies`` is 2 and ``distrbuted_fraction``
is 500, it means that the rarest pieces have only 2 copies among the peers
this torrent is connected to, and that 50% of all the pieces have more than
two copies.
If we are a seed, the piece picker is deallocated as an optimization, and If we are a seed, the piece picker is deallocated as an optimization, and
piece availability is no longer tracked. In this case the distributed piece availability is no longer tracked. In this case the distributed
copies is set to -1. copies members are set to -1.
``distributed_copies`` is a floating point representation of the
``distributed_full_copies`` as the integer part and ``distributed_fraction``
/ 1000 as the fraction part. If floating point operations are disabled
this value is always -1.
``block_size`` is the size of a block, in bytes. A block is a sub piece, it ``block_size`` is the size of a block, in bytes. A block is a sub piece, it
is the number of bytes that each piece request asks for and the number of is the number of bytes that each piece request asks for and the number of
@ -3089,10 +3109,10 @@ It contains the following fields::
char write_state; char write_state;
asio::ip::tcp::endpoint ip; asio::ip::tcp::endpoint ip;
float up_speed; int up_speed;
float down_speed; int down_speed;
float payload_up_speed; int payload_up_speed;
float payload_down_speed; int payload_down_speed;
size_type total_download; size_type total_download;
size_type total_upload; size_type total_upload;
peer_id pid; peer_id pid;
@ -3154,6 +3174,7 @@ It contains the following fields::
int upload_rate_peak; int upload_rate_peak;
float progress; float progress;
int progress_ppm;
}; };
The ``flags`` attribute tells you in which state the peer is. It is set to The ``flags`` attribute tells you in which state the peer is. It is set to
@ -3373,7 +3394,11 @@ estimated by timing the the tcp ``connect()``. It may be 0 for incoming connecti
rates seen on this connection. They are given in bytes per second. This number is rates seen on this connection. They are given in bytes per second. This number is
reset to 0 on reconnect. reset to 0 on reconnect.
``progress`` is the progress of the peer. ``progress`` is the progress of the peer in the range [0, 1]. This is always 0 when
floating point operations are diabled, instead use ``progress_ppm``.
``progress_ppm`` indicates the download progress of the peer in the range [0, 1000000]
(parts per million).
session customization session customization
===================== =====================

14
examples/client_test.cpp
View File

@ -304,13 +304,13 @@ std::string const& piece_bar(libtorrent::bitfield const& p, int width)
return bar; return bar;
} }
std::string const& progress_bar(float progress, int width, char const* code = "33") std::string const& progress_bar(int progress, int width, char const* code = "33")
{ {
static std::string bar; static std::string bar;
bar.clear(); bar.clear();
bar.reserve(width + 10); bar.reserve(width + 10);
int progress_chars = static_cast<int>(progress * width + .5f); int progress_chars = (progress * width + 500) / 1000;
bar = esc(code); bar = esc(code);
std::fill_n(std::back_inserter(bar), progress_chars, '#'); std::fill_n(std::back_inserter(bar), progress_chars, '#');
bar += esc("0"); bar += esc("0");
@ -443,11 +443,11 @@ void print_peer_info(std::string& out, std::vector<libtorrent::peer_info> const&
if (i->downloading_piece_index >= 0) if (i->downloading_piece_index >= 0)
{ {
out += progress_bar( out += progress_bar(
i->downloading_progress / float(i->downloading_total), 14); i->downloading_progress * 1000 / i->downloading_total, 14);
} }
else else
{ {
out += progress_bar(0.f, 14); out += progress_bar(0, 14);
} }
} }
@ -1298,7 +1298,7 @@ int main(int argc, char* argv[])
, sequential_download?"sequential":"progress" , sequential_download?"sequential":"progress"
, esc("32"), s.total_done, esc("0") , esc("32"), s.total_done, esc("0")
, s.progress*100.f , s.progress*100.f
, progress_bar(s.progress, terminal_width - 42, progress_bar_color).c_str()); , progress_bar(s.progress_ppm / 1000, terminal_width - 42, progress_bar_color).c_str());
out += str; out += str;
if (print_piece_bar && s.progress < 1.f) if (print_piece_bar && s.progress < 1.f)
@ -1521,8 +1521,8 @@ int main(int argc, char* argv[])
{ {
bool pad_file = info.file_at(i).pad_file; bool pad_file = info.file_at(i).pad_file;
if (!show_pad_files && pad_file) continue; if (!show_pad_files && pad_file) continue;
float progress = info.file_at(i).size > 0 int progress = info.file_at(i).size > 0
?float(file_progress[i]) / info.file_at(i).size:1; ?file_progress[i] * 1000 / info.file_at(i).size:1000;
char const* color = (file_progress[i] == info.file_at(i).size) char const* color = (file_progress[i] == info.file_at(i).size)
?"32":"33"; ?"32":"33";

8
include/libtorrent/config.hpp
View File

@ -119,6 +119,10 @@ POSSIBILITY OF SUCH DAMAGE.
#define TORRENT_USE_WPATH 0 #define TORRENT_USE_WPATH 0
#endif #endif
// set this to 1 to disable all floating point operations
// (disables some float-dependent APIs)
#define TORRENT_NO_FPU 1
#ifdef TORRENT_WINDOWS #ifdef TORRENT_WINDOWS
#include <stdarg.h> #include <stdarg.h>
// this is the maximum number of characters in a // this is the maximum number of characters in a
@ -154,6 +158,10 @@ inline int snprintf(char* buf, int len, char const* fmt, ...)
# define TORRENT_WRITE_HANDLER_MAX_SIZE 256 # define TORRENT_WRITE_HANDLER_MAX_SIZE 256
#endif #endif
#if defined _MSC_VER && _MSC_VER <= 1200
#define for if (false) {} else for
#endif
// determine what timer implementation we can use // determine what timer implementation we can use
#if defined(__MACH__) #if defined(__MACH__)

2
include/libtorrent/peer_connection.hpp
View File

@ -293,7 +293,7 @@ namespace libtorrent
void add_stat(size_type downloaded, size_type uploaded); void add_stat(size_type downloaded, size_type uploaded);
// is called once every second by the main loop // is called once every second by the main loop
void second_tick(float tick_interval); void second_tick(int tick_interval_ms);
void timeout_requests(); void timeout_requests();

11
include/libtorrent/peer_info.hpp
View File

@ -94,10 +94,10 @@ namespace libtorrent
char write_state; char write_state;
tcp::endpoint ip; tcp::endpoint ip;
float up_speed; int up_speed;
float down_speed; int down_speed;
float payload_up_speed; int payload_up_speed;
float payload_down_speed; int payload_down_speed;
size_type total_download; size_type total_download;
size_type total_upload; size_type total_upload;
peer_id pid; peer_id pid;
@ -211,7 +211,8 @@ namespace libtorrent
int upload_rate_peak; int upload_rate_peak;
// the peers progress // the peers progress
float progress; float progress; // [0, 1]
int progress_ppm; // [0, 1000000]
}; };
struct TORRENT_EXPORT peer_list_entry struct TORRENT_EXPORT peer_list_entry

2
include/libtorrent/piece_picker.hpp
View File

@ -336,7 +336,7 @@ namespace libtorrent
int blocks_in_last_piece() const int blocks_in_last_piece() const
{ return m_blocks_in_last_piece; } { return m_blocks_in_last_piece; }
float distributed_copies() const; std::pair<int, int> distributed_copies() const;
private: private:

4
include/libtorrent/session_settings.hpp
View File

@ -89,7 +89,7 @@ namespace libtorrent
, tracker_maximum_response_length(1024*1024) , tracker_maximum_response_length(1024*1024)
, piece_timeout(20) , piece_timeout(20)
, request_timeout(50) , request_timeout(50)
, request_queue_time(3.f) , request_queue_time(3)
, max_allowed_in_request_queue(250) , max_allowed_in_request_queue(250)
, max_out_request_queue(200) , max_out_request_queue(200)
, whole_pieces_threshold(20) , whole_pieces_threshold(20)
@ -214,7 +214,7 @@ namespace libtorrent
// of seconds it should take for the other end to send // of seconds it should take for the other end to send
// all the pieces. i.e. the actual number of requests // all the pieces. i.e. the actual number of requests
// depends on the download rate and this number. // depends on the download rate and this number.
float request_queue_time; int request_queue_time;
// the number of outstanding block requests a peer is // the number of outstanding block requests a peer is
// allowed to queue up in the client. If a peer sends // allowed to queue up in the client. If a peer sends

20
include/libtorrent/session_status.hpp
View File

@ -56,28 +56,28 @@ namespace libtorrent
{ {
bool has_incoming_connections; bool has_incoming_connections;
float upload_rate; int upload_rate;
float download_rate; int download_rate;
size_type total_download; size_type total_download;
size_type total_upload; size_type total_upload;
float payload_upload_rate; int payload_upload_rate;
float payload_download_rate; int payload_download_rate;
size_type total_payload_download; size_type total_payload_download;
size_type total_payload_upload; size_type total_payload_upload;
float ip_overhead_upload_rate; int ip_overhead_upload_rate;
float ip_overhead_download_rate; int ip_overhead_download_rate;
size_type total_ip_overhead_download; size_type total_ip_overhead_download;
size_type total_ip_overhead_upload; size_type total_ip_overhead_upload;
float dht_upload_rate; int dht_upload_rate;
float dht_download_rate; int dht_download_rate;
size_type total_dht_download; size_type total_dht_download;
size_type total_dht_upload; size_type total_dht_upload;
float tracker_upload_rate; int tracker_upload_rate;
float tracker_download_rate; int tracker_download_rate;
size_type total_tracker_download; size_type total_tracker_download;
size_type total_tracker_upload; size_type total_tracker_upload;

22
include/libtorrent/stat.hpp
View File

@ -74,8 +74,8 @@ namespace libtorrent
} }
// should be called once every second // should be called once every second
void second_tick(float tick_interval); void second_tick(int tick_interval_ms);
float rate() const { return m_rate_sum / float(history); } int rate() const { return m_rate_sum / history; }
size_type rate_sum() const { return m_rate_sum; } size_type rate_sum() const { return m_rate_sum; }
size_type total() const { return m_total_counter; } size_type total() const { return m_total_counter; }
@ -208,28 +208,28 @@ namespace libtorrent
int upload_tracker() const { return m_stat[upload_tracker_protocol].counter(); } int upload_tracker() const { return m_stat[upload_tracker_protocol].counter(); }
// should be called once every second // should be called once every second
void second_tick(float tick_interval) void second_tick(int tick_interval_ms)
{ {
for (int i = 0; i < num_channels; ++i) for (int i = 0; i < num_channels; ++i)
m_stat[i].second_tick(tick_interval); m_stat[i].second_tick(tick_interval_ms);
} }
float upload_rate() const int upload_rate() const
{ {
return (m_stat[upload_payload].rate_sum() return (m_stat[upload_payload].rate_sum()
+ m_stat[upload_protocol].rate_sum() + m_stat[upload_protocol].rate_sum()
+ m_stat[upload_ip_protocol].rate_sum() + m_stat[upload_ip_protocol].rate_sum()
+ m_stat[upload_dht_protocol].rate_sum()) + m_stat[upload_dht_protocol].rate_sum())
/ float(stat_channel::history); / stat_channel::history;
} }
float download_rate() const int download_rate() const
{ {
return (m_stat[download_payload].rate_sum() return (m_stat[download_payload].rate_sum()
+ m_stat[download_protocol].rate_sum() + m_stat[download_protocol].rate_sum()
+ m_stat[download_ip_protocol].rate_sum() + m_stat[download_ip_protocol].rate_sum()
+ m_stat[download_dht_protocol].rate_sum()) + m_stat[download_dht_protocol].rate_sum())
/ float(stat_channel::history); / stat_channel::history;
} }
size_type total_upload() const size_type total_upload() const
@ -250,9 +250,9 @@ namespace libtorrent
+ m_stat[download_tracker_protocol].total(); + m_stat[download_tracker_protocol].total();
} }
float upload_payload_rate() const int upload_payload_rate() const
{ return m_stat[upload_payload].rate(); } { return m_stat[upload_payload].rate(); }
float download_payload_rate() const int download_payload_rate() const
{ return m_stat[download_payload].rate(); } { return m_stat[download_payload].rate(); }
size_type total_payload_upload() const size_type total_payload_upload() const
@ -267,7 +267,7 @@ namespace libtorrent
size_type total_transfer(int channel) const size_type total_transfer(int channel) const
{ return m_stat[channel].total(); } { return m_stat[channel].total(); }
float transfer_rate(int channel) const int transfer_rate(int channel) const
{ return m_stat[channel].rate(); } { return m_stat[channel].rate(); }
// this is used to offset the statistics when a // this is used to offset the statistics when a

4
include/libtorrent/time.hpp
View File

@ -121,9 +121,9 @@ namespace libtorrent
{ return lhs.diff > rhs.diff; } { return lhs.diff > rhs.diff; }
inline bool operator>=(time_duration lhs, time_duration rhs) inline bool operator>=(time_duration lhs, time_duration rhs)
{ return lhs.diff >= rhs.diff; } { return lhs.diff >= rhs.diff; }
inline time_duration operator*(time_duration lhs, float rhs) inline time_duration operator*(time_duration lhs, int rhs)
{ return time_duration(boost::int64_t(lhs.diff * rhs)); } { return time_duration(boost::int64_t(lhs.diff * rhs)); }
inline time_duration operator*(float lhs, time_duration rhs) inline time_duration operator*(int lhs, time_duration rhs)
{ return time_duration(boost::int64_t(lhs * rhs.diff)); } { return time_duration(boost::int64_t(lhs * rhs.diff)); }
// libtorrent time type // libtorrent time type

6
include/libtorrent/torrent.hpp
View File

@ -206,7 +206,7 @@ namespace libtorrent
void set_queue_position(int p); void set_queue_position(int p);
int queue_position() const { return m_sequence_number; } int queue_position() const { return m_sequence_number; }
void second_tick(stat& accumulator, float tick_interval); void second_tick(stat& accumulator, int tick_interval_ms);
std::string name() const; std::string name() const;
@ -248,7 +248,9 @@ namespace libtorrent
bool is_piece_filtered(int index) const; bool is_piece_filtered(int index) const;
void filtered_pieces(std::vector<bool>& bitmask) const; void filtered_pieces(std::vector<bool>& bitmask) const;
void filter_files(std::vector<bool> const& files); void filter_files(std::vector<bool> const& files);
#if !TORRENT_NO_FPU
void file_progress(std::vector<float>& fp) const; void file_progress(std::vector<float>& fp) const;
#endif
// ============ end deprecation ============= // ============ end deprecation =============
void piece_availability(std::vector<int>& avail) const; void piece_availability(std::vector<int>& avail) const;
@ -937,7 +939,7 @@ namespace libtorrent
storage_constructor_type m_storage_constructor; storage_constructor_type m_storage_constructor;
float m_progress; int m_progress_ppm;
// the upload/download ratio that each peer // the upload/download ratio that each peer
// tries to maintain. // tries to maintain.

25
include/libtorrent/torrent_handle.hpp
View File

@ -79,6 +79,7 @@ namespace libtorrent
: state(checking_resume_data) : state(checking_resume_data)
, paused(false) , paused(false)
, progress(0.f) , progress(0.f)
, progress_ppm(0)
, total_download(0) , total_download(0)
, total_upload(0) , total_upload(0)
, total_payload_download(0) , total_payload_download(0)
@ -134,6 +135,10 @@ namespace libtorrent
state_t state; state_t state;
bool paused; bool paused;
float progress; float progress;
// progress parts per million (progress * 1000000)
// when disabling floating point operations, this is
// the only option to query progress
int progress_ppm;
std::string error; std::string error;
boost::posix_time::time_duration next_announce; boost::posix_time::time_duration next_announce;
@ -160,13 +165,13 @@ namespace libtorrent
// current transfer rate // current transfer rate
// payload plus protocol // payload plus protocol
float download_rate; int download_rate;
float upload_rate; int upload_rate;
// the rate of payload that is // the rate of payload that is
// sent and received // sent and received
float download_payload_rate; int download_payload_rate;
float upload_payload_rate; int upload_payload_rate;
// the number of peers this torrent is connected to // the number of peers this torrent is connected to
// that are seeding. // that are seeding.
@ -227,6 +232,16 @@ namespace libtorrent
// //
// the fractional part tells the fraction of pieces that // the fractional part tells the fraction of pieces that
// have more copies than the rarest piece(s). // have more copies than the rarest piece(s).
// the number of full distributed copies (i.e. the number
// of peers that have the rarest piece)
int distributed_full_copies;
// the fraction of pieces that more peers has than the
// rarest pieces. This indicates how close the swarm is
// to have one more full distributed copy
int distributed_fraction;
float distributed_copies; float distributed_copies;
// the block size that is used in this torrent. i.e. // the block size that is used in this torrent. i.e.
@ -366,10 +381,12 @@ namespace libtorrent
void set_piece_deadline(int index, time_duration deadline, int flags = 0) const; void set_piece_deadline(int index, time_duration deadline, int flags = 0) const;
#ifndef TORRENT_NO_DEPRECATE #ifndef TORRENT_NO_DEPRECATE
#if !TORRENT_NO_FPU
// fills the specified vector with the download progress [0, 1] // fills the specified vector with the download progress [0, 1]
// of each file in the torrent. The files are ordered as in // of each file in the torrent. The files are ordered as in
// the torrent_info. // the torrent_info.
void file_progress(std::vector<float>& progress) const TORRENT_DEPRECATED; void file_progress(std::vector<float>& progress) const TORRENT_DEPRECATED;
#endif
#endif #endif
enum file_progress_flags_t enum file_progress_flags_t
{ {

2
src/kademlia/node.cpp
View File

@ -346,7 +346,7 @@ time_duration node_impl::refresh_timeout()
time_duration next_refresh = next - now; time_duration next_refresh = next - now;
time_duration min_next_refresh time_duration min_next_refresh
= minutes(15) / (m_table.num_active_buckets()); = minutes(15) / m_table.num_active_buckets();
if (min_next_refresh > seconds(40)) if (min_next_refresh > seconds(40))
min_next_refresh = seconds(40); min_next_refresh = seconds(40);

43
src/peer_connection.cpp
View File

@ -3064,7 +3064,13 @@ namespace libtorrent
p.write_state = m_channel_state[upload_channel]; p.write_state = m_channel_state[upload_channel];
p.read_state = m_channel_state[download_channel]; p.read_state = m_channel_state[download_channel];
#if TORRENT_NO_FPU
p.progress = 0.f;
#else
p.progress = (float)p.pieces.count() / (float)p.pieces.size(); p.progress = (float)p.pieces.count() / (float)p.pieces.size();
#endif
p.progress_ppm = p.pieces.count() * 1000000 / p.pieces.size();
} }
// allocates a disk buffer of size 'disk_buffer_size' and replaces the // allocates a disk buffer of size 'disk_buffer_size' and replaces the
@ -3165,7 +3171,7 @@ namespace libtorrent
m_superseed_piece = index; m_superseed_piece = index;
} }
void peer_connection::second_tick(float tick_interval) void peer_connection::second_tick(int tick_interval_ms)
{ {
ptime now = time_now(); ptime now = time_now();
boost::intrusive_ptr<peer_connection> me(self()); boost::intrusive_ptr<peer_connection> me(self());
@ -3319,7 +3325,7 @@ namespace libtorrent
m_ignore_bandwidth_limits = m_ses.settings().ignore_limits_on_local_network m_ignore_bandwidth_limits = m_ses.settings().ignore_limits_on_local_network
&& on_local_network(); && on_local_network();
m_statistics.second_tick(tick_interval); m_statistics.second_tick(tick_interval_ms);
if (m_statistics.upload_payload_rate() > m_upload_rate_peak) if (m_statistics.upload_payload_rate() > m_upload_rate_peak)
{ {
@ -3342,7 +3348,7 @@ namespace libtorrent
if (!t->ready_for_connections()) return; if (!t->ready_for_connections()) return;
// calculate the desired download queue size // calculate the desired download queue size
const float queue_time = m_ses.settings().request_queue_time; const int queue_time = m_ses.settings().request_queue_time;
// (if the latency is more than this, the download will stall) // (if the latency is more than this, the download will stall)
// so, the queue size is queue_time * down_rate / 16 kiB // so, the queue size is queue_time * down_rate / 16 kiB
// (16 kB is the size of each request) // (16 kB is the size of each request)
@ -3358,8 +3364,8 @@ namespace libtorrent
} }
else else
{ {
m_desired_queue_size = static_cast<int>(queue_time m_desired_queue_size = queue_time
* statistics().download_rate() / block_size); * statistics().download_rate() / block_size;
if (m_desired_queue_size > m_max_out_request_queue) if (m_desired_queue_size > m_max_out_request_queue)
m_desired_queue_size = m_max_out_request_queue; m_desired_queue_size = m_max_out_request_queue;
if (m_desired_queue_size < min_request_queue) if (m_desired_queue_size < min_request_queue)
@ -3426,40 +3432,37 @@ namespace libtorrent
{ {
size_type bias = 0x10000 + 2 * t->block_size() + m_free_upload; size_type bias = 0x10000 + 2 * t->block_size() + m_free_upload;
double break_even_time = 15; // seconds. const int break_even_time = 15; // seconds.
size_type have_uploaded = m_statistics.total_payload_upload(); size_type have_uploaded = m_statistics.total_payload_upload();
size_type have_downloaded = m_statistics.total_payload_download(); size_type have_downloaded = m_statistics.total_payload_download();
double download_speed = m_statistics.download_rate(); int download_speed = m_statistics.download_rate();
size_type soon_downloaded = size_type soon_downloaded =
have_downloaded + (size_type)(download_speed * break_even_time*1.5); have_downloaded + (size_type)(download_speed * (break_even_time + break_even_time / 2));
if (t->ratio() != 1.f) if (t->ratio() != 1.f)
soon_downloaded = (size_type)(soon_downloaded*(double)t->ratio()); soon_downloaded = size_type(soon_downloaded * t->ratio());
double upload_speed_limit = (soon_downloaded - have_uploaded int upload_speed_limit = (soon_downloaded - have_uploaded
+ bias) / break_even_time; + bias) / break_even_time;
if (m_upload_limit > 0 && m_upload_limit < upload_speed_limit) if (m_upload_limit > 0 && m_upload_limit < upload_speed_limit)
upload_speed_limit = m_upload_limit; upload_speed_limit = m_upload_limit;
upload_speed_limit = (std::min)(upload_speed_limit, upload_speed_limit = (std::min)(upload_speed_limit, (std::numeric_limits<int>::max)());
(double)(std::numeric_limits<int>::max)());
m_bandwidth_channel[upload_channel].throttle( m_bandwidth_channel[upload_channel].throttle(
(std::min)((std::max)((int)upload_speed_limit, 10) (std::min)((std::max)(upload_speed_limit, 10), m_upload_limit));
, m_upload_limit));
} }
// update once every minute // update once every minute
if (now - m_remote_dl_update >= seconds(60)) if (now - m_remote_dl_update >= seconds(60))
{ {
float factor = 0.6666666666667f; if (m_remote_dl_rate > 0)
m_remote_dl_rate = (m_remote_dl_rate * 2 / 3) +
if (m_remote_dl_rate == 0) factor = 0.0f; ((m_remote_bytes_dled / 3) / 60);
else
m_remote_dl_rate = int((m_remote_dl_rate * factor) + m_remote_dl_rate = m_remote_dl_rate / 60;
((m_remote_bytes_dled * (1.0f-factor)) / 60.f));
m_remote_bytes_dled = 0; m_remote_bytes_dled = 0;
m_remote_dl_update = now; m_remote_dl_update = now;

6
src/piece_picker.cpp
View File

@ -469,10 +469,10 @@ namespace libtorrent
} }
#endif #endif
float piece_picker::distributed_copies() const std::pair<int, int> piece_picker::distributed_copies() const
{ {
TORRENT_ASSERT(m_seeds >= 0); TORRENT_ASSERT(m_seeds >= 0);
const float num_pieces = static_cast<float>(m_piece_map.size()); const int num_pieces = m_piece_map.size();
int min_availability = piece_pos::max_peer_count; int min_availability = piece_pos::max_peer_count;
// find the lowest availability count // find the lowest availability count
@ -503,7 +503,7 @@ namespace libtorrent
} }
} }
TORRENT_ASSERT(integer_part + fraction_part == num_pieces); TORRENT_ASSERT(integer_part + fraction_part == num_pieces);
return float(min_availability + m_seeds) + (fraction_part / num_pieces); return std::make_pair(min_availability + m_seeds, fraction_part * 1000 / num_pieces);
} }
void piece_picker::priority_range(int prio, int* start, int* end) void piece_picker::priority_range(int prio, int* start, int* end)

10
src/session_impl.cpp
View File

@ -1198,7 +1198,7 @@ namespace aux {
// only tick the following once per second // only tick the following once per second
if (now - m_last_second_tick < seconds(1)) return; if (now - m_last_second_tick < seconds(1)) return;
float tick_interval = total_microseconds(now - m_last_second_tick) / 1000000.f; int tick_interval_ms = total_milliseconds(now - m_last_second_tick);
m_last_second_tick = now; m_last_second_tick = now;
int session_time = total_seconds(now - m_created); int session_time = total_seconds(now - m_created);
@ -1241,8 +1241,8 @@ namespace aux {
int seeding_torrents = 0; int seeding_torrents = 0;
static size_type downloaded = 0; static size_type downloaded = 0;
static size_type uploaded = 0; static size_type uploaded = 0;
size_type download_rate = (m_stat.total_download() - downloaded) / tick_interval; size_type download_rate = (m_stat.total_download() - downloaded) * 1000 / tick_interval_ms;
size_type upload_rate = (m_stat.total_upload() - uploaded) / tick_interval; size_type upload_rate = (m_stat.total_upload() - uploaded) * 1000 / tick_interval_ms;
downloaded = m_stat.total_download(); downloaded = m_stat.total_download();
uploaded = m_stat.total_upload(); uploaded = m_stat.total_upload();
size_type num_peers = 0; size_type num_peers = 0;
@ -1355,7 +1355,7 @@ namespace aux {
num_downloads_peers += t.num_peers(); num_downloads_peers += t.num_peers();
} }
t.second_tick(m_stat, tick_interval); t.second_tick(m_stat, tick_interval_ms);
++i; ++i;
} }
@ -1413,7 +1413,7 @@ namespace aux {
} }
} }
m_stat.second_tick(tick_interval); m_stat.second_tick(tick_interval_ms);
// -------------------------------------------------------------- // --------------------------------------------------------------
// scrape paused torrents that are auto managed // scrape paused torrents that are auto managed

8
src/stat.cpp
View File

@ -43,14 +43,10 @@ POSSIBILITY OF SUCH DAMAGE.
#include "libtorrent/stat.hpp" #include "libtorrent/stat.hpp"
#include "libtorrent/invariant_check.hpp" #include "libtorrent/invariant_check.hpp"
#if defined _MSC_VER && _MSC_VER <= 1200
#define for if (false) {} else for
#endif
namespace libtorrent namespace libtorrent
{ {
void stat_channel::second_tick(float tick_interval) void stat_channel::second_tick(int tick_interval_ms)
{ {
INVARIANT_CHECK; INVARIANT_CHECK;
@ -59,7 +55,7 @@ void stat_channel::second_tick(float tick_interval)
for (int i = history - 2; i >= 0; --i) for (int i = history - 2; i >= 0; --i)
m_rate_history[i + 1] = m_rate_history[i]; m_rate_history[i + 1] = m_rate_history[i];
m_rate_history[0] = m_counter / tick_interval; m_rate_history[0] = m_counter * 1000 / tick_interval_ms;
m_rate_sum += m_rate_history[0]; m_rate_sum += m_rate_history[0];
m_counter = 0; m_counter = 0;
} }

65
src/torrent.cpp
View File

@ -167,7 +167,7 @@ namespace libtorrent
, m_state(torrent_status::checking_resume_data) , m_state(torrent_status::checking_resume_data)
, m_settings(ses.settings()) , m_settings(ses.settings())
, m_storage_constructor(p.storage) , m_storage_constructor(p.storage)
, m_progress(0.f) , m_progress_ppm(0)
, m_ratio(0.f) , m_ratio(0.f)
, m_max_uploads((std::numeric_limits<int>::max)()) , m_max_uploads((std::numeric_limits<int>::max)())
, m_num_uploads(0) , m_num_uploads(0)
@ -1014,7 +1014,7 @@ namespace libtorrent
return; return;
} }
m_progress = j.piece / float(torrent_file().num_pieces()); m_progress_ppm = j.piece * 1000000 / torrent_file().num_pieces();
TORRENT_ASSERT(m_picker); TORRENT_ASSERT(m_picker);
if (j.offset >= 0 && !m_picker->have_piece(j.offset)) if (j.offset >= 0 && !m_picker->have_piece(j.offset))
@ -2344,9 +2344,9 @@ namespace libtorrent
{ {
time_duration diff = dl_time - m_average_piece_time; time_duration diff = dl_time - m_average_piece_time;
if (m_piece_time_deviation == seconds(0)) m_piece_time_deviation = diff; if (m_piece_time_deviation == seconds(0)) m_piece_time_deviation = diff;
else m_piece_time_deviation = m_piece_time_deviation * 0.6f + diff * 0.4; else m_piece_time_deviation = (m_piece_time_deviation * 6 + diff * 4) / 10;
m_average_piece_time = m_average_piece_time * 0.6f + dl_time * 0.4f; m_average_piece_time = (m_average_piece_time * 6 + dl_time * 4) / 10;
} }
} }
m_time_critical_pieces.erase(i); m_time_critical_pieces.erase(i);
@ -5016,7 +5016,7 @@ namespace libtorrent
announce_with_tracker(tracker_request::stopped); announce_with_tracker(tracker_request::stopped);
} }
void torrent::second_tick(stat& accumulator, float tick_interval) void torrent::second_tick(stat& accumulator, int tick_interval_ms)
{ {
INVARIANT_CHECK; INVARIANT_CHECK;
@ -5069,7 +5069,7 @@ namespace libtorrent
if (is_paused()) if (is_paused())
{ {
// let the stats fade out to 0 // let the stats fade out to 0
m_stat.second_tick(tick_interval); m_stat.second_tick(tick_interval_ms);
return; return;
} }
@ -5095,7 +5095,7 @@ namespace libtorrent
} }
} }
time_duration since_last_tick = microsec(tick_interval * 1000000L); time_duration since_last_tick = milliseconds(tick_interval_ms);
if (is_seed()) m_seeding_time += since_last_tick; if (is_seed()) m_seeding_time += since_last_tick;
m_active_time += since_last_tick; m_active_time += since_last_tick;
@ -5162,7 +5162,7 @@ namespace libtorrent
try try
{ {
#endif #endif
p->second_tick(tick_interval); p->second_tick(tick_interval_ms);
#ifndef BOOST_NO_EXCEPTIONS #ifndef BOOST_NO_EXCEPTIONS
} }
catch (std::exception& e) catch (std::exception& e)
@ -5177,7 +5177,7 @@ namespace libtorrent
accumulator += m_stat; accumulator += m_stat;
m_total_uploaded += m_stat.last_payload_uploaded(); m_total_uploaded += m_stat.last_payload_uploaded();
m_total_downloaded += m_stat.last_payload_downloaded(); m_total_downloaded += m_stat.last_payload_downloaded();
m_stat.second_tick(tick_interval); m_stat.second_tick(tick_interval_ms);
} }
void torrent::request_time_critical_pieces() void torrent::request_time_critical_pieces()
@ -5369,6 +5369,7 @@ namespace libtorrent
return &*i; return &*i;
} }
#if !TORRENT_NO_FPU
void torrent::file_progress(std::vector<float>& fp) const void torrent::file_progress(std::vector<float>& fp) const
{ {
fp.clear(); fp.clear();
@ -5384,6 +5385,7 @@ namespace libtorrent
else fp[i] = float(progress[i]) / f.size; else fp[i] = float(progress[i]) / f.size;
} }
} }
#endif
void torrent::file_progress(std::vector<size_type>& fp, int flags) const void torrent::file_progress(std::vector<size_type>& fp, int flags) const
{ {
@ -5657,7 +5659,10 @@ namespace libtorrent
if (!valid_metadata()) if (!valid_metadata())
{ {
st.state = torrent_status::downloading_metadata; st.state = torrent_status::downloading_metadata;
st.progress = m_progress; st.progress_ppm = m_progress_ppm;
#if !TORRENT_NO_FPU
st.progress = m_progress_ppm / 1000000.f;
#endif
st.block_size = 0; st.block_size = 0;
return st; return st;
} }
@ -5665,10 +5670,25 @@ namespace libtorrent
st.block_size = block_size(); st.block_size = block_size();
if (m_state == torrent_status::checking_files) if (m_state == torrent_status::checking_files)
st.progress = m_progress; {
else if (st.total_wanted == 0) st.progress = 1.f; st.progress_ppm = m_progress_ppm;
else st.progress = st.total_wanted_done #if !TORRENT_NO_FPU
/ static_cast<float>(st.total_wanted); st.progress = m_progress_ppm / 1000000.f;
#endif
}
else if (st.total_wanted == 0)
{
st.progress_ppm = 1000000;
st.progress = 1.f;
}
else
{
st.progress_ppm = st.total_wanted_done * 1000000
/ st.total_wanted;
#if !TORRENT_NO_FPU
st.progress = st.progress_ppm / 1000000.f;
#endif
}
if (has_picker()) if (has_picker())
{ {
@ -5681,9 +5701,22 @@ namespace libtorrent
st.num_pieces = num_have(); st.num_pieces = num_have();
st.num_seeds = num_seeds(); st.num_seeds = num_seeds();
if (m_picker.get()) if (m_picker.get())
st.distributed_copies = m_picker->distributed_copies(); {
boost::tie(st.distributed_full_copies, st.distributed_fraction) =
m_picker->distributed_copies();
#if TORRENT_NO_FPU
st.distributed_copies = -1.f;
#else
st.distributed_copies = st.distributed_full_copies
+ float(st.distributed_fraction) / 1000;
#endif
}
else else
st.distributed_copies = -1; {
st.distributed_full_copies = -1;
st.distributed_fraction = -1;
st.distributed_copies = -1.f;
}
return st; return st;
} }

2
src/torrent_handle.cpp
View File

@ -371,11 +371,13 @@ namespace libtorrent
} }
#ifndef TORRENT_NO_DEPRECATE #ifndef TORRENT_NO_DEPRECATE
#if !TORRENT_NO_FPU
void torrent_handle::file_progress(std::vector<float>& progress) const void torrent_handle::file_progress(std::vector<float>& progress) const
{ {
INVARIANT_CHECK; INVARIANT_CHECK;
TORRENT_FORWARD(file_progress(progress)); TORRENT_FORWARD(file_progress(progress));
} }
#endif
#endif #endif
void torrent_handle::file_progress(std::vector<size_type>& progress, int flags) const void torrent_handle::file_progress(std::vector<size_type>& progress, int flags) const