From d8ee0a95c7e3a1aba2aa79173f2d55f2db6f31cd Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Sun, 17 May 2015 13:13:02 +0100 Subject: [PATCH] print limits when running limit commands with no arguments It's more user friendly that an error message saying the command does not exist. --- src/daemon/command_parser_executor.cpp | 15 ++++++++++++--- src/daemon/rpc_command_executor.cpp | 23 +++++++++++++++++++++++ src/daemon/rpc_command_executor.h | 6 ++++++ src/p2p/connection_basic.cpp | 17 +++++++++++++++++ src/p2p/connection_basic.hpp | 2 ++ 5 files changed, 60 insertions(+), 3 deletions(-) diff --git a/src/daemon/command_parser_executor.cpp b/src/daemon/command_parser_executor.cpp index fd7b40be2..1b86ff269 100644 --- a/src/daemon/command_parser_executor.cpp +++ b/src/daemon/command_parser_executor.cpp @@ -251,7 +251,10 @@ bool t_command_parser_executor::print_status(const std::vector& arg bool t_command_parser_executor::set_limit(const std::vector& args) { - if(args.size()!=1) return false; + if(args.size()>1) return false; + if(args.size()==0) { + return m_executor.get_limit(); + } int limit; try { limit = std::stoi(args[0]); @@ -267,7 +270,10 @@ bool t_command_parser_executor::set_limit(const std::vector& args) bool t_command_parser_executor::set_limit_up(const std::vector& args) { - if(args.size()!=1) return false; + if(args.size()>1) return false; + if(args.size()==0) { + return m_executor.get_limit_up(); + } int limit; try { limit = std::stoi(args[0]); @@ -283,7 +289,10 @@ bool t_command_parser_executor::set_limit_up(const std::vector& arg bool t_command_parser_executor::set_limit_down(const std::vector& args) { - if(args.size()!=1) return false; + if(args.size()>1) return false; + if(args.size()==0) { + return m_executor.get_limit_down(); + } int limit; try { limit = std::stoi(args[0]); diff --git a/src/daemon/rpc_command_executor.cpp b/src/daemon/rpc_command_executor.cpp index 8ef91600c..79b52711a 100644 --- a/src/daemon/rpc_command_executor.cpp +++ b/src/daemon/rpc_command_executor.cpp @@ -737,6 +737,15 @@ bool t_rpc_command_executor::print_status() return true; } +bool t_rpc_command_executor::get_limit() +{ + int limit_down = epee::net_utils::connection_basic::get_rate_down_limit( ); + int limit_up = epee::net_utils::connection_basic::get_rate_up_limit( ); + std::cout << "limit-down is " << limit_down/1024 << " kB/s" << std::endl; + std::cout << "limit-up is " << limit_up/1024 << " kB/s" << std::endl; + return true; +} + bool t_rpc_command_executor::set_limit(int limit) { epee::net_utils::connection_basic::set_rate_down_limit( limit ); @@ -746,6 +755,13 @@ bool t_rpc_command_executor::set_limit(int limit) return true; } +bool t_rpc_command_executor::get_limit_up() +{ + int limit_up = epee::net_utils::connection_basic::get_rate_up_limit( ); + std::cout << "limit-up is " << limit_up/1024 << " kB/s" << std::endl; + return true; +} + bool t_rpc_command_executor::set_limit_up(int limit) { epee::net_utils::connection_basic::set_rate_up_limit( limit ); @@ -753,6 +769,13 @@ bool t_rpc_command_executor::set_limit_up(int limit) return true; } +bool t_rpc_command_executor::get_limit_down() +{ + int limit_down = epee::net_utils::connection_basic::get_rate_down_limit( ); + std::cout << "limit-down is " << limit_down/1024 << " kB/s" << std::endl; + return true; +} + bool t_rpc_command_executor::set_limit_down(int limit) { epee::net_utils::connection_basic::set_rate_down_limit( limit ); diff --git a/src/daemon/rpc_command_executor.h b/src/daemon/rpc_command_executor.h index 43b8a9fe0..21229c577 100644 --- a/src/daemon/rpc_command_executor.h +++ b/src/daemon/rpc_command_executor.h @@ -99,6 +99,12 @@ public: bool print_status(); + bool get_limit(); + + bool get_limit_up(); + + bool get_limit_down(); + bool set_limit(int limit); bool set_limit_up(int limit); diff --git a/src/p2p/connection_basic.cpp b/src/p2p/connection_basic.cpp index 0454f30e3..adf159dc0 100644 --- a/src/p2p/connection_basic.cpp +++ b/src/p2p/connection_basic.cpp @@ -199,6 +199,23 @@ void connection_basic::set_rate_down_limit(uint64_t limit) { save_limit_to_file(limit); } +uint64_t connection_basic::get_rate_up_limit() { + uint64_t limit; + { + CRITICAL_REGION_LOCAL( network_throttle_manager::m_lock_get_global_throttle_out ); + limit = network_throttle_manager::get_global_throttle_out().get_terget_speed(); + } + return limit; +} + +uint64_t connection_basic::get_rate_down_limit() { + uint64_t limit; + { + CRITICAL_REGION_LOCAL( network_throttle_manager::m_lock_get_global_throttle_in ); + limit = network_throttle_manager::get_global_throttle_in().get_terget_speed(); + } + return limit; +} void connection_basic::save_limit_to_file(int limit) { // saving limit to file diff --git a/src/p2p/connection_basic.hpp b/src/p2p/connection_basic.hpp index d8101afe4..945cd982c 100644 --- a/src/p2p/connection_basic.hpp +++ b/src/p2p/connection_basic.hpp @@ -119,6 +119,8 @@ class connection_basic { // not-templated base class for rapid developmet of som static void set_rate_up_limit(uint64_t limit); static void set_rate_down_limit(uint64_t limit); + static uint64_t get_rate_up_limit(); + static uint64_t get_rate_down_limit(); // config misc static void set_tos_flag(int tos); // ToS / QoS flag