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

improve logging (specifically don't emit bandwidth limiter logs when it's disabled)

This commit is contained in:
arvidn 2015-07-05 18:44:02 -04:00
parent 3b3a23a87a
commit a63cfd2a95
2 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/peer_connection.cpp
View File

@ -5259,7 +5259,7 @@ namespace libtorrent
#ifndef TORRENT_DISABLE_LOGGING
peer_log(channel == upload_channel
? peer_log_alert::outgoing : peer_log_alert::incoming
, "ASSIGN BANDWIDHT", "bytes: %d", amount);
, "ASSIGN_BANDWIDHT", "bytes: %d", amount);
#endif
TORRENT_ASSERT(amount > 0 || is_disconnecting());
@ -5352,15 +5352,6 @@ namespace libtorrent
}
#endif
#ifndef TORRENT_DISABLE_LOGGING
peer_log(
channel == download_channel ? peer_log_alert::incoming
: peer_log_alert::outgoing,
"REQUEST_BANDWIDTH", "bytes: %d quota: %d wanted_transfer: %d "
"prio: %d num_channels: %d", bytes, m_quota[channel]
, wanted_transfer(channel), priority, c);
#endif
TORRENT_ASSERT((m_channel_state[channel] & peer_info::bw_limit) == 0);
bandwidth_manager* manager = m_ses.get_bandwidth_manager(channel);
@ -5370,16 +5361,18 @@ namespace libtorrent
if (ret == 0)
{
#ifndef TORRENT_DISABLE_LOGGING
peer_log(
channel == download_channel ? peer_log_alert::incoming
: peer_log_alert::outgoing,
"REQUEST_BANDWIDTH", "bytes: %d quota: %d wanted_transfer: %d "
"prio: %d num_channels: %d", bytes, m_quota[channel]
, wanted_transfer(channel), priority, c);
#endif
m_channel_state[channel] |= peer_info::bw_limit;
}
else
{
#ifndef TORRENT_DISABLE_LOGGING
peer_log(
channel == download_channel ? peer_log_alert::incoming
: peer_log_alert::outgoing
, "ASSIGN_BANDWIDTH", "bytes: %d", ret);
#endif
m_quota[channel] += ret;
}

4
src/session_impl.cpp
View File

@ -519,9 +519,7 @@ namespace aux {
#ifndef TORRENT_DISABLE_LOGGING
session_log("config: %s\n"
"version: %s\n"
"revision: %s\n\n"
session_log("config: %s version: %s revision: %s"
, TORRENT_CFG_STRING
, LIBTORRENT_VERSION
, LIBTORRENT_REVISION);