diff options
Diffstat (limited to 'src/p2p/connection_basic.cpp')
| -rw-r--r-- | src/p2p/connection_basic.cpp | 32 |
1 files changed, 6 insertions, 26 deletions
diff --git a/src/p2p/connection_basic.cpp b/src/p2p/connection_basic.cpp index 981a02882..80915e9a3 100644 --- a/src/p2p/connection_basic.cpp +++ b/src/p2p/connection_basic.cpp @@ -77,14 +77,13 @@ #include <boost/asio/ip/unicast.hpp> #include "../../contrib/epee/include/net/abstract_tcp_server2.h" -#include "../../contrib/otshell_utils/utils.hpp" -#include "data_logger.hpp" -using namespace nOT::nUtils; - // TODO: #include "../../src/p2p/network_throttle-detail.hpp" #include "../../src/cryptonote_core/cryptonote_core.h" +#undef MONERO_DEFAULT_LOG_CATEGORY +#define MONERO_DEFAULT_LOG_CATEGORY "net.p2p" + // ################################################################################################ // local (TU local) headers // ################################################################################################ @@ -219,19 +218,6 @@ uint64_t connection_basic::get_rate_down_limit() { } void connection_basic::save_limit_to_file(int limit) { - // saving limit to file - if (!epee::net_utils::data_logger::m_save_graph) - return; - - { - CRITICAL_REGION_LOCAL( network_throttle_manager::m_lock_get_global_throttle_out ); - epee::net_utils::data_logger::get_instance().add_data("upload_limit", network_throttle_manager::get_global_throttle_out().get_target_speed() / 1024); - } - - { - CRITICAL_REGION_LOCAL( network_throttle_manager::m_lock_get_global_throttle_in ); - epee::net_utils::data_logger::get_instance().add_data("download_limit", network_throttle_manager::get_global_throttle_in().get_target_speed() / 1024); - } } void connection_basic::set_tos_flag(int tos) { @@ -259,9 +245,8 @@ void connection_basic::sleep_before_packet(size_t packet_size, int phase, int q delay *= 0.50; if (delay > 0) { long int ms = (long int)(delay * 1000); - _info_c("net/sleep", "Sleeping in " << __FUNCTION__ << " for " << ms << " ms before packet_size="<<packet_size); // debug sleep + MDEBUG("Sleeping in " << __FUNCTION__ << " for " << ms << " ms before packet_size="<<packet_size); // debug sleep _dbg1("sleep in sleep_before_packet"); - epee::net_utils::data_logger::get_instance().add_data("sleep_up", ms); boost::this_thread::sleep(boost::posix_time::milliseconds( ms ) ); } } while(delay > 0); @@ -280,25 +265,21 @@ void connection_basic::set_start_time() { void connection_basic::do_send_handler_write(const void* ptr , size_t cb ) { sleep_before_packet(cb,1,-1); - _info_c("net/out/size", "handler_write (direct) - before ASIO write, for packet="<<cb<<" B (after sleep)"); + MDEBUG("handler_write (direct) - before ASIO write, for packet="<<cb<<" B (after sleep)"); set_start_time(); } void connection_basic::do_send_handler_write_from_queue( const boost::system::error_code& e, size_t cb, int q_len ) { sleep_before_packet(cb,2,q_len); - _info_c("net/out/size", "handler_write (after write, from queue="<<q_len<<") - before ASIO write, for packet="<<cb<<" B (after sleep)"); + MDEBUG("handler_write (after write, from queue="<<q_len<<") - before ASIO write, for packet="<<cb<<" B (after sleep)"); set_start_time(); } void connection_basic::logger_handle_net_read(size_t size) { // network data read - size /= 1024; - epee::net_utils::data_logger::get_instance().add_data("download", size); } void connection_basic::logger_handle_net_write(size_t size) { - size /= 1024; - epee::net_utils::data_logger::get_instance().add_data("upload", size); } double connection_basic::get_sleep_time(size_t cb) { @@ -308,7 +289,6 @@ double connection_basic::get_sleep_time(size_t cb) { } void connection_basic::set_save_graph(bool save_graph) { - epee::net_utils::data_logger::m_save_graph = save_graph; } |