eventmachine-le 1.1.0.beta.1 → 1.1.0.beta.2

data/README.md

@@ -61,6 +61,11 @@ Install the Ruby Gem:
 gem install eventmachine-le
 </pre>
 
+If you want the beta version (not fully tested) install it by using `--pre` option:
+<pre>
+gem install eventmachine-le --pre
+</pre>
+
 
 ## Usage ##
 

data/eventmachine-le.gemspec

@@ -1,16 +1,16 @@
 # -*- encoding: utf-8 -*-
-if RUBY_VERSION == '1.8.7'
+if RUBY_VERSION == "1.8.7"
   $:.unshift File.expand_path("../lib", __FILE__)
   require "em/version"
 else
   # Ruby 1.9.
-  require File.expand_path('../lib/em/version', __FILE__)
+  require File.expand_path("../lib/em/version", __FILE__)
 end
 
 Gem::Specification.new do |s|
-  s.name = 'eventmachine-le'
+  s.name = "eventmachine-le"
   s.version = EventMachine::VERSION
-  s.homepage = 'https://github.com/ibc/EventMachine-LE/'
+  s.homepage = "https://github.com/ibc/EventMachine-LE/"
 
   s.authors = ["Francis Cianfrocca", "Aman Gupta", "hacked by Carsten Bormann and Inaki Baz Castillo"]
   s.email   = ["garbagecat10@gmail.com", "aman@tmm1.net", "cabo@tzi.org", "ibc@aliax.net"]
@@ -19,11 +19,11 @@ Gem::Specification.new do |s|
   s.extensions = ["ext/extconf.rb", "ext/fastfilereader/extconf.rb"]
 
   s.required_ruby_version = ">= 1.8.7"
-  s.add_development_dependency 'rake-compiler', '0.7.9'
-  s.add_development_dependency 'yard', ">= 0.7.2"
-  s.add_development_dependency 'bluecloth'
+  s.add_development_dependency "rake-compiler", ">= 0.7.9"
+  s.add_development_dependency "yard", ">= 0.7.2"
+  s.add_development_dependency "bluecloth"
 
-  s.summary = 'EventMachine LE (Live Edition)'
+  s.summary = "EventMachine LE (Live Edition)"
   s.description = "EventMachine-LE (Live Edition) is a branch of EventMachine (https://github.com/eventmachine/eventmachine).
 
 This branch incorporates interesting pull requests that are not yet included in the mainline EventMachine repository. The maintainers of that version prefer to minimize change in order to keep the stability with already existing EventMachine deployments, which provides an impressive multi-platform base for IPv4 TCP servers (e.g., Web servers) that don't need good UDP or IPv6 support.

data/ext/cmain.cpp

@@ -807,6 +807,35 @@ extern "C" void evma_stop_proxy (const unsigned long from)
 		ed->StopProxy();
 }
 
