session_impl and connection_queue fixes

libtorrent/include/libtorrent/alert_types.hpp

@@ -384,4 +384,3 @@ namespace libtorrent
 
 
 #endif
-

libtorrent/include/libtorrent/connection_queue.hpp

@@ -36,6 +36,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <list>
 #include <boost/function.hpp>
 #include <boost/noncopyable.hpp>
+#include <boost/thread/recursive_mutex.hpp>
 #include "libtorrent/socket.hpp"
 #include "libtorrent/time.hpp"
 
@@ -88,6 +89,10 @@ private:
 	int m_half_open_limit;
 
 	deadline_timer m_timer;
+
+	typedef boost::recursive_mutex mutex_t;
+	mutable mutex_t m_mutex;
+
 #ifndef NDEBUG
 	bool m_in_timeout_function;
 #endif

libtorrent/include/libtorrent/piece_picker.hpp

@@ -456,4 +456,3 @@ namespace libtorrent
 
 #endif // TORRENT_PIECE_PICKER_HPP_INCLUDED
 
-

libtorrent/src/connection_queue.cpp

@@ -54,6 +54,8 @@ namespace libtorrent
 		, boost::function<void()> const& on_timeout
 		, time_duration timeout)
 	{
+		mutex_t::scoped_lock l(m_mutex);
+
 		INVARIANT_CHECK;
 
 		m_queue.push_back(entry());
@@ -68,6 +70,8 @@ namespace libtorrent
 
 	void connection_queue::done(int ticket)
 	{
+		mutex_t::scoped_lock l(m_mutex);
+
 		INVARIANT_CHECK;
 
 		std::list<entry>::iterator i = std::find_if(m_queue.begin()
@@ -105,6 +109,8 @@ namespace libtorrent
 
 	void connection_queue::try_connect()
 	{
+		mutex_t::scoped_lock l(m_mutex);
+
 		INVARIANT_CHECK;
 
 		if (!free_slots() || m_queue.empty())
@@ -148,6 +154,8 @@ namespace libtorrent
 	
 	void connection_queue::on_timeout(asio::error_code const& e)
 	{
+		mutex_t::scoped_lock l(m_mutex);
+
 		INVARIANT_CHECK;
 #ifndef NDEBUG
 		function_guard guard_(m_in_timeout_function);

libtorrent/src/peer_connection.cpp

@@ -3003,4 +3003,3 @@ namespace libtorrent
 	}
 }
 
-

libtorrent/src/piece_picker.cpp

@@ -1789,4 +1789,3 @@ namespace libtorrent
 
 }
 
-

libtorrent/src/session_impl.cpp

@@ -1239,7 +1239,8 @@ namespace detail
 			if (num_connections() >= max_connections() && !m_torrents.empty())
 			{
 				torrent_map::iterator i = std::max_element(m_torrents.begin(), m_torrents.end()
-					, bind(&torrent::num_peers, bind(&torrent_map::value_type::second, _1)));
+					, bind(&torrent::num_peers, bind(&torrent_map::value_type::second, _1))
+					< bind(&torrent::num_peers, bind(&torrent_map::value_type::second, _2)));
 			
 				assert(i != m_torrents.end());
 				i->second->get_policy().disconnect_one_peer();