From c2686b1c502fb4cefe7fc088b913af54da59afac Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Sun, 12 Nov 2006 13:57:55 +0000
Subject: [PATCH] 2006-11-11  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot
 com>

	* src/DefaultPeerStorage.cc
	(calculateStat): Simplified the code by combining 2 loops into
1.
---
 ChangeLog                 |  5 +++++
 src/DefaultPeerStorage.cc | 11 ++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 951368a3..86e659de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-11  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
+
+	* src/DefaultPeerStorage.cc
+	(calculateStat): Simplified the code by combining 2 loops into 1.
+
 2006-11-09  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
 
 	Introduce new preference PREF_BT_TIMEOUT. This is the timeout value
diff --git a/src/DefaultPeerStorage.cc b/src/DefaultPeerStorage.cc
index 52b53a1d..3344a1f0 100644
--- a/src/DefaultPeerStorage.cc
+++ b/src/DefaultPeerStorage.cc
@@ -150,15 +150,12 @@ Peers DefaultPeerStorage::getActivePeers() {
 
 TransferStat DefaultPeerStorage::calculateStat() {
   TransferStat stat;
-  Peers activePeers = getActivePeers();
-  for(Peers::iterator itr = activePeers.begin();
-      itr != activePeers.end(); itr++) {
-    PeerHandle& peer = *itr;
-    stat.downloadSpeed += peer->calculateDownloadSpeed();
-    stat.uploadSpeed += peer->calculateUploadSpeed();
-  }
   for(Peers::iterator itr = peers.begin(); itr != peers.end(); itr++) {
     PeerHandle& peer = *itr;
+    if(peer->isActive()) {
+      stat.downloadSpeed += peer->calculateDownloadSpeed();
+      stat.uploadSpeed += peer->calculateUploadSpeed();
+    }
     stat.sessionDownloadLength += peer->getSessionDownloadLength();
     stat.sessionUploadLength += peer->getSessionUploadLength();
   }