2008-02-10 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>

	Extract the Peer class's member variables, which are only needed 
after
	PeerInteractionCommand, into PeerSessionResource class.
	This class is instantiated in PeerInteractionCommand class's 
ctor and
	released in its dtor.
	This will make Peer class lightweight and uses less memory for 
peers
	which are not connected and wait in the queue.
	* src/PeerChokeCommand.cc
	* src/PeerSessionResource.{h, cc}
	* src/PeerInteractionCommand.cc
	* src/PeerAbstractCommand.cc: Note: 0 is given to onAbort() 
function.
	* src/DefaultBtInteractive.cc
	* src/BtPieceMessage.cc
	* src/BtInterestedMessage.cc
	* src/BtUnchokeMessage.cc
	* src/DefaultPeerStorage.{h, cc}
	* src/PeerInitiateConnectionCommand.cc
	* src/ActivePeerConnectionCommand.cc
	* src/BtNotInterestedMessage.cc
	* src/DefaultBtMessageDispatcher.cc
	* src/BtChokeMessage.cc
	* src/BtRequestMessage.cc
	* src/Peer.{h, cc}
	* src/BtRegistry.h
	* src/TrackerWatcherCommand.cc
	* src/PeerReceiveHandshakeCommand.cc
	* test/BtExtendedMessageTest.cc
	* test/BtAllowedFastMessageTest.cc
	* test/BtCancelMessageTest.cc
	* test/DefaultPieceStorageTest.cc
	* test/BtBitfieldMessageTest.cc
	* test/BtHaveMessageTest.cc
	* test/BtNotInterestedMessageTest.cc
	* test/BtRequestMessageTest.cc
	* test/PeerSessionResourceTest.cc
	* test/DefaultBtMessageDispatcherTest.cc
	* test/PeerTest.cc
	* test/BtInterestedMessageTest.cc
	* test/BtRejectMessageTest.cc
	* test/BtChokeMessageTest.cc
	* test/DefaultPeerStorageTest.cc
	* test/BtHaveNoneMessageTest.cc
	* test/BtHaveAllMessageTest.cc
	* test/DefaultExtensionMessageFactoryTest.cc
	* test/BtUnchokeMessageTest.cc
	* test/DefaultBtMessageFactoryTest.cc
	* test/HandshakeExtensionMessageTest.cc
	* test/UTPexExtensionMessageTest.cc
	* test/DefaultBtRequestFactoryTest.cc
	* test/BtPieceMessageTest.cc
	
	Removed typedef PeerStats.
	* src/PeerStat.h
	* src/SegmentMan.cc

1 files changed, 186 insertions, 0 deletions

diff --git a/src/PeerSessionResource.h b/src/PeerSessionResource.h
new file mode 100644
index 00000000..c4ede68e
--- /dev/null
+++ b/src/PeerSessionResource.h
@@ -0,0 +1,186 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2006 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#ifndef _D_PEER_SESSION_RESOURCE_H_
+#define _D_PEER_SESSION_RESOURCE_H_
+
+#include "common.h"
+#include "BtConstants.h"
+#include "PeerStat.h"
+#include <string>
+#include <deque>
+
+namespace aria2 {
+
+class BitfieldMan;
+
+class PeerSessionResource {
+private:
+  // localhost is choking this peer
+  bool _amChoking;
+  // localhost is interested in this peer
+  bool _amInterested;
+  // this peer is choking localhost
+  bool _peerChoking;
+  // this peer is interested in localhost
+  bool _peerInterested;
+  // choking this peer is requested
+  bool _chokingRequired;
+  // this peer is eligible for *optional* unchoking.
+  bool _optUnchoking;
+  // this peer is snubbing.
+  bool _snubbing;
+
+  BitfieldMan* _bitfieldMan;
+  bool _fastExtensionEnabled;
+  // fast index set which a peer has sent to localhost.
+  std::deque<int32_t> _peerAllowedIndexSet;
+  // fast index set which localhost has sent to a peer.
+  std::deque<int32_t> _amAllowedIndexSet;
+  bool _extendedMessagingEnabled;
+  Extensions _extensions;
+  bool _dhtEnabled;
+  PeerStat _peerStat;
+  int32_t _latency;
+  int64_t _uploadLength;
+  int64_t _downloadLength;
+
+  template<typename T>
+  bool indexIncluded(const std::deque<T>& c, T index) const;
+public:
+  PeerSessionResource(int32_t pieceLength, int64_t totalLength);
+
+  ~PeerSessionResource();
+
+  // localhost is choking this peer
+  bool amChoking() const;
+
+  void amChoking(bool b);
+
+  // localhost is interested in this peer
+  bool amInterested() const;
+
+  void amInterested(bool b);
+
+  // this peer is choking localhost
+  bool peerChoking() const;
+
+  void peerChoking(bool b);
+
+  // this peer is interested in localhost
+  bool peerInterested() const;
+
+  void peerInterested(bool b);
+  
+  // this peer should be choked
+  bool chokingRequired() const;
+
+  void chokingRequired(bool b);
+
+  // this peer is eligible for unchoking optionally.
+  bool optUnchoking() const;
+
+  void optUnchoking(bool b);
+
+  bool shouldBeChoking() const;
+
+  // this peer is snubbing.
+  bool snubbing() const;
+
+  void snubbing(bool b);
+
+  bool hasAllPieces() const;
+
+  void updateBitfield(int32_t index, int32_t operation);
+  
+  void setBitfield(const unsigned char* bitfield, size_t bitfieldLength);
+
+  const unsigned char* getBitfield() const;
+
+  size_t getBitfieldLength() const;
+
+  bool hasPiece(int32_t index) const;
+
+  void markSeeder();
+
+  bool fastExtensionEnabled() const;
+
+  void fastExtensionEnabled(bool b);
+
+  // fast index set which a peer has sent to localhost.
+  const std::deque<int32_t>& peerAllowedIndexSet() const;
+
+  void addPeerAllowedIndex(int32_t index);
+
+  bool peerAllowedIndexSetContains(int32_t index) const;
+
+  // fast index set which localhost has sent to a peer.
+  const std::deque<int32_t>& amAllowedIndexSet() const;
+
+  void addAmAllowedIndex(int32_t index);
+
+  bool amAllowedIndexSetContains(int32_t index) const;
+
+  bool extendedMessagingEnabled() const;
+
+  void extendedMessagingEnabled(bool b);
+
+  uint8_t getExtensionMessageID(const std::string& name) const;
+
+  std::string getExtensionName(uint8_t id) const;
+
+  void addExtension(const std::string& name, uint8_t id);
+
+  bool dhtEnabled() const;
+
+  void dhtEnabled(bool b);
+
+  PeerStat& getPeerStat();
+
+  int32_t latency() const;
+
+  void updateLatency(int32_t l);
+
+  int64_t uploadLength() const;
+
+  void updateUploadLength(int32_t bytes);
+
+  int64_t downloadLength() const;
+
+  void updateDownloadLength(int32_t bytes);
+};
+
+} // namespace aria2
+
+#endif // _D_PEER_SESSION_RESOURCE_H_