diff options
author | NanoAkron <nanoakron@users.noreply.github.com> | 2016-10-03 02:06:55 +0100 |
---|---|---|
committer | NanoAkron <nanoakron@users.noreply.github.com> | 2016-10-03 02:06:55 +0100 |
commit | 6390673137955a158ac3a8082d7f47ff4a03c7fd (patch) | |
tree | 0e9308aafba3c05bb02ae31b661363f1b08eac2a /src/cryptonote_core | |
parent | Merge pull request #1124 (diff) | |
download | monero-6390673137955a158ac3a8082d7f47ff4a03c7fd.tar.xz |
Removed all code related to fast_exit
Diffstat (limited to 'src/cryptonote_core')
-rw-r--r-- | src/cryptonote_core/cryptonote_core.cpp | 17 | ||||
-rw-r--r-- | src/cryptonote_core/cryptonote_core.h | 20 |
2 files changed, 1 insertions, 36 deletions
diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp index 4abf6a898..36e68b1bb 100644 --- a/src/cryptonote_core/cryptonote_core.cpp +++ b/src/cryptonote_core/cryptonote_core.cpp @@ -433,24 +433,11 @@ namespace cryptonote { m_miner.stop(); m_mempool.deinit(); - if (!m_fast_exit) - { - m_blockchain_storage.deinit(); - } + m_blockchain_storage.deinit(); unlock_db_directory(); return true; } //----------------------------------------------------------------------------------------------- - void core::set_fast_exit() - { - m_fast_exit = true; - } - //----------------------------------------------------------------------------------------------- - bool core::get_fast_exit() - { - return m_fast_exit; - } - //----------------------------------------------------------------------------------------------- void core::test_drop_download() { m_test_drop_download = false; @@ -985,6 +972,4 @@ namespace cryptonote { raise(SIGTERM); } - - std::atomic<bool> core::m_fast_exit(false); } diff --git a/src/cryptonote_core/cryptonote_core.h b/src/cryptonote_core/cryptonote_core.h index 97abf3271..6727d6b04 100644 --- a/src/cryptonote_core/cryptonote_core.h +++ b/src/cryptonote_core/cryptonote_core.h @@ -230,29 +230,11 @@ namespace cryptonote * * Uninitializes the miner instance, transaction pool, and Blockchain * - * if m_fast_exit is set, the call to Blockchain::deinit() is not made. - * * @return true */ bool deinit(); /** - * @brief sets fast exit flag - * - * @note see deinit() - */ - static void set_fast_exit(); - - /** - * @brief gets the current state of the fast exit flag - * - * @return the fast exit flag - * - * @note see deinit() - */ - static bool get_fast_exit(); - - /** * @brief sets to drop blocks downloaded (for testing) */ void test_drop_download(); @@ -764,8 +746,6 @@ namespace cryptonote */ bool unlock_db_directory(); - static std::atomic<bool> m_fast_exit; //!< whether or not to deinit Blockchain on exit - bool m_test_drop_download = true; //!< whether or not to drop incoming blocks (for testing) uint64_t m_test_drop_download_height = 0; //!< height under which to drop incoming blocks, if doing so |