distribustream 0.4.1 → 0.5.0

data/lib/pdtp/server/transfer_manager.rb

@@ -0,0 +1,146 @@
+#--
+# Copyright (C) 2006-07 ClickCaster, Inc. (info@clickcaster.com)
+#
+# 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 3 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, see <http://www.gnu.org/licenses/>.
+# 
+# This source file is distributed as part of the 
+# DistribuStream file transfer system.
+#
+# See http://distribustream.org/
+#++
+
+require File.dirname(__FILE__) + '/transfer'
+
+module PDTP
+  class Server
+    # Decision-making logic for initiating peer-to-peer transfers
+    class TransferManager
+      def initialize(connections, file_service)
+        @connections, @file_service = connections, file_service
+        @updated_clients = []
+      end
+      
+      # Add client to list of ones needing updates
+      def process_client(client)
+        @updated_clients << client
+      end
+      
+      # Creates new transfers for all clients that have been updated
+      def spawn_all_transfers
+        @updated_clients.each { |client| spawn_transfers_for_client(client) }
+        @updated_clients.clear
+      end
+      
+      #########
+      protected
+      #########
+      
+      # Spawns uploads and downloads for this client.
+      # Should be called every time there is a change that would affect 
+      # what this client has or wants
+      def spawn_transfers_for_client(connection)
+        while connection.wants_download? do
+          break unless spawn_download_for_client(connection)
+        end
+
+        while connection.wants_upload? do
+          break unless spawn_upload_for_client(connection)
+        end
+      end
+
+      # Creates a single download for the specified client
+      # Returns true on success, false on failure
+      def spawn_download_for_client(connection)
+        feasible_peers = []
+
+        begin
+          url, chunkid = connection.chunk_info.high_priority_chunk
+        rescue
+          return false
+        end
+
+        @connections.each do |c2|
+          next if connection == c2
+          next unless c2.wants_upload?
+          if c2.chunk_info.provided?(url, chunkid)
+            feasible_peers << c2
+            break if feasible_peers.size > 5
+          end
+        end
+
+        # we now have a list of clients that have the requested chunk.
+        # pick one and start the transfer
+        if feasible_peers.size > 0
+          #FIXME base this on the trust model
+          giver = feasible_peers[rand(feasible_peers.size)]
+          return begin_transfer(connection,giver,url,chunkid)
+          #FIXME should we try again if begin_transfer fails?
+        end
+
+        false
+      end
+
+      # Creates a single upload for the specified client
+      # Returns true on success, false on failure
+      def spawn_upload_for_client(connection)
+        @connections.each do |c2|
+          next if connection == c2
+          next unless c2.wants_download?
+
+          begin
+            url, chunkid = c2.chunk_info.high_priority_chunk
+          rescue
+            next
+          end
+
+          if connection.chunk_info.provided?(url, chunkid)
+            return begin_transfer(c2, connection, url, chunkid)
+          end
+        end
+
+        false
+      end
+            
+      # Creates a new transfer between two peers
+      # Returns true on success, or false if the specified transfer is already in progress
+      def begin_transfer(taker, giver, url, chunkid)
+        byte_range = @file_service.get_info(url).chunk_range(chunkid) 
+        t = Transfer.new(taker, giver, url, chunkid, byte_range)
+
+        #make sure this transfer doesnt already exist
+        t1 = taker.transfers[t.transfer_id]
+        t2 = giver.transfers[t.transfer_id]
+        return false unless t1.nil? and t2.nil?
+
+        taker.chunk_info.transfer(url, chunkid..chunkid) 
+        taker.transfers[t.transfer_id] = t
+        giver.transfers[t.transfer_id] = t
+
+        #send transfer message to the connector
+        addr, port = t.acceptor.get_peer_info
+      
+        t.connector.send_message(:transfer,
+          :host => addr,
+          :port => t.acceptor.listen_port,
+          :method => t.connector == t.taker ? "get" : "put",
+          :url => url,
+          :range => byte_range,
+          :peer_id => t.acceptor.client_id
+        )
+        
+        true
+      end
+    end
+  end
+end

data/status/index.erb

@@ -12,24 +12,38 @@
   </div>
   <center>
     <table border="0" cellpadding="0" cellspacing="0">
-      <tr><th>Client</th><th>Transfers</th><th>Files</th></tr>
+      <tr>
+				<th>Client</th>
+				<th>Bandwidth</th>
+				<th>Transfers</th>
+				<th>Files</th>
+			</tr>
+			
       <% each_peer do |peer| %>
