made unchoke interval depend on piece size

include/libtorrent/aux_/session_impl.hpp

@@ -528,6 +528,7 @@ namespace libtorrent
 			void recalculate_auto_managed_torrents();
 			void recalculate_unchoke_slots(int congested_torrents
 				, int uncongested_torrents);
+			void recalculate_optimistic_unchoke_slot();
 
 			ptime m_last_tick;
 

include/libtorrent/session_settings.hpp

@@ -108,7 +108,7 @@ namespace libtorrent
 			, lazy_bitfields(true)
 			, inactivity_timeout(600)
 			, unchoke_interval(15)
-			, optimistic_unchoke_multiplier(4)
+			, optimistic_unchoke_interval(30)
 			, num_want(200)
 			, initial_picker_threshold(4)
 			, allowed_fast_set_size(10)
@@ -280,9 +280,9 @@ namespace libtorrent
 		// the number of seconds between chokes/unchokes
 		int unchoke_interval;
 
-		// the number of unchoke intervals between
+		// the number of seconds between
 		// optimistic unchokes
-		int optimistic_unchoke_multiplier;
+		int optimistic_unchoke_interval;
 
 		// if this is set, this IP will be reported do the
 		// tracker in the ip= parameter.

include/libtorrent/session_status.hpp

@@ -89,6 +89,9 @@ namespace libtorrent
 		int up_bandwidth_queue;
 		int down_bandwidth_queue;
 
+		int optimistic_unchoke_counter;
+		int unchoke_counter;
+
 #ifndef TORRENT_DISABLE_DHT
 		int dht_nodes;
 		int dht_node_cache;