Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-07-22 18:40:43 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1171

Browse source 
6390673 Removed all code related to fast_exit (NanoAkron)
This commit is contained in:
Riccardo Spagni 2016-10-04 11:41:41 +02:00
commit e34ef4de6c
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
12 changed files with 2 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/cryptonote_core/cryptonote_core.cpp
View file

@ -434,23 +434,10 @@ 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()
{
@ -986,6 +973,4 @@ namespace cryptonote
{
raise(SIGTERM);
}
std::atomic<bool> core::m_fast_exit(false);
}

20
src/cryptonote_core/cryptonote_core.h
View file

@ -230,28 +230,10 @@ 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)
*/
@ -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