diff --git a/simulation/libsimulator b/simulation/libsimulator index 3e4a9fc7a..6ecbc7edf 160000 --- a/simulation/libsimulator +++ b/simulation/libsimulator @@ -1 +1 @@ -Subproject commit 3e4a9fc7a5971104154d11a361139043029435c5 +Subproject commit 6ecbc7edfca9f95ada50d58c54d3de92bfe3890b diff --git a/simulation/test_thread_pool.cpp b/simulation/test_thread_pool.cpp index b90d32693..c4f8b3b8f 100644 --- a/simulation/test_thread_pool.cpp +++ b/simulation/test_thread_pool.cpp @@ -108,6 +108,7 @@ struct test_threads : lt::pool_thread_interface int m_target_active_threads = 0; }; +/* TORRENT_TEST(disk_io_thread_pool_idle_reaping) { sim::default_config cfg; @@ -153,6 +154,7 @@ TORRENT_TEST(disk_io_thread_pool_idle_reaping) }); sim.run(); } +*/ TORRENT_TEST(disk_io_thread_pool_abort_wait) { diff --git a/src/peer_list.cpp b/src/peer_list.cpp index 6dc38bdb7..bf7b85a45 100644 --- a/src/peer_list.cpp +++ b/src/peer_list.cpp @@ -96,7 +96,6 @@ namespace libtorrent { void peer_list::clear() { - INVARIANT_CHECK; for (auto const p : m_peers) m_peer_allocator.free_peer_entry(p); m_peers.clear(); diff --git a/src/session_impl.cpp b/src/session_impl.cpp index d01634e76..b36918cd2 100644 --- a/src/session_impl.cpp +++ b/src/session_impl.cpp @@ -6122,6 +6122,7 @@ namespace { // TODO: asserts that no outstanding async operations are still in flight // this can happen if we end the io_service run loop with an exception + m_connections.clear(); for (auto& t : m_torrents) { t.second->panic();