CVS: BitTorrent/BitTorrent Rerequester.py,1.15,1.16 btformats.py,1.6,1.7 download.py,1.132,1.133

Update of /cvsroot/bittorrent/BitTorrent/BitTorrent
In directory sc8-pr-cvs1:/tmp/cvs-serv10119/BitTorrent

Modified Files:
        Rerequester.py btformats.py download.py 
Log Message:
added 'done peers' support to rerequester


Index: Rerequester.py
===================================================================
RCS file: /cvsroot/bittorrent/BitTorrent/BitTorrent/Rerequester.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Rerequester.py      25 Mar 2003 08:39:37 -0000      1.15
--- Rerequester.py      27 Mar 2003 04:40:23 -0000      1.16
***************
*** 13,17 ****
      def __init__(self, url, interval, sched, howmany, minpeers, 
              connect, externalsched, amount_left, up, down,
!             port, ip, myid, infohash, timeout, errorfunc, maxpeers):
          self.url = ('%s?info_hash=%s&peer_id=%s&port=%s' %
              (url, quote(infohash), quote(myid), str(port)))
--- 13,17 ----
      def __init__(self, url, interval, sched, howmany, minpeers, 
              connect, externalsched, amount_left, up, down,
!             port, ip, myid, infohash, timeout, errorfunc, maxpeers, doneflag):
          self.url = ('%s?info_hash=%s&peer_id=%s&port=%s' %
              (url, quote(infohash), quote(myid), str(port)))
***************
*** 33,36 ****
--- 33,37 ----
          self.errorfunc = errorfunc
          self.maxpeers = maxpeers
+         self.doneflag = doneflag
          self.last_failed = true
          self.sched(self.c, interval / 2)
***************
*** 100,105 ****
                  self.last = r.get('last')
                  ps = len(r['peers']) + self.howmany()
!                 if ps < self.maxpeers and r.get('num peers', 1000) > ps * 1.2:
!                     self.last = None
                  for x in r['peers']:
                      self.connect((x['ip'], x['port']), x['peer id'])
--- 101,111 ----
                  self.last = r.get('last')
                  ps = len(r['peers']) + self.howmany()
!                 if ps < self.maxpeers:
!                     if self.doneflag.isSet():
!                         if r.get('num peers', 1000) - r.get('done peers', 0) 
> ps * 1.2:
!                             self.last = None
!                     else:
!                         if r.get('num peers', 1000) > ps * 1.2:
!                             self.last = None
                  for x in r['peers']:
                      self.connect((x['ip'], x['port']), x['peer id'])

Index: btformats.py
===================================================================
RCS file: /cvsroot/bittorrent/BitTorrent/BitTorrent/btformats.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** btformats.py        25 Mar 2003 08:32:18 -0000      1.6
--- btformats.py        27 Mar 2003 04:40:23 -0000      1.7
***************
*** 91,94 ****
--- 91,97 ----
      if type(npeers) not in ints or npeers < 0:
          raise ValueError
+     dpeers = message.get('done peers', 0)
+     if type(dpeers) not in ints or dpeers < 0:
+         raise ValueError
      last = message.get('last', 0)
      if type(last) not in ints or last < 0:

Index: download.py
===================================================================
RCS file: /cvsroot/bittorrent/BitTorrent/BitTorrent/download.py,v
retrieving revision 1.132
retrieving revision 1.133
diff -C2 -d -r1.132 -r1.133
*** download.py 27 Mar 2003 03:44:46 -0000      1.132
--- download.py 27 Mar 2003 04:40:23 -0000      1.133
***************
*** 38,42 ****
      ('download_slice_size', None, 2 ** 14,
          "How many bytes to query for per request."),
!     ('request_backlog', None, 10,
          "how many requests to keep in a single pipe at once."),
      ('max_message_length', None, 2 ** 23,
--- 38,42 ----
      ('download_slice_size', None, 2 ** 14,
          "How many bytes to query for per request."),
!     ('request_backlog', None, 5,
          "how many requests to keep in a single pipe at once."),
      ('max_message_length', None, 2 ** 23,
***************
*** 250,254 ****
          rawserver.external_add_task, storagewrapper.get_amount_left, 
          upmeasure.get_total, downmeasure.get_total, listen_port, 
!         config['ip'], myid, infohash, config['http_timeout'], errorfunc, 
config['max_initiate'])
      DownloaderFeedback(choker, rawserver.add_task, statusfunc, 
          upmeasure.get_rate, downmeasure.get_rate, ratemeasure.get_time_left, 
--- 250,255 ----
          rawserver.external_add_task, storagewrapper.get_amount_left, 
          upmeasure.get_total, downmeasure.get_total, listen_port, 
!         config['ip'], myid, infohash, config['http_timeout'], errorfunc, 
!         config['max_initiate'], doneflag)
      DownloaderFeedback(choker, rawserver.add_task, statusfunc, 
          upmeasure.get_rate, downmeasure.get_rate, ratemeasure.get_time_left, 



------------------------ Yahoo! Groups Sponsor ---------------------~-->
Get 128 Bit SSL Encryption!
http://us.click.yahoo.com/xaxhjB/hdqFAA/xGHJAA/dkFolB/TM
---------------------------------------------------------------------~->

To unsubscribe from this group, send an email to:
BitTorrent-unsubscribe@xxxxxxxxxxxxxxx

 

Your use of Yahoo! Groups is subject to http://docs.yahoo.com/info/terms/