Merge pull request #2877

43f5269f Wallets now do not depend on the daemon rpc lib (moneromooo-monero)
bb89ae8b move connection_basic and network_throttle from src/p2p to epee (moneromooo-monero)
4abf25f3 cryptonote_core does not depend on p2p anymore (moneromooo-monero)

1 files changed, 0 insertions, 113 deletions

diff --git a/src/p2p/network_throttle.cpp b/src/p2p/network_throttle.cpp
deleted file mode 100644
index 74b20376d..000000000
--- a/src/p2p/network_throttle.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-/**
-@file
-@author rfree (current maintainer in monero.cc project)
-@brief interface for throttling of connection (count and rate-limit speed etc) 
-@details <PRE>
-
-Throttling work by:
-1) taking note of all traffic (hooks added e.g. to connection class) and measuring speed
-2) depending on that information we sleep before sending out data (or send smaller portions of data)
-3) depending on the information we can also sleep before sending requests or ask for smaller sets of data to download
-
-</PRE> 
-
-@image html images/net/rate1-down-1k.png
-@image html images/net/rate1-down-full.png
-@image html images/net/rate1-up-10k.png
-@image html images/net/rate1-up-full.png
-@image html images/net/rate2-down-100k.png
-@image html images/net/rate2-down-10k.png
-@image html images/net/rate2-down-50k.png
-@image html images/net/rate2-down-full.png
-@image html images/net/rate2-up-100k.png
-@image html images/net/rate2-up-10k.png
-@image html images/net/rate3-up-10k.png
-
-
-*/
-
-// Copyright (c) 2014-2017, The Monero Project
-// 
-// All rights reserved.
-// 
-// Redistribution and use in source and binary forms, with or without modification, are
-// permitted provided that the following conditions are met:
-// 
-// 1. Redistributions of source code must retain the above copyright notice, this list of
-//    conditions and the following disclaimer.
-// 
-// 2. Redistributions in binary form must reproduce the above copyright notice, this list
-//    of conditions and the following disclaimer in the documentation and/or other
-//    materials provided with the distribution.
-// 
-// 3. Neither the name of the copyright holder nor the names of its contributors may be
-//    used to endorse or promote products derived from this software without specific
-//    prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "network_throttle-detail.hpp"
-
-namespace epee
-{
-namespace net_utils
-{
-
-// ================================================================================================
-// network_throttle_manager
-// ================================================================================================
-
-// ================================================================================================
-// static:
-boost::mutex network_throttle_manager::m_lock_get_global_throttle_in;
-boost::mutex network_throttle_manager::m_lock_get_global_throttle_inreq;
-boost::mutex network_throttle_manager::m_lock_get_global_throttle_out;
-
-int network_throttle_manager::xxx;
-
-
-// ================================================================================================
-// methods:
-i_network_throttle & network_throttle_manager::get_global_throttle_in() { 
-	static network_throttle obj_get_global_throttle_in("in/all","<<< global-IN",10);
-	return obj_get_global_throttle_in;
-}
-
-
-
-i_network_throttle & network_throttle_manager::get_global_throttle_inreq() { 
-	static network_throttle obj_get_global_throttle_inreq("inreq/all", "<== global-IN-REQ",10);
-	return obj_get_global_throttle_inreq;
-}
-
-
-i_network_throttle & network_throttle_manager::get_global_throttle_out() { 
-	static network_throttle obj_get_global_throttle_out("out/all", ">>> global-OUT",10);
-	return obj_get_global_throttle_out;
-}
-
-
-
-
-network_throttle_bw::network_throttle_bw(const std::string &name1) 
-	: m_in("in/"+name1, name1+"-DOWNLOAD"), m_inreq("inreq/"+name1, name1+"-DOWNLOAD-REQUESTS"), m_out("out/"+name1, name1+"-UPLOAD")
-{ }
-
-
-
-
-} // namespace 
-} // namespace 
-
-
-
-
-