made session stats config build

include/libtorrent/aux_/session_impl.hpp

@@ -60,17 +60,11 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include "libtorrent/torrent_handle.hpp"
 #include "libtorrent/entry.hpp"
-#include "libtorrent/torrent_info.hpp"
 #include "libtorrent/socket.hpp"
-#include "libtorrent/peer_connection.hpp"
 #include "libtorrent/peer_id.hpp"
-#include "libtorrent/policy.hpp"
 #include "libtorrent/tracker_manager.hpp"
-#include "libtorrent/peer_info.hpp"
 #include "libtorrent/alert.hpp"
-#include "libtorrent/fingerprint.hpp"
 #include "libtorrent/debug.hpp"
-#include "libtorrent/peer_request.hpp"
 #include "libtorrent/piece_block_progress.hpp"
 #include "libtorrent/ip_filter.hpp"
 #include "libtorrent/config.hpp"
@@ -81,9 +75,6 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/stat.hpp"
 #include "libtorrent/file_pool.hpp"
 #include "libtorrent/bandwidth_manager.hpp"
-#include "libtorrent/natpmp.hpp"
-#include "libtorrent/upnp.hpp"
-#include "libtorrent/lsd.hpp"
 #include "libtorrent/socket_type.hpp"
 #include "libtorrent/connection_queue.hpp"
 #include "libtorrent/disk_io_thread.hpp"
@@ -93,6 +84,16 @@ namespace libtorrent
 {
 
 	namespace fs = boost::filesystem;
+	class peer_connection;
+	class upnp;
+	class natpmp;
+	class lsd;
+	class fingerprint;
+
+	namespace dht
+	{
+		class dht_tracker;
+	};
 
 	namespace aux
 	{
@@ -237,13 +238,7 @@ namespace libtorrent
 			int num_connections() const
 			{ return m_connections.size(); }
 
-			void unchoke_peer(peer_connection& c)
+			void unchoke_peer(peer_connection& c);
-			{
-				torrent* t = c.associated_torrent().lock().get();
-				TORRENT_ASSERT(t);
-				if (t->unchoke_peer(c))
-					++m_num_unchoked;
-			}
 
 			session_status status() const;
 			void set_peer_id(peer_id const& id);
@@ -297,24 +292,6 @@ namespace libtorrent
 			void load_state(entry const& ses_state);
 			entry state() const;
 
-#ifdef TORRENT_STATS
-			void log_buffer_usage()
-			{
-				int send_buffer_capacity = 0;
-				int used_send_buffer = 0;
-				for (connection_map::const_iterator i = m_connections.begin()
-					, end(m_connections.end()); i != end; ++i)
-				{
-					send_buffer_capacity += (*i)->send_buffer_capacity();
-					used_send_buffer += (*i)->send_buffer_size();
-				}
-				TORRENT_ASSERT(send_buffer_capacity >= used_send_buffer);
-				m_buffer_usage_logger << log_time() << " send_buffer_size: " << send_buffer_capacity << std::endl;
-				m_buffer_usage_logger << log_time() << " used_send_buffer: " << used_send_buffer << std::endl;
-				m_buffer_usage_logger << log_time() << " send_buffer_utilization: "
-					<< (used_send_buffer * 100.f / send_buffer_capacity) << std::endl;
-			}
-#endif
 			void start_lsd();
 			natpmp* start_natpmp();
 			upnp* start_upnp();
@@ -588,6 +565,8 @@ namespace libtorrent
 #endif
 
 #ifdef TORRENT_STATS
+			void log_buffer_usage();
+
 			// logger used to write bandwidth usage statistics
 			std::ofstream m_stats_logger;
 			int m_second_counter;

include/libtorrent/peer_connection.hpp

@@ -78,6 +78,10 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/disk_buffer_holder.hpp"
 #include "libtorrent/bitfield.hpp"
 
+#ifdef TORRENT_STATS
+#include "libtorrent/aux_/session_impl.hpp"
+#endif
+
 namespace libtorrent
 {
 	class torrent;

src/bt_peer_connection.cpp

@@ -50,6 +50,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/version.hpp"
 #include "libtorrent/extensions.hpp"
 #include "libtorrent/aux_/session_impl.hpp"
+#include "libtorrent/broadcast_socket.hpp"
 
 #ifndef TORRENT_DISABLE_ENCRYPTION
 #include "libtorrent/pe_crypto.hpp"

src/peer_connection.cpp

@@ -52,6 +52,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/policy.hpp"
 #include "libtorrent/socket_type.hpp"
 #include "libtorrent/assert.hpp"
+#include "libtorrent/broadcast_socket.hpp"
 
 //#define TORRENT_CORRUPT_DATA
 

src/policy.cpp

@@ -55,6 +55,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/time.hpp"
 #include "libtorrent/aux_/session_impl.hpp"
 #include "libtorrent/piece_picker.hpp"
+#include "libtorrent/broadcast_socket.hpp"
 
 #ifdef TORRENT_DEBUG
 #include "libtorrent/bt_peer_connection.hpp"

src/session_impl.cpp

@@ -77,6 +77,9 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/enum_net.hpp"
 #include "libtorrent/config.hpp"
 #include "libtorrent/utf8.hpp"
+#include "libtorrent/upnp.hpp"
+#include "libtorrent/natpmp.hpp"
+#include "libtorrent/lsd.hpp"
 
 #ifndef TORRENT_WINDOWS
 #include <sys/resource.h>
@@ -978,6 +981,14 @@ namespace aux {
 		m_key = key;
 	}
 
+	void session_impl::unchoke_peer(peer_connection& c)
+	{
+		torrent* t = c.associated_torrent().lock().get();
+		TORRENT_ASSERT(t);
+		if (t->unchoke_peer(c))
+			++m_num_unchoked;
+	}
+
 	int session_impl::next_port()
 	{
 		std::pair<int, int> const& out_ports = m_settings.outgoing_ports;
@@ -2633,6 +2644,25 @@ namespace aux {
 #endif
 	}
 
+#ifdef TORRENT_STATS
+	void session_impl::log_buffer_usage()
+	{
+		int send_buffer_capacity = 0;
+		int used_send_buffer = 0;
+		for (connection_map::const_iterator i = m_connections.begin()
+			, end(m_connections.end()); i != end; ++i)
+		{
+			send_buffer_capacity += (*i)->send_buffer_capacity();
+			used_send_buffer += (*i)->send_buffer_size();
+		}
+		TORRENT_ASSERT(send_buffer_capacity >= used_send_buffer);
+		m_buffer_usage_logger << log_time() << " send_buffer_size: " << send_buffer_capacity << std::endl;
+		m_buffer_usage_logger << log_time() << " used_send_buffer: " << used_send_buffer << std::endl;
+		m_buffer_usage_logger << log_time() << " send_buffer_utilization: "
+			<< (used_send_buffer * 100.f / send_buffer_capacity) << std::endl;
+	}
+#endif
+
 	void session_impl::free_buffer(char* buf, int size)
 	{
 		TORRENT_ASSERT(size > 0);

src/torrent.cpp

@@ -77,6 +77,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/aux_/session_impl.hpp"
 #include "libtorrent/instantiate_connection.hpp"
 #include "libtorrent/assert.hpp"
+#include "libtorrent/broadcast_socket.hpp"
 
 using namespace libtorrent;
 using boost::tuples::tuple;