+/******************
+evma_proxied_bytes
+*******************/
+
+extern "C" unsigned long evma_proxied_bytes (const unsigned long from)
+{
+	ensure_eventmachine("evma_proxied_bytes");
+	EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (from));
+	if (ed)
+		return ed->GetProxiedBytes();
+	else
+		return 0;
+}
+
+
+/***************************
+evma_get_last_activity_time
+****************************/
+
+extern "C" uint64_t evma_get_last_activity_time(const unsigned long from)
+{
+	ensure_eventmachine("evma_get_last_activity_time");
+	EventableDescriptor *ed = dynamic_cast <EventableDescriptor*> (Bindable_t::GetObject (from));
+	if (ed)
+		return ed->GetLastActivity();
+	else
+		return 0;
+}
+
 
 /***************************
 evma_get_heartbeat_interval

data/ext/ed.cpp

@@ -62,6 +62,7 @@ EventableDescriptor::EventableDescriptor (int sd, EventMachine_t *em, bool autoc
 	UnbindReasonCode (0),
 	ProxyTarget(NULL),
 	ProxiedFrom(NULL),
+	ProxiedBytes(0),
 	MaxOutboundBufSize(0),
 	MyEventMachine (em),
 	PendingConnectTimeout(20000000),
@@ -250,6 +251,7 @@ void EventableDescriptor::StartProxy(const unsigned long to, const unsigned long
 		StopProxy();
 		ProxyTarget = ed;
 		BytesToProxy = length;
+		ProxiedBytes = 0;
 		ed->SetProxiedFrom(this, bufsize);
 		return;
 	}
@@ -296,6 +298,7 @@ void EventableDescriptor::_GenericInboundDispatch(const char *buf, int size)
 		if (BytesToProxy > 0) {
 			unsigned long proxied = min(BytesToProxy, (unsigned long) size);
 			ProxyTarget->SendOutboundData(buf, proxied);
+			ProxiedBytes += (unsigned long) proxied;
 			BytesToProxy -= proxied;
 			if (BytesToProxy == 0) {
 				StopProxy();
@@ -306,6 +309,7 @@ void EventableDescriptor::_GenericInboundDispatch(const char *buf, int size)
 			}
 		} else {
 			ProxyTarget->SendOutboundData(buf, size);
+			ProxiedBytes += (unsigned long) size;
 		}
 	} else {
 		(*EventCallback)(GetBinding(), EM_CONNECTION_READ, buf, size);

data/ext/ed.h

@@ -80,6 +80,7 @@ class EventableDescriptor: public Bindable_t
 		virtual int SetCommInactivityTimeout (uint64_t value) {return 0;}
 		uint64_t GetPendingConnectTimeout();
 		int SetPendingConnectTimeout (uint64_t value);
+		uint64_t GetLastActivity() { return LastActivity; }
 
 		#ifdef HAVE_EPOLL
 		struct epoll_event *GetEpollEvent() { return &EpollEvent; }
@@ -87,6 +88,7 @@ class EventableDescriptor: public Bindable_t
 
 		virtual void StartProxy(const unsigned long, const unsigned long, const unsigned long);
 		virtual void StopProxy();
+		virtual unsigned long GetProxiedBytes(){ return ProxiedBytes; };
 		virtual void SetProxiedFrom(EventableDescriptor*, const unsigned long);
 		virtual int SendOutboundData(const char*,int){ return -1; }
 		virtual bool IsPaused(){ return bPaused; }
@@ -118,6 +120,7 @@ class EventableDescriptor: public Bindable_t
 		unsigned long BytesToProxy;
 		EventableDescriptor *ProxyTarget;
 		EventableDescriptor *ProxiedFrom;
+		unsigned long ProxiedBytes;
 
 		unsigned long MaxOutboundBufSize;
 

data/ext/eventmachine.h

@@ -89,6 +89,7 @@ extern "C" {
 	float evma_get_pending_connect_timeout (const unsigned long binding);
 	int evma_set_pending_connect_timeout (const unsigned long binding, float value);
 	int evma_get_outbound_data_size (const unsigned long binding);
+	uint64_t evma_get_last_activity_time (const unsigned long);
 	int evma_send_file_data_to_connection (const unsigned long binding, const char *filename);
 
 	void evma_close_connection (const unsigned long binding, int after_writing);
@@ -110,6 +111,7 @@ extern "C" {
 
 	void evma_start_proxy(const unsigned long, const unsigned long, const unsigned long, const unsigned long);
 	void evma_stop_proxy(const unsigned long);
+	unsigned long evma_proxied_bytes(const unsigned long);
 
 	int evma_set_rlimit_nofile (int n_files);
 

data/ext/rubymain.cpp

@@ -613,7 +613,7 @@ static VALUE t_set_sock_opt (VALUE self, VALUE signature, VALUE lev, VALUE optna
 	int fd = evma_get_file_descriptor (NUM2ULONG (signature));
 	int level = NUM2INT(lev), option = NUM2INT(optname);
 	int i;
-	void *v;
+	const void *v;
 	socklen_t len;
 
 	switch (TYPE(optval)) {
@@ -1105,6 +1105,44 @@ static VALUE t_stop_proxy (VALUE self, VALUE from)
 	return Qnil;
 }
 
+/***************
+t_proxied_bytes
+****************/
+
+static VALUE t_proxied_bytes (VALUE self, VALUE from)
+{
+	try{
+		return ULONG2NUM(evma_proxied_bytes(NUM2ULONG (from)));
+	} catch (std::runtime_error e) {
+		rb_raise (EM_eConnectionError, e.what());
+	}
+	return Qnil;
+}
+
+/***************
+t_get_idle_time
+****************/
+
+static VALUE t_get_idle_time (VALUE self, VALUE from)
+{
+	try{
+		uint64_t current_time = evma_get_current_loop_time();
+		uint64_t time = evma_get_last_activity_time(NUM2ULONG (from));
+		if (current_time != 0 && time != 0) {
+			if (time >= current_time)
+				return ULONG2NUM(0);
+			else {
+				uint64_t diff = current_time - time;
+				float seconds = diff / (1000.0*1000.0);
+				return rb_float_new(seconds);
+			}
+			return Qnil;
+		}
+	} catch (std::runtime_error e) {
+		rb_raise (EM_eConnectionError, e.what());
+	}
+	return Qnil;
+}
 
 /************************
 t_get_heartbeat_interval
@@ -1207,6 +1245,7 @@ extern "C" void Init_rubyeventmachine()
 
 	rb_define_module_function (EmModule, "start_proxy", (VALUE (*)(...))t_start_proxy, 4);
 	rb_define_module_function (EmModule, "stop_proxy", (VALUE (*)(...))t_stop_proxy, 1);
+	rb_define_module_function (EmModule, "get_proxied_bytes", (VALUE (*)(...))t_proxied_bytes, 1);
 
 	rb_define_module_function (EmModule, "watch_filename", (VALUE (*)(...))t_watch_filename, 1);
 	rb_define_module_function (EmModule, "unwatch_filename", (VALUE (*)(...))t_unwatch_filename, 1);
@@ -1228,6 +1267,7 @@ extern "C" void Init_rubyeventmachine()
 	rb_define_module_function (EmModule, "send_file_data", (VALUE(*)(...))t_send_file_data, 2);
 	rb_define_module_function (EmModule, "get_heartbeat_interval", (VALUE(*)(...))t_get_heartbeat_interval, 0);
 	rb_define_module_function (EmModule, "set_heartbeat_interval", (VALUE(*)(...))t_set_heartbeat_interval, 1);
+	rb_define_module_function (EmModule, "get_idle_time", (VALUE(*)(...))t_get_idle_time, 1);
 
 	rb_define_module_function (EmModule, "get_peername", (VALUE(*)(...))t_get_peername, 1);
 	rb_define_module_function (EmModule, "get_sockname", (VALUE(*)(...))t_get_sockname, 1);

data/lib/em/connection.rb

@@ -251,6 +251,12 @@ module EventMachine
       EventMachine::disable_proxy(self)
     end
 
+    # The number of bytes proxied to another connection. Reset to zero when
+    # EventMachine::Connection#proxy_incoming_to is called, and incremented whenever data is proxied.
+    def get_proxied_bytes
+      EventMachine::get_proxied_bytes(@signature)
+    end
+
     # EventMachine::Connection#close_connection is called only by user code, and never
     # by the event loop. You may call this method against a connection object in any
     # callback handler, whether or not the callback was made against the connection
@@ -583,6 +589,11 @@ module EventMachine
       EventMachine::get_subprocess_status @signature
     end
 
+    # The number of seconds since the last send/receive activity on this connection.
+    def get_idle_time
+      EventMachine::get_idle_time @signature
+    end
+
     # comm_inactivity_timeout returns the current value (float in seconds) of the inactivity-timeout
     # property of network-connection and datagram-socket objects. A nonzero value
     # indicates that the connection or socket will automatically be closed if no read or write

data/lib/em/version.rb

@@ -1,3 +1,3 @@
 module EventMachine
-  VERSION = "1.1.0.beta.1"
+  VERSION = "1.1.0.beta.2"
 end

data/tests/test_idle_connection.rb

@@ -0,0 +1,23 @@
+require 'em_test_helper'
+
+class TestIdleConnection < Test::Unit::TestCase
+  if EM.respond_to?(:get_idle_time)
+    def test_idle_time
+      EM.run{
+        conn = EM.connect 'www.google.com', 80
+        EM.add_timer(3){
+          $idle_time = conn.get_idle_time
+          conn.send_data "GET / HTTP/1.0\r\n\r\n"
+          EM.next_tick{
+            $idle_time_after_send = conn.get_idle_time
+            conn.close_connection
+            EM.stop
+          }
+        }
+      }
+
+      assert_in_delta 3, $idle_time, 0.2
+      assert_equal 0, $idle_time_after_send
+    end
+  end
+end

data/tests/test_proxy_connection.rb

@@ -24,6 +24,7 @@ class TestProxyConnection < Test::Unit::TestCase
       end
 
       def unbind
+        $proxied_bytes = self.get_proxied_bytes
         @client.close_connection_after_writing
       end
     end
@@ -94,7 +95,7 @@ class TestProxyConnection < Test::Unit::TestCase
       end
 
       def receive_data(data)
-        EM.connect("127.0.0.1", @port, ProxyConnection, self, data)
+        @proxy = EM.connect("127.0.0.1", @port, ProxyConnection, self, data)
       end
     end
 
@@ -134,6 +135,17 @@ class TestProxyConnection < Test::Unit::TestCase
       assert_equal("I know!", $client_data)
     end
 
+    def test_proxied_bytes
+      EM.run {
+        EM.start_server("127.0.0.1", @port, Server)
+        EM.start_server("127.0.0.1", @proxy_port, ProxyServer, @port)
+        EM.connect("127.0.0.1", @proxy_port, Client)
+      }
+
+      assert_equal("I know!", $client_data)
+      assert_equal("I know!".bytesize, $proxied_bytes)
+    end
+
     def test_partial_proxy_connection
       EM.run {
         EM.start_server("127.0.0.1", @port, Server)

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 1
   - 0
   - beta
-  - 1
-  version: 1.1.0.beta.1
+  - 2
+  version: 1.1.0.beta.2
 platform: ruby
 authors: 
 - Francis Cianfrocca
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-04 00:00:00 +01:00
+date: 2012-03-06 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,7 +27,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
@@ -179,6 +179,7 @@ extra_rdoc_files:
 - tests/test_hc.rb
 - tests/test_httpclient.rb
 - tests/test_httpclient2.rb
+- tests/test_idle_connection.rb
 - tests/test_inactivity_timeout.rb
 - tests/test_ipv4.rb
 - tests/test_ipv6.rb
@@ -308,6 +309,7 @@ files:
 - tests/test_hc.rb
 - tests/test_httpclient.rb
 - tests/test_httpclient2.rb
+- tests/test_idle_connection.rb
 - tests/test_inactivity_timeout.rb
 - tests/test_ipv4.rb
 - tests/test_ipv6.rb