Changeset 606

Timestamp:

12/05/07 09:24:11 (1 year ago)

Author:

blackhedd

Message:

supported get_outbound_data_size in pure Ruby for stream and datagram objects

Files:

• version_0/lib/em/streamer.rb (modified) (2 diffs)
• version_0/lib/pr_eventmachine.rb (modified) (5 diffs)
• version_0/tests/test_epoll.rb (modified) (1 diff)

version_0/lib/em/streamer.rb

@@ -50 +50 @@
-                def stream_without_mapping filename
-                        if @http_chunks
-                                #@connection.send_data "#{format("%x",@size)}\r\n"
-                                @connection.send_data "#{@size.to_s(16)}\r\n"
-                                @connection.send_file_data filename
@@ -80 +79 @@
-                                                len = ChunkSize if (len > ChunkSize)
-
-                                                #@connection.send_data( "#{format("%x",len)}\r\n" ) if @http_chunks
-                                                @connection.send_data( "#{len.to_s(16)}\r\n" ) if @http_chunks
-                                                @connection.send_data( @mapping.get_chunk( @position, len ))

version_0/lib/pr_eventmachine.rb

@@ -176 +176 @@
-      send_data sig, data, data.length
-    end
+
+    # #get_outbound_data_size
+    def get_outbound_data_size sig
+      r = Reactor.instance.get_selectable( sig ) or raise "unknown get_outbound_data_size target"
+      r.get_outbound_data_size
+    end
+
-  end
-
@@ -187 +194 @@
-  class Error < Exception; end
-
+end
+
+#-----------------------------------------------------------------
+
+module EventMachine
+  class Connection
+    def get_outbound_data_size
+      EventMachine::get_outbound_data_size @signature
+    end
+  end
-end
-
@@ -366 +383 @@
-  def_delegator :@my_selectable, :get_peername
-  def_delegator :@my_selectable, :send_datagram
+  def_delegator :@my_selectable, :get_outbound_data_size
-end
-
@@ -529 +547 @@
-    end
-
+    # #get_outbound_data_size
+    def get_outbound_data_size
+      @outbound_q.inject(0) {|memo,obj| memo += (obj || "").length}
+    end
+
-  end
-
@@ -793 +816 @@
-    def select_for_reading?
-      true
+    end
+
+    # #get_outbound_data_size
+    def get_outbound_data_size
+      @outbound_q.inject(0) {|memo,obj| memo += (obj || "").length}
-    end
-

version_0/tests/test_epoll.rb

@@ -86 +86 @@
-                EM.epoll
-                s = EM.set_descriptor_table_size 60000
-                raise "test_descriptors unsupported on this platform" unless s == 60000
-                EM.run {
-                        EM.start_server "127.0.0.1", 9800, TestEchoServer