Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2214 

41f935dd network_throttle: remove unneeded heap allocations (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-08-07 15:10:27 +02:00
parent 1e2d6f898e 41f935ddb2
commit a963da9001
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/p2p/network_throttle.cpp
View File

@ -77,28 +77,22 @@ int network_throttle_manager::xxx;
// ================================================================================================ // ================================================================================================
// methods: // methods:
i_network_throttle & network_throttle_manager::get_global_throttle_in() { i_network_throttle & network_throttle_manager::get_global_throttle_in() {
boost::call_once(m_once_get_global_throttle_in, [] { m_obj_get_global_throttle_in.reset(new network_throttle("in/all","<<< global-IN",10)); } ); static network_throttle obj_get_global_throttle_in("in/all","<<< global-IN",10);
return * m_obj_get_global_throttle_in; return obj_get_global_throttle_in;
} }
boost::once_flag network_throttle_manager::m_once_get_global_throttle_in;
std::unique_ptr<i_network_throttle> network_throttle_manager::m_obj_get_global_throttle_in;
i_network_throttle & network_throttle_manager::get_global_throttle_inreq() { i_network_throttle & network_throttle_manager::get_global_throttle_inreq() {
boost::call_once(m_once_get_global_throttle_inreq, [] { m_obj_get_global_throttle_inreq.reset(new network_throttle("inreq/all", "<== global-IN-REQ",10)); } ); static network_throttle obj_get_global_throttle_inreq("inreq/all", "<== global-IN-REQ",10);
return * m_obj_get_global_throttle_inreq; return obj_get_global_throttle_inreq;
} }
boost::once_flag network_throttle_manager::m_once_get_global_throttle_inreq;
std::unique_ptr<i_network_throttle> network_throttle_manager::m_obj_get_global_throttle_inreq;
i_network_throttle & network_throttle_manager::get_global_throttle_out() { i_network_throttle & network_throttle_manager::get_global_throttle_out() {
boost::call_once(m_once_get_global_throttle_out, [] { m_obj_get_global_throttle_out.reset(new network_throttle("out/all", ">>> global-OUT",10)); } ); static network_throttle obj_get_global_throttle_out("out/all", ">>> global-OUT",10);
return * m_obj_get_global_throttle_out; return obj_get_global_throttle_out;
} }
boost::once_flag network_throttle_manager::m_once_get_global_throttle_out;
std::unique_ptr<i_network_throttle> network_throttle_manager::m_obj_get_global_throttle_out;

7
src/p2p/network_throttle.hpp
View File

@ -111,13 +111,6 @@ class network_throttle_manager {
//protected: //protected:
public: // XXX public: // XXX
// [[note1]]
static boost::once_flag m_once_get_global_throttle_in;
static boost::once_flag m_once_get_global_throttle_inreq; // [[note2]]
static boost::once_flag m_once_get_global_throttle_out;
static std::unique_ptr<i_network_throttle> m_obj_get_global_throttle_in;
static std::unique_ptr<i_network_throttle> m_obj_get_global_throttle_inreq;
static std::unique_ptr<i_network_throttle> m_obj_get_global_throttle_out;
static boost::mutex m_lock_get_global_throttle_in; static boost::mutex m_lock_get_global_throttle_in;
static boost::mutex m_lock_get_global_throttle_inreq; static boost::mutex m_lock_get_global_throttle_inreq;