-        <tr class="row<%= cycle(' row_alternate', '') %>"><td>
-          <%= peer_name(peer) %><br />
-          <%= peer_address(peer) %>
-        </td>
-        <td>
-        <% each_transfer(peer) do |transfer| %>
-          <%= transfer_info(peer, transfer) %><br />
-        <% end %>
-        </td>
-        <td>
-        <% each_file(peer) do |file| %>
-          <%= file_path(file) %> 
-          (<%= chunks_completed(file) %>/<%= chunks_active(file) %>, 
-          <%= percent_complete(file) %>%)<br />
-        <% end %>
-        </td></tr>
+        <tr class="row<%= cycle(' row_alternate', '') %>">
+					<td>
+	          <%= peer_name(peer) %><br />
+	          <%= peer_address(peer) %>
+	        </td>
+					<td>
+						Upstream: <%= upstream_bandwidth(peer) %><br />
+						<% unless peer.file_service? %>
+						Downstream: <%= downstream_bandwidth(peer) %>
+						<% end %>
+					</td>
+	        <td>
+	        <% each_transfer(peer) do |transfer| %>
+	          <%= transfer_info(peer, transfer) %><br />
+	        <% end %>
+	        </td>
+	        <td>
+	        <% each_file(peer) do |file| %>
+	          <%= file_path(file) %> 
+	          (<%= chunks_completed(file) %>/<%= chunks_active(file) %>, 
+	          <%= percent_complete(file) %>%)<br />
+	        <% end %>
+	        </td>
+				</tr>
       <% end %>
     </table>
   </center>

data/status/stylesheets/style.css

@@ -38,5 +38,5 @@ td {
 }
 
 .row_alternate {
-	background: #EEEEEE;
+	background: #E0E0E0;
 }

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.4
 specification_version: 1
 name: distribustream
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
-date: 2008-11-15 00:00:00 -07:00
+  version: 0.5.0
+date: 2008-11-27 00:00:00 -07:00
 summary: DistribuStream is a fully open peercasting system allowing on-demand or live streaming media to be delivered at a fraction of the normal cost
 require_paths: 
 - lib
@@ -33,43 +33,45 @@ authors:
 - James Sanders
 - Tom Stapleton
 files: 
-- bin/dstream
 - bin/dsclient
+- bin/dstream
 - lib/pdtp
-- lib/pdtp/server
-- lib/pdtp/common.rb
 - lib/pdtp/client
-- lib/pdtp/common
-- lib/pdtp/client.rb
-- lib/pdtp/server.rb
-- lib/pdtp/server/file_service_protocol.rb
-- lib/pdtp/server/status_handler.rb
-- lib/pdtp/server/trust.rb
-- lib/pdtp/server/status_helper.rb
-- lib/pdtp/server/transfer.rb
-- lib/pdtp/server/client_info.rb
-- lib/pdtp/server/connection.rb
-- lib/pdtp/server/file_service.rb
-- lib/pdtp/server/dispatcher.rb
+- lib/pdtp/client/callbacks.rb
+- lib/pdtp/client/connection.rb
 - lib/pdtp/client/file_buffer.rb
+- lib/pdtp/client/file_service.rb
 - lib/pdtp/client/http_client.rb
 - lib/pdtp/client/http_handler.rb
-- lib/pdtp/client/callbacks.rb
 - lib/pdtp/client/transfer.rb
-- lib/pdtp/client/connection.rb
-- lib/pdtp/client/file_service.rb
-- lib/pdtp/common/length_prefix_protocol.rb
+- lib/pdtp/client.rb
+- lib/pdtp/common
+- lib/pdtp/common/file_service.rb
 - lib/pdtp/common/http_server.rb
+- lib/pdtp/common/length_prefix_protocol.rb
 - lib/pdtp/common/protocol.rb
-- lib/pdtp/common/file_service.rb
-- conf/example.yml
+- lib/pdtp/common.rb
+- lib/pdtp/server
+- lib/pdtp/server/bandwidth_estimator.rb
+- lib/pdtp/server/chunk_info.rb
+- lib/pdtp/server/connection.rb
+- lib/pdtp/server/dispatcher.rb
+- lib/pdtp/server/file_service.rb
+- lib/pdtp/server/file_service_protocol.rb
+- lib/pdtp/server/status_handler.rb
+- lib/pdtp/server/status_helper.rb
+- lib/pdtp/server/transfer.rb
+- lib/pdtp/server/transfer_manager.rb
+- lib/pdtp/server/trust.rb
+- lib/pdtp/server.rb
 - conf/bigchunk.yml
 - conf/debug.yml
-- status/stylesheets
+- conf/example.yml
 - status/images
