wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

removed logging in destructor since it caused a race condition with the creation of the logger

This commit is contained in:
Arvid Norberg 2011-01-24 03:23:34 +00:00
parent da676936d3
commit 4602ff4b47
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/session_impl.cpp
View File

@ -4161,9 +4161,6 @@ namespace aux {
session_impl::~session_impl() session_impl::~session_impl()
{ {
#if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING)
(*m_logger) << time_now_string() << "\n\n *** shutting down session *** \n\n";
#endif
m_io_service.post(boost::bind(&session_impl::abort, this)); m_io_service.post(boost::bind(&session_impl::abort, this));
// we need to wait for the disk-io thread to // we need to wait for the disk-io thread to
@ -4172,15 +4169,8 @@ namespace aux {
// to disk_io_pool inside the disk_io_thread. Once // to disk_io_pool inside the disk_io_thread. Once
// the main thread has handled all the outstanding requests // the main thread has handled all the outstanding requests
// we know it's safe to destruct the disk thread. // we know it's safe to destruct the disk thread.
#if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING)
(*m_logger) << time_now_string() << " waiting for disk io thread\n";
#endif
m_disk_thread.join(); m_disk_thread.join();
#if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING)
(*m_logger) << time_now_string() << " waiting for main thread\n";
#endif
#if defined TORRENT_ASIO_DEBUGGING #if defined TORRENT_ASIO_DEBUGGING
int counter = 0; int counter = 0;
while (log_async()) while (log_async())
@ -4196,9 +4186,6 @@ namespace aux {
TORRENT_ASSERT(m_torrents.empty()); TORRENT_ASSERT(m_torrents.empty());
TORRENT_ASSERT(m_connections.empty()); TORRENT_ASSERT(m_connections.empty());
#if defined(TORRENT_VERBOSE_LOGGING) || defined(TORRENT_LOGGING)
(*m_logger) << time_now_string() << " shutdown complete!\n";
#endif
TORRENT_ASSERT(m_connections.empty()); TORRENT_ASSERT(m_connections.empty());
} }