From c31b8650465c2634ac593602d728bb5ca7eeafb1 Mon Sep 17 00:00:00 2001
From: rakshasa <sundell.software@gmail.com>
Date: Tue, 21 Jun 2011 07:05:10 +0000
Subject: [PATCH] * Increased the default values for min/max_peers and
 max_uploads.

git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@1238 e378c898-3ddf-0310-93e7-cc216c733640
---
 doc/log_stats.plot     | 31 ++++++++++++++++++++-----------
 src/command_network.cc |  6 +++---
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/doc/log_stats.plot b/doc/log_stats.plot
index 70c65abc..1e02bde1 100644
--- a/doc/log_stats.plot
+++ b/doc/log_stats.plot
@@ -71,14 +71,23 @@ plot "peer_stats.$1" using 1:7 smooth sbezier with lines lw 4,\
      "peer_stats.$1" using 1:2 smooth sbezier with lines lw 2 axis x1y2,\
      "peer_stats.$1" using 1:3 smooth sbezier with lines lw 2 axis x1y2
 
+set output "output_$1_groups.png"
+plot "choke_group_stats.$1" \
+        using 1:8     smooth sbezier with lines lw 4,\
+     "" using 1:8+7*1 smooth sbezier with lines lw 4,\
+     "" using 1:8+7*2 smooth sbezier with lines lw 4,\
+     "" using 1:8+7*3 smooth sbezier with lines lw 4\
+
+
 set format y "%.0s %cb"
 
 set output "output_$1_bandwidth.png"
 plot "bandwidth_stats.$1" using 1:2 smooth sbezier with lines lw 4,\
      "bandwidth_stats.$1" using 1:4 smooth sbezier with lines lw 4,\
-     "choke_group_stats.$1" using 1:4 smooth sbezier with lines lw 3,\
-     "choke_group_stats.$1" using 1:7 smooth sbezier with lines lw 3,\
-     "choke_group_stats.$1" using 1:11 smooth sbezier with lines lw 3,\
+     "choke_group_stats.$1" using 1:4+7*1 smooth sbezier with lines lw 3,\
+     "choke_group_stats.$1" using 1:7+7*1 smooth sbezier with lines lw 3,\
+     "choke_group_stats.$1" using 1:4+7*2 smooth sbezier with lines lw 3,\
+     "choke_group_stats.$1" using 1:4+7*3 smooth sbezier with lines lw 3,\
      "peer_stats.$1" using 1:2 smooth sbezier with lines lw 2 axis x1y2,\
      "peer_stats.$1" using 1:3 smooth sbezier with lines lw 2 axis x1y2
 
@@ -128,13 +137,13 @@ set output "output_$1_choke.png"
 set style histogram columnstacked
 
 plot "choke_group_stats.$1" \
-        using 1:8  smooth sbezier with lines lw 3,\
-     "" using 1:15 smooth sbezier with lines lw 3,\
-     "" using 1:2 smooth sbezier with lines lw 2 axis x1y2,\
-     "" using 1:3 smooth sbezier with lines lw 2 axis x1y2,\
-     "" using 1:5 smooth sbezier with lines lw 2 axis x1y2,\
-     "" using 1:6 smooth sbezier with lines lw 2 axis x1y2,\
-     "" using 1:9 smooth sbezier with lines lw 2 axis x1y2,\
-     "" using 1:10 smooth sbezier with lines lw 2 axis x1y2
+        using 1:2+7*1 smooth sbezier with lines lw 2 axis x1y2,\
+     "" using 1:3+7*1 smooth sbezier with lines lw 2 axis x1y2,\
+     "" using 1:5+7*1 smooth sbezier with lines lw 2 axis x1y2,\
+     "" using 1:6+7*1 smooth sbezier with lines lw 2 axis x1y2,\
+     "" using 1:2+7*2 smooth sbezier with lines lw 2 axis x1y2,\
+     "" using 1:3+7*2 smooth sbezier with lines lw 2 axis x1y2,\
+     "" using 1:2+7*3 smooth sbezier with lines lw 2 axis x1y2,\
+     "" using 1:3+7*3 smooth sbezier with lines lw 2 axis x1y2
 
 EOF
diff --git a/src/command_network.cc b/src/command_network.cc
index 8d1f6e14..c2e7963d 100644
--- a/src/command_network.cc
+++ b/src/command_network.cc
@@ -640,12 +640,12 @@ initialize_command_network() {
   CMD2_ANY         ("throttle.unchoked_uploads",   std::bind(&torrent::ResourceManager::currently_upload_unchoked, torrent::resource_manager()));
   CMD2_ANY         ("throttle.unchoked_downloads", std::bind(&torrent::ResourceManager::currently_download_unchoked, torrent::resource_manager()));
 
-  CMD2_VAR_VALUE   ("throttle.min_peers.normal", 40);
-  CMD2_VAR_VALUE   ("throttle.max_peers.normal", 100);
+  CMD2_VAR_VALUE   ("throttle.min_peers.normal", 100);
+  CMD2_VAR_VALUE   ("throttle.max_peers.normal", 200);
   CMD2_VAR_VALUE   ("throttle.min_peers.seed",   -1);
   CMD2_VAR_VALUE   ("throttle.max_peers.seed",   -1);
 
-  CMD2_VAR_VALUE   ("throttle.max_uploads", 15);
+  CMD2_VAR_VALUE   ("throttle.max_uploads",      50);
 
   CMD2_VAR_VALUE   ("throttle.max_uploads.div",      1);
   CMD2_VAR_VALUE   ("throttle.max_uploads.global",   0);