+- status/images/logo.png
 - status/index.erb
+- status/stylesheets
 - status/stylesheets/style.css
-- status/images/logo.png
 - Rakefile
 - distribustream.gemspec
 - COPYING
@@ -79,10 +81,11 @@ files:
 test_files: []
 
 rdoc_options: 
-- --exclude
-- definitions
-- --exclude
-- indexes
+- --title
+- PDTP
+- --main
+- README
+- --line-numbers
 extra_rdoc_files: 
 - COPYING
 - README

data/lib/pdtp/server/client_info.rb

@@ -1,154 +0,0 @@
-#--
-# Copyright (C) 2006-07 ClickCaster, Inc. (info@clickcaster.com)
-#
-# 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 3 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, see <http://www.gnu.org/licenses/>.
-# 
-# This source file is distributed as part of the 
-# DistribuStream file transfer system.
-#
-# See http://distribustream.org/
-#++
-
-require File.dirname(__FILE__) + '/trust'
-
-module PDTP
-  class Server
-    #stores information about a single connected client
-    class ClientInfo
-      attr_accessor :chunk_info, :trust
-      attr_accessor :listen_port, :client_id
-      attr_accessor :transfers
-
-      def initialize
-        @chunk_info=ChunkInfo.new
-        @listen_port=6000 #default
-        @trust=Trust.new
-        @transfers=Hash.new
-      end
-
-      # returns true if this client wants the server to spawn a transfer for it
-      def wants_download?
-        transfer_state_allowed=5
-        total_allowed=10
-        transferring=0
-        @transfers.each do |key, t|
-          transferring=transferring+1 if t.verification_asked
-          return false if transferring >= transfer_state_allowed
-        end
-
-        @transfers.size < total_allowed
-      end 
-
-      #this could have a different definition, but it works fine to use wants_download?
-      alias_method :wants_upload?, :wants_download?
-
-      #returns a list of all the stalled transfers this client is a part of
-      def get_stalled_transfers
-        stalled=[]
-        timeout=20.0
-        now=Time.now
-        @transfers.each do |key,t|
-          #only delete if we are the acceptor to prevent race conditions
-          next if t.acceptor.user_data != self 
-          if now-t.creation_time > timeout and not t.verification_asked
-            stalled << t
-          end
-        end
-        stalled
-      end
-    end
-
-    #stores information about the chunks requested or provided by a client
-    class ChunkInfo
-      def initialize
-        @files={}
-      end
-
-      #each chunk can either be provided, requested, transfer, or none
-      def provide(filename,range); set(filename,range,:provided) ; end
-      def unprovide(filename,range); set(filename,range, :none); end
-      def request(filename,range); set(filename,range, :requested); end
-      def unrequest(filename,range); set(filename,range, :none); end
-      def transfer(filename,range); set(filename,range, :transfer); end
-
-      def provided?(filename,chunk); get(filename,chunk) == :provided; end
-      def requested?(filename,chunk); get(filename,chunk) == :requested; end
-
-      #returns a high priority requested chunk
-      def high_priority_chunk
-        #right now return any chunk
-        @files.each do |name,file|
-          file.each_index do |i|
-            return [name,i] if file[i]==:requested
-          end
-        end  
-
-        nil
-      end
-
-      #calls a block for each chunk of the specified type
-      def each_chunk_of_type(type)
-        @files.each do |name,file|
-          file.each_index do |i|
-            yield(name,i) if file[i]==type
-          end
-        end 
-      end
-
-      class FileStats
-        attr_accessor :file_chunks, :chunks_requested,:url
-        attr_accessor :chunks_provided, :chunks_transferring
-
-        def initialize
-          @url=""
-          @file_chunks=0
-          @chunks_requested=0
-          @chunks_provided=0
-          @chunks_transferring=0
-        end
-      end
-
-      #returns an array of FileStats objects for debug output
-      def get_file_stats
-        stats=[]
-        @files.each do |name,file|
-          fs=FileStats.new
-          fs.file_chunks=file.size
-          fs.url=name
-          file.each do |chunk|
-            fs.chunks_requested+=1 if chunk==:requested
-            fs.chunks_provided+=1 if chunk==:provided
-            fs.chunks_transferring+=1 if chunk==:transfer
-          end
-          stats << fs
-        end
-
-        stats 
-      end
-
-      #########
-      protected
-      #########
-
-      def get(filename,chunk)
-        @files[filename][chunk] rescue :neither
-      end
-
-      def set(filename,range,state)
-        chunks=@files[filename]||=Array.new
-        range.each { |i| chunks[i]=state }
-      end
-    end
-  end
-end