diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-10-04 11:41:41 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-10-04 11:41:41 +0200 |
| commit | e34ef4de6c99de3d057901feabe4d38e1fde4a39 (patch) | |
| tree | 444079a995edddb208419f902d0d124463d3071e /contrib | |
| parent | Merge pull request #1168 (diff) | |
| parent | Removed all code related to fast_exit (diff) | |
| download | monero-e34ef4de6c99de3d057901feabe4d38e1fde4a39.tar.xz | |
Merge pull request #1171
6390673 Removed all code related to fast_exit (NanoAkron)
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/epee/include/net/abstract_tcp_server2.h | 1 | ||||
| -rw-r--r-- | contrib/epee/include/net/abstract_tcp_server2.inl | 14 | ||||
| -rw-r--r-- | contrib/rlwrap/monerocommands_bitmonerod.txt | 1 |
3 files changed, 1 insertions, 15 deletions
diff --git a/contrib/epee/include/net/abstract_tcp_server2.h b/contrib/epee/include/net/abstract_tcp_server2.h index cb387d39f..f0a1ddd7c 100644 --- a/contrib/epee/include/net/abstract_tcp_server2.h +++ b/contrib/epee/include/net/abstract_tcp_server2.h @@ -300,7 +300,6 @@ namespace net_utils boost::thread::id m_main_thread_id; critical_section m_threads_lock; volatile uint32_t m_thread_index; // TODO change to std::atomic - void detach_threads(); t_connection_type m_connection_type; diff --git a/contrib/epee/include/net/abstract_tcp_server2.inl b/contrib/epee/include/net/abstract_tcp_server2.inl index 94dbe7458..dbdfbc74d 100644 --- a/contrib/epee/include/net/abstract_tcp_server2.inl +++ b/contrib/epee/include/net/abstract_tcp_server2.inl @@ -827,7 +827,7 @@ POP_WARNINGS } CRITICAL_REGION_END(); // Wait for all threads in the pool to exit. - if (wait) // && ! ::cryptonote::core::get_is_stopping()) // TODO fast_exit + if (wait) { _fact("JOINING all threads"); for (std::size_t i = 0; i < m_threads.size(); ++i) { @@ -897,10 +897,6 @@ POP_WARNINGS template<class t_protocol_handler> void boosted_tcp_server<t_protocol_handler>::send_stop_signal() { - if (::cryptonote::core::get_fast_exit() == true) - { - detach_threads(); - } m_stop_signal_sent = true; TRY_ENTRY(); connections_mutex.lock(); @@ -1144,14 +1140,6 @@ POP_WARNINGS return true; CATCH_ENTRY_L0("boosted_tcp_server<t_protocol_handler>::connect_async", false); } - //--------------------------------------------------------------------------------- - template<class t_protocol_handler> - void boosted_tcp_server<t_protocol_handler>::detach_threads() - { - for (auto thread : m_threads) - thread->detach(); - } - } // namespace } // namespace diff --git a/contrib/rlwrap/monerocommands_bitmonerod.txt b/contrib/rlwrap/monerocommands_bitmonerod.txt index c14d28e71..1c97cfedf 100644 --- a/contrib/rlwrap/monerocommands_bitmonerod.txt +++ b/contrib/rlwrap/monerocommands_bitmonerod.txt @@ -2,7 +2,6 @@ ban bans diff exit -fast_exit flush_txpool hard_fork_info help |