Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-25 09:49:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

s/terget/target/

Browse Source
This commit is contained in:
moneromooo-monero 2015-05-17 13:16:26 +01:00
parent d8ee0a95c7
commit f278fe3883
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/p2p/connection_basic.cpp
View File

@ -203,7 +203,7 @@ uint64_t connection_basic::get_rate_up_limit() {
uint64_t limit; uint64_t limit;
{ {
CRITICAL_REGION_LOCAL( network_throttle_manager::m_lock_get_global_throttle_out ); CRITICAL_REGION_LOCAL( network_throttle_manager::m_lock_get_global_throttle_out );
limit = network_throttle_manager::get_global_throttle_out().get_terget_speed(); limit = network_throttle_manager::get_global_throttle_out().get_target_speed();
} }
return limit; return limit;
} }
@ -212,7 +212,7 @@ uint64_t connection_basic::get_rate_down_limit() {
uint64_t limit; uint64_t limit;
{ {
CRITICAL_REGION_LOCAL( network_throttle_manager::m_lock_get_global_throttle_in ); CRITICAL_REGION_LOCAL( network_throttle_manager::m_lock_get_global_throttle_in );
limit = network_throttle_manager::get_global_throttle_in().get_terget_speed(); limit = network_throttle_manager::get_global_throttle_in().get_target_speed();
} }
return limit; return limit;
} }
@ -224,12 +224,12 @@ void connection_basic::save_limit_to_file(int limit) {
{ {
CRITICAL_REGION_LOCAL( network_throttle_manager::m_lock_get_global_throttle_out ); 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_terget_speed() / 1024); 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 ); 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_terget_speed() / 1024); epee::net_utils::data_logger::get_instance().add_data("download_limit", network_throttle_manager::get_global_throttle_in().get_target_speed() / 1024);
} }
} }

2
src/p2p/network_throttle-detail.cpp
View File

@ -172,7 +172,7 @@ void network_throttle::set_real_target_speed( network_speed_kbps real_target )
m_real_target_speed = real_target * 1024; m_real_target_speed = real_target * 1024;
} }
network_speed_kbps network_throttle::get_terget_speed() network_speed_kbps network_throttle::get_target_speed()
{ {
return m_real_target_speed / 1024; return m_real_target_speed / 1024;
} }

2
src/p2p/network_throttle-detail.hpp
View File

@ -81,7 +81,7 @@ class network_throttle : public i_network_throttle {
virtual void set_name(const std::string &name); virtual void set_name(const std::string &name);
virtual void set_target_speed( network_speed_kbps target ); virtual void set_target_speed( network_speed_kbps target );
virtual void set_real_target_speed( network_speed_kbps real_target ); // only for throttle_out virtual void set_real_target_speed( network_speed_kbps real_target ); // only for throttle_out
virtual network_speed_kbps get_terget_speed(); virtual network_speed_kbps get_target_speed();
// add information about events: // add information about events:
virtual void handle_trafic_exact(size_t packet_size); ///< count the new traffic/packet; the size is exact considering all network costs virtual void handle_trafic_exact(size_t packet_size); ///< count the new traffic/packet; the size is exact considering all network costs

2
src/p2p/network_throttle.hpp
View File

@ -147,7 +147,7 @@ class i_network_throttle {
virtual void set_name(const std::string &name)=0; virtual void set_name(const std::string &name)=0;
virtual void set_target_speed( network_speed_kbps target )=0; virtual void set_target_speed( network_speed_kbps target )=0;
virtual void set_real_target_speed(network_speed_kbps real_target)=0; virtual void set_real_target_speed(network_speed_kbps real_target)=0;
virtual network_speed_kbps get_terget_speed()=0; virtual network_speed_kbps get_target_speed()=0;
virtual void handle_trafic_exact(size_t packet_size) =0; // count the new traffic/packet; the size is exact considering all network costs virtual void handle_trafic_exact(size_t packet_size) =0; // count the new traffic/packet; the size is exact considering all network costs
virtual void handle_trafic_tcp(size_t packet_size) =0; // count the new traffic/packet; the size is as TCP, we will consider MTU etc virtual void handle_trafic_tcp(size_t packet_size) =0; // count the new traffic/packet; the size is as TCP, we will consider MTU etc

10
tests/functional_tests/transactions_flow_test.cpp
View File

@ -112,7 +112,7 @@ uint64_t get_money_in_first_transfers(const tools::wallet2::transfer_container&
bool transactions_flow_test(std::string& working_folder, bool transactions_flow_test(std::string& working_folder,
std::string path_source_wallet, std::string path_source_wallet,
std::string path_terget_wallet, std::string path_target_wallet,
std::string& daemon_addr_a, std::string& daemon_addr_a,
std::string& daemon_addr_b, std::string& daemon_addr_b,
uint64_t amount_to_transfer, size_t mix_in_factor, size_t transactions_count, size_t transactions_per_second) uint64_t amount_to_transfer, size_t mix_in_factor, size_t transactions_count, size_t transactions_per_second)
@ -122,14 +122,14 @@ bool transactions_flow_test(std::string& working_folder,
if(path_source_wallet.empty()) if(path_source_wallet.empty())
path_source_wallet = generate_random_wallet_name(); path_source_wallet = generate_random_wallet_name();
if(path_terget_wallet.empty()) if(path_target_wallet.empty())
path_terget_wallet = generate_random_wallet_name(); path_target_wallet = generate_random_wallet_name();
try try
{ {
w1.generate(working_folder + "/" + path_source_wallet, ""); w1.generate(working_folder + "/" + path_source_wallet, "");
w2.generate(working_folder + "/" + path_terget_wallet, ""); w2.generate(working_folder + "/" + path_target_wallet, "");
} }
catch (const std::exception& e) catch (const std::exception& e)
{ {
@ -152,7 +152,7 @@ bool transactions_flow_test(std::string& working_folder,
LOG_PRINT_GREEN("Using wallets: " << ENDL LOG_PRINT_GREEN("Using wallets: " << ENDL
<< "Source: " << w1.get_account().get_public_address_str(false) << ENDL << "Path: " << working_folder + "/" + path_source_wallet << ENDL << "Source: " << w1.get_account().get_public_address_str(false) << ENDL << "Path: " << working_folder + "/" + path_source_wallet << ENDL
<< "Target: " << w2.get_account().get_public_address_str(false) << ENDL << "Path: " << working_folder + "/" + path_terget_wallet, LOG_LEVEL_1); << "Target: " << w2.get_account().get_public_address_str(false) << ENDL << "Path: " << working_folder + "/" + path_target_wallet, LOG_LEVEL_1);
//lets do some money //lets do some money
epee::net_utils::http::http_simple_client http_client; epee::net_utils::http::http_simple_client http_client;

2
tests/functional_tests/transactions_flow_test.h
View File

@ -30,7 +30,7 @@
bool transactions_flow_test(std::string& working_folder, bool transactions_flow_test(std::string& working_folder,
std::string path_source_wallet, std::string path_source_wallet,
std::string path_terget_wallet, std::string path_target_wallet,
std::string& daemon_addr_a, std::string& daemon_addr_a,
std::string& daemon_addr_b, std::string& daemon_addr_b,
uint64_t amount_to_transfer, size_t mix_in_factor, size_t transactions_count, size_t transactions_per_second); uint64_t amount_to_transfer, size_t mix_in_factor, size_t transactions_count, size_t transactions_per_second);