mirror of
https://github.com/monero-project/monero.git
synced 2025-07-24 20:55:21 -04:00
2014 network limit 1.1 +utils +toc -doc -drmonero
Update of the PR with network limits works very well for all speeds (but remember that low download speed can stop upload because we then slow down downloading of blockchain requests too) more debug options fixed pedantic warnings in our code should work again on Mac OS X and FreeBSD fixed warning about size_t tested on Debian, Ubuntu, Windows(testing now) TCP options and ToS (QoS) flag FIXED peer number limit FIXED some spikes in ingress/download FIXED problems when other up and down limit
This commit is contained in:
parent
eabb519605
commit
5ce4256e3d
30 changed files with 714 additions and 383 deletions
|
@ -178,6 +178,22 @@ bool blockchain_storage::store_genesis_block(bool testnet) {
|
|||
return true;
|
||||
}
|
||||
//------------------------------------------------------------------
|
||||
void blockchain_storage::logger_handle(long int ms)
|
||||
{
|
||||
std::ofstream log_file;
|
||||
log_file.open("log/dr-monero/blockchain_log.data", std::ofstream::out | std::ofstream::app);
|
||||
log_file.precision(7);
|
||||
|
||||
using namespace boost::chrono;
|
||||
auto point = steady_clock::now();
|
||||
auto time_from_epoh = point.time_since_epoch();
|
||||
auto m_ms = duration_cast< milliseconds >( time_from_epoh ).count();
|
||||
double ms_f = m_ms;
|
||||
ms_f /= 1000.;
|
||||
|
||||
log_file << ms_f << " " << ms << std::endl;
|
||||
}
|
||||
//------------------------------------------------------------------
|
||||
bool blockchain_storage::store_blockchain()
|
||||
{
|
||||
m_is_blockchain_storing = true;
|
||||
|
@ -1760,6 +1776,8 @@ bool blockchain_storage::handle_block_to_main_chain(const block& bl, const crypt
|
|||
<< "), coinbase_blob_size: " << coinbase_blob_size << ", cumulative size: " << cumulative_block_size
|
||||
<< ", " << block_processing_time << "("<< target_calculating_time << "/" << longhash_calculating_time << ")ms");
|
||||
|
||||
logger_handle(block_processing_time);
|
||||
|
||||
bvc.m_added_to_main_chain = true;
|
||||
/*if(!m_orphanes_reorganize_in_work)
|
||||
review_orphaned_blocks_with_new_block_id(id, true);*/
|
||||
|
|
|
@ -249,6 +249,7 @@ namespace cryptonote
|
|||
bool complete_timestamps_vector(uint64_t start_height, std::vector<uint64_t>& timestamps);
|
||||
bool update_next_comulative_size_limit();
|
||||
bool store_genesis_block(bool testnet);
|
||||
void logger_handle(long int ms);
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -187,11 +187,34 @@ namespace cryptonote
|
|||
//-----------------------------------------------------------------------------------------------
|
||||
bool core::deinit()
|
||||
{
|
||||
m_miner.stop();
|
||||
m_mempool.deinit();
|
||||
m_blockchain_storage.deinit();
|
||||
m_miner.stop();
|
||||
m_mempool.deinit();
|
||||
if (!m_fast_exit)
|
||||
{
|
||||
m_blockchain_storage.deinit();
|
||||
}
|
||||
return true;
|
||||
}
|
||||
//-----------------------------------------------------------------------------------------------
|
||||
void core::set_fast_exit()
|
||||
{
|
||||
m_fast_exit = true;
|
||||
}
|
||||
//-----------------------------------------------------------------------------------------------
|
||||
bool core::get_fast_exit()
|
||||
{
|
||||
return m_fast_exit;
|
||||
}
|
||||
//-----------------------------------------------------------------------------------------------
|
||||
void core::no_check_blocks()
|
||||
{
|
||||
m_check_blocks = false;
|
||||
}
|
||||
//-----------------------------------------------------------------------------------------------
|
||||
bool core::get_check_blocks()
|
||||
{
|
||||
return m_check_blocks;
|
||||
}
|
||||
//-----------------------------------------------------------------------------------------------
|
||||
bool core::handle_incoming_tx(const blobdata& tx_blob, tx_verification_context& tvc, bool keeped_by_block)
|
||||
{
|
||||
|
@ -595,4 +618,6 @@ namespace cryptonote
|
|||
{
|
||||
raise(SIGTERM);
|
||||
}
|
||||
|
||||
std::atomic<bool> core::m_fast_exit(false);
|
||||
}
|
||||
|
|
|
@ -75,6 +75,10 @@ namespace cryptonote
|
|||
bool init(const boost::program_options::variables_map& vm, bool testnet);
|
||||
bool set_genesis_block(const block& b);
|
||||
bool deinit();
|
||||
static void set_fast_exit();
|
||||
static bool get_fast_exit();
|
||||
void no_check_blocks();
|
||||
bool get_check_blocks();
|
||||
uint64_t get_current_blockchain_height();
|
||||
bool get_blockchain_top(uint64_t& heeight, crypto::hash& top_id);
|
||||
bool get_blocks(uint64_t start_offset, size_t count, std::list<block>& blocks, std::list<transaction>& txs);
|
||||
|
@ -146,6 +150,8 @@ namespace cryptonote
|
|||
bool on_update_blocktemplate_interval();
|
||||
bool check_tx_inputs_keyimages_diff(const transaction& tx);
|
||||
void graceful_exit();
|
||||
static std::atomic<bool> m_fast_exit;
|
||||
bool m_check_blocks = true;
|
||||
|
||||
|
||||
tx_memory_pool m_mempool